Commit graph

412 commits

Author SHA1 Message Date
Unknwon a79586cc54 Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
#	templates/repo/header.tmpl
2015-08-10 00:37:42 +08:00
Unknwon 68b9d78386 remove sync.Pool and support go1.2 again 2015-08-09 12:06:08 +08:00
Unknwon 4b43ffc96c Generate random avatar based on e-mail when disable Gravatar 2015-08-09 11:46:10 +08:00
Unknwon dea3a8c6a4 WIP: create PR - choose branch 2015-08-08 22:43:14 +08:00
Unknwon b1f08d3218 more on #1443 2015-08-07 00:09:28 +08:00
Unknwon d922b7e504 #1443 set first user to be admin
...not just ID=1
2015-08-07 00:00:11 +08:00
Unknwon 39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon b9527cd1bf #1299 force downcase e-mail 2015-08-05 17:36:22 +08:00
Unknwon e50982f5ec allow anonymous SSH clone 2015-08-05 11:14:17 +08:00
Lunny Xiao 673a76d638 Merge pull request #1211 from mephux/hotfix/type-fix-ValidatePassword
Hotfix/type fix validate password
2015-04-24 15:03:21 +08:00
Dustin Willis Webber e57594dc31 typo fix for comment 2015-04-16 14:40:39 -04:00
Dustin Willis Webber f78046fc3b typo fix 2015-04-16 14:36:32 -04:00
Unknwon 698b9e2acc #1070 Clearer error message for illegal characters 2015-03-26 17:11:47 -04:00
Unknwon 466facc009 #1067: Deleting users should remove them from collaborator lists
- fix delete user but repository watches are not decreased
2015-03-17 21:51:39 -04:00
Unknwon b72e75e522 #1024: OFFLINE_MODE Still Uses Gravatar 2015-03-12 20:32:38 -04:00
Unknwon ee68a826a5 v4 migration, merge 'dev', clean code and mirror fix 2015-02-23 02:15:53 -05:00
Unknwon 7ccab9cd09 Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
2015-02-22 22:51:25 -05:00
Unknwon 04164eada3 models: able to rename user with diff letter cases #981
- templates/org: mirror fix on name output
- routers: add missing error check
2015-02-22 18:24:49 -05:00
Unknwon 1654e9ecab templates/user/settings/emial.tmpl: little fix on UI
- routers/user: little code format
- conf/locale: update French locale
2015-02-21 22:13:47 -05:00
Unknwon 6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Peter Smit 6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
2015-02-12 14:25:07 +02:00
Peter Smit 0a4cda0dd4 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-12 14:14:45 +02:00
Unknwon 7e7160eefd first pass work on migration #925 2015-02-11 21:58:37 -05:00
Peter Smit 4e79adf6b5 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-06 13:18:11 +02:00
Unknwon f706102890 models: sanitize user full name when update settings 2015-02-04 20:04:01 -05:00
Unknwon 63c1f9a23f fix 500: E-mail already used in user settings page 2014-12-29 20:00:07 +08:00
Peter Smit 66e2016eeb Fix for wrong email query
Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
2014-12-21 09:16:56 +02:00
无闻 a18decf4cc Merge pull request #755 from phsmit/multiple_emails
Multiple emails
2014-12-20 22:47:05 -05:00
Peter 20b5c23a19 Small fixes to multiple_emails feature 2014-12-20 09:26:51 +02:00
Unknwon c4820f119d work on #754 2014-12-18 03:26:09 -05:00
Peter 6919c80f0b Add function to the model for email address management (add/delete/activate) 2014-12-17 17:40:10 +02:00
Peter Smit 99599c099f Add alternative email addresses to the model
A new struct is created named EmailAddress that contains alternative
email addresses for users. Also the email related methods; IsEmailUsed
and GetUserByEmail are updated.

DeleteUser deletes the extra email addresses and DeleteInactivateUsers
also deletes inactive accounts. This could be factored out, but should
do it for now.
2014-12-17 10:26:19 +02:00
Joseph Crail 39c068400e Fix spelling errors in comments. 2014-12-06 20:22:48 -05:00
Andrew Burns 00cf3e4dab Use the avatar.HashEmail function instead of hashing email directly. Fixes #700 2014-12-03 16:19:35 -07:00
Unknwon 5338808600 fix #676 2014-11-30 18:29:16 -05:00
Unknwon d75013a0e8 fix #580 2014-11-30 02:26:29 -05:00
Unknwon dc53270da9 Fix 653 2014-11-22 10:22:53 -05:00
Unknwon 8ea7ba3afa fix #644 2014-11-21 13:10:00 -05:00
Unknwon ef275ebf62 more on change avatar 2014-11-21 12:51:36 -05:00
Unknwon 55dfe2c978 custom avatar upload 2014-11-21 10:58:08 -05:00
Unknwon 32dcaefafa fox #620 2014-11-17 14:53:41 -05:00
Unknwon 340a4595dd support duoshuo mirror of gravatar 2014-11-16 20:27:04 -05:00
Unknwon 9e22840483 fix #622 2014-11-13 05:27:01 -05:00
Unknwon 0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
Unknwon 83283bca4c Safe work 2014-10-25 07:50:19 -04:00
Unknwon f1d8746264 Fix fork repo and macaron API broken 2014-10-24 18:43:17 -04:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
Unknwon 405ee14711 Fix SMTP auth logic 2014-10-03 13:12:54 -04:00
无闻 c1d047d16e Merge pull request #508 from chadoe/homelink
Fix user HomeLink when using a suburl
2014-09-28 18:05:58 -04:00
Martin van Beurden bb05ef907b Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached 2014-09-28 14:27:13 +02:00
Martin van Beurden 204952439a Fix user HomeLink when using a suburl 2014-09-28 13:55:58 +02:00
Unknwon b8368f98ff Add directory level commit message 2014-09-26 08:55:13 -04:00
Unknwon 71e4689d11 Page: User profile 2014-09-25 19:33:39 -04:00
Unknwon bd55b78775 Page: Commits and fix #249 2014-09-23 23:18:14 -04:00
Unknwon 5bbeeb0f1b Page: Commits and fix #249 2014-09-23 15:30:04 -04:00
Unknwon 7ba9257a7f Add suburl support 2014-09-19 20:11:34 -04:00
Martin van Beurden 0055cbd365 Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
2014-09-18 20:50:48 +02:00
Christopher Brickley f94d7c3f51 clarify name/username/owner/pusher for webhook 2014-09-17 09:20:14 -04:00
Unknwon d2aff9a46a Continue working on new admin pages 2014-08-29 20:50:43 +08:00
Unknwon 1aec1a2dda Finish new admin dashboard 2014-08-28 22:29:00 +08:00
Unknwon 74b31566cf Finsih add/remove repo in organization 2014-08-26 18:11:15 +08:00
Unknwon 21a1b8e5a3 Finish new edit team page, add member to team 2014-08-24 21:09:05 +08:00
Unknwon 36b4c57ff1 Finish new organization members and invitation page 2014-08-15 18:29:41 +08:00
Unknwon 755eec745f Finish new repo settings page 2014-08-02 13:47:33 -04:00
Unknwon 5e81383413 Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module 2014-07-26 18:37:18 -04:00
Unknwon 8dd07c0ddd New UI merge in progress 2014-07-26 00:24:27 -04:00
Justin Nuß cbcd08aa17 Mention organisation users when organisation gets mentioned 2014-07-24 19:15:31 +02:00
Unknown 3969d704a0 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-07-12 00:55:35 -04:00
Unknown 0f907301b7 Fix #285 2014-07-12 00:55:19 -04:00
Christopher Brickley 63e47405b2 Only update access usernames where the username is changing #282 2014-07-11 20:57:00 -04:00
Unknown 63cc14062a Paging function for users and repositories 2014-07-07 04:15:08 -04:00
Unknown be8ac7fb75 fix #273 2014-07-04 16:48:36 -04:00
Unknown 5dbfe3c26c Finish organization homepage 2014-06-28 15:43:25 -04:00
Unknown 6e448b0714 Finish delete organization 2014-06-28 00:40:07 -04:00
Unknown 19e9104289 Organization settings page 2014-06-27 03:37:01 -04:00
Unknown 43b33440b5 Work on create organization repo and #257 2014-06-25 05:14:36 -04:00
Unknown e0f9c628c5 Add create organization 2014-06-25 00:44:48 -04:00
Unknown ad5ec45dd6 Fix #165 2014-06-21 00:51:41 -04:00
Unknown f160b4f33c Add tar.gz download button and other mirror updates 2014-06-08 17:53:53 -04:00
Unknown 4f2f3c2857 Code convention 2014-06-05 22:07:35 -04:00
Unknown e1332c5239 Fix #230 2014-06-01 21:47:48 -04:00
Unknown 688ec6ecbd Fixed #209 2014-05-25 20:11:25 -04:00
Unknown 80055bde86 Code convention 2014-05-24 15:28:31 -04:00
Unknown 5e9a45f74a Code convention 2014-05-21 21:37:13 -04:00
Unknown 4744996f9a Make gmail auth work 2014-05-15 14:46:04 -04:00
Lunny Xiao 55019bfbc5 merge all login methods 2014-05-11 14:12:45 +08:00
Lunny Xiao 4d6de6c7b9 add login name for auth type 2014-05-11 11:56:04 +08:00
Unknown e05b1385fb Bug fix 2014-05-07 17:23:02 -04:00
Unknown 33d32585b1 Add mention, read/unread support of issue tracker 2014-05-07 16:51:14 -04:00
Unknown 8ca14e2109 Improve delete SSH key 2014-05-06 16:28:52 -04:00
Lunny Xiao d8136c9c3c Merge branch 'dev-ldap' into dev 2014-05-05 16:42:15 +08:00
Lunny Xiao 1652dd5068 basic authentications 2014-05-05 16:40:25 +08:00
Unknown e7d8fadb08 Add disable gravatar option 2014-05-01 21:30:04 -04:00
Unknown a7584d16e4 Fix #150 2014-05-01 09:09:37 -04:00
Unknown 480a4ae8c5 Fix #150 2014-05-01 09:00:30 -04:00
Unknown 89c99167b2 Fix #149 2014-05-01 08:26:41 -04:00
Unknown 49dc57e336 Add /api/v1/users/search 2014-04-30 23:48:01 -04:00
Unknown 62240b6bc1 Add login by email 2014-04-27 01:54:08 -06:00
juju2013 efc05ea1de initial support for LDAP authentication/MSAD 2014-04-23 23:07:54 +02:00
Christopher Brickley b9a1d13c29 change gravatar image to match URL scheme 2014-04-14 22:01:24 -04:00
Unknown 4b9b8024ba Clean oauth code 2014-04-13 18:12:07 -04:00
Unknown 33aa4f7438 Support private repo 2014-04-11 21:47:39 -04:00
Unknown 7d07b58114 UPDATE README 2014-04-11 13:24:19 -04:00
zhsso a4cbe79567 fix 2014-04-10 14:20:58 -04:00
zhsso f3ed11d177 mistakes 2014-04-10 14:20:01 -04:00
Unknown 5d4025cb5a Add go get meta support 2014-04-09 21:42:25 -04:00
Unknown 9ea9818d32 Fix issue with log in with GitHub but need more error handle after 2014-04-07 12:56:40 -04:00
Unknown e7c8a3cb8d Add salt for every single user 2014-04-06 16:10:57 -04:00
Unknown b7c3b0cc73 Add reset password, fix #58 2014-04-05 12:32:34 -04:00
Unknown e41ab839c7 Use session for rolling back 2014-04-04 18:55:17 -04:00
Unknown eb803ec5eb Add transfer repository 2014-04-04 18:31:09 -04:00
Unknown e9c4156c87 Add: rename user 2014-04-03 16:33:27 -04:00
Unknown 2a0066420a Fix bug work with sqlite3 2014-03-30 16:01:50 -04:00
slene 4c70249f75 fix some link 2014-03-30 17:03:00 +08:00
Unknown ae92f92dee Locating issue 2014-03-24 09:01:25 -04:00
Unknown 59bbddb318 Mirror fix 2014-03-24 07:36:38 -04:00
Unknown f8cfb81fb0 Mirror updates 2014-03-23 12:16:17 -04:00
skyblue 4bac361605 merge with branch master 2014-03-23 22:40:35 +08:00
Unknown 97debac185 SSL enable config option 2014-03-23 08:40:40 -04:00
Gogs 964e537479 append route to web 2014-03-23 18:13:23 +08:00
Unknown 59ffdbf6f8 Add create, list, view issue 2014-03-22 16:00:46 -04:00
Unknown b3cfd9fe0c Fix SSH key bug in windows 2014-03-22 14:27:03 -04:00
Unknown 932f717adb Fixing bug 2014-03-22 04:44:57 -04:00
Unknown 06631ab91f Basic admin data table, models changes 2014-03-20 16:04:56 -04:00
Unknown 3b387336bf Add Repository/user name filter 2014-03-20 11:41:24 -04:00
Unknown 4cf6cc63b0 Work on admin 2014-03-20 08:02:14 -04:00
Unknown 9f9cd6bfc6 Work on admin 2014-03-20 07:50:26 -04:00
Unknown 6f68620860 Pools limit concurrent nums 2014-03-19 21:05:48 -04:00
Unknown 35d473f04a Finish verify email 2014-03-19 12:50:44 -04:00
Unknown de087c7b4a Add send register confirm mail 2014-03-19 08:27:27 -04:00
Unknown fbbae2b721 Working on register mail confirmation 2014-03-19 07:21:23 -04:00
Unknown a3a93aef11 Add some config options 2014-03-18 01:33:53 -04:00
Unknown 9eabbe68a6 Bug fix 2014-03-17 15:32:33 -04:00
Unknown e51afe4621 Add postgres support, clean code, code review 2014-03-17 14:03:58 -04:00
Unknown 757e4f658c Completely rule out the cgo 2014-03-17 11:56:50 -04:00
Unknown 425a58afd6 Bug fix 2014-03-16 10:35:25 -04:00
slene f6e32b1b08 finish delete ssh key and delete account. all with confirm. 2014-03-16 21:07:50 +08:00
Unknown 0754dd2f95 Add delete all feeds when delete account 2014-03-16 06:38:39 -04:00
Unknown ab747f2790 Fix delete SSH key in file 2014-03-16 05:24:13 -04:00
slene 06deed820d Add HomeLink and AvatarLink to User model. Please use .SignedUser in template. 2014-03-15 15:28:06 +08:00
Unknown 47edf7f4f9 Finish update password and profile 2014-03-14 01:12:07 -04:00
Unknown 57bc2d1ca0 Add update user profile back end, add new gitignore and license, add template data to public profile page 2014-03-13 03:39:18 -04:00
FuXiaoHei 37fae304d3 single repository page ui, add spec handler to get repo 2014-03-13 13:14:43 +08:00
Unknown 12f81de349 Finish delete user 2014-03-11 11:40:47 -04:00
Lunny Xiao 23400dd0a2 add GetReposFiles 2014-03-11 18:10:19 +08:00
Lunny Xiao b5cc4078a9 add repo list of dashboard 2014-03-11 14:17:05 +08:00
Unknown 5a05d6633d Merge utils to modules 2014-03-07 17:22:15 -05:00
Unknown a2a59f8ad1 Change /user/profile URL to /user/:username 2014-03-07 17:08:21 -05:00
Unknown 56a7ab4da5 Finish log in user 2014-03-06 11:42:14 -05:00
Unknown 1249392c83 Finish register user 2014-03-06 11:10:35 -05:00
Unknown c6f2c23b05 Add binding form for register user 2014-03-06 02:21:44 -05:00
Unknown e59f90b8fe Update 2014-03-03 19:03:08 -05:00
Lunny Xiao 9c3a8ff299 add run user 2014-02-25 18:58:55 +08:00
Lunny Xiao f7826d4ed7 create repository from web 2014-02-25 15:11:54 +08:00
Lunny Xiao b1b6def5bc improved ssh supports 2014-02-20 14:53:56 +08:00
Unknown 4b92a6c2df Add code of delete user 2014-02-19 13:04:31 -05:00
Lunny Xiao be0ba9ea88 add ssh supports(unfinished) 2014-02-19 17:50:53 +08:00
Unknown 94311e187f Finish register user 2014-02-18 17:48:02 -05:00
Unknown b455478df8 Finish register user 2014-02-18 17:31:16 -05:00
Unknown 3eb1ab9e8b Add UI for register user 2014-02-17 18:38:50 -05:00
Unknown 8ef198dfac Formatting 2014-02-14 18:16:54 -05:00
Lunny Xiao 237193ef2a add user models 2014-02-14 22:20:57 +08:00