Commit Graph

627 Commits

Author SHA1 Message Date
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
Unknwon b553ea45ee modes/repo: incorrect SSH clone URL for #742 2014-12-13 16:46:00 -05:00
Unknwon ac4a10456e api: able to create repo and fix #726
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
Unknwon 2f3a7e53cb fix #735 2014-12-12 01:29:36 -05:00
Unknwon 9a1fe801e5 fix #711 2014-12-09 02:18:25 -05:00
Joseph Crail 39c068400e Fix spelling errors in comments. 2014-12-06 20:22:48 -05:00
Unknwon 0b785ad967 work on #672 2014-12-05 18:08:09 -05:00
Unknwon e577f2fff3 fix #706 and other mirror improve 2014-12-04 23:07:51 -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 1b66600bd0 Fix #652 2014-11-23 02:33:47 -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 2d8c414f8c Fix #635 2014-11-18 19:05:33 -05:00
Unknwon ce8d4cc80b #634 2014-11-18 15:13:08 -05:00
Unknwon 1e47e2df85 quick fix 2014-11-17 16:29:23 -05:00
Unknwon 5d9ef2bb12 lock gopmfile 2014-11-17 16:25:39 -05:00
无闻 d21d7171b0 Merge pull request #587 from eryx/dev
Fix #266
2014-11-17 16:17:52 -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 52d66ba6c8 #12, use go-gogs-client 2014-11-14 17:11:30 -05:00
Unknwon 9dc3c93a6a #12, add/edit hook 2014-11-13 12:57:00 -05:00
Unknwon 9e22840483 fix #622 2014-11-13 05:27:01 -05:00
Unknwon 8eb5120fbd #12, API: list user repos, list repo hooks 2014-11-13 02:32:18 -05:00
Unknwon 8c9338a537 add personal access token panel #12 2014-11-12 06:48:50 -05:00
Unknwon 4e7eb5be9d Work on #5 fork and fix #608 2014-11-05 23:30:04 -05:00
Unknwon 0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
luto bff1e157d5 force the use of InnoDB as db engine for all tables, fixes #59 2014-10-28 16:40:09 +01:00
Eryx e84e0ab904 Fix #266 2014-10-28 10:36:47 +08: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
Christopher Brickley 3794111460 update slack hook to use new format 2014-10-24 08:56:12 -04:00
Unknwon a342d58d7e Able to fork repo to individuals 2014-10-19 01:35:24 -04:00
无闻 d7d167ac63 Merge pull request #560 from evolvedlight/master
First cut of fork repo
2014-10-18 23:59:36 -04:00
Tony Tsang e0f945959e Replace white spaces with tab for format consistency 2014-10-14 17:31:35 +08:00
Tony Tsang 91127d9016 Fixes #562 2014-10-14 16:46:25 +08:00
evolvedlight 8d2a6fc484 Merge remote-tracking branch 'upstream/dev'
Conflicts:
	models/repo.go
2014-10-13 20:30:31 +01:00
evolvedlight 29ac3980ff More changes 2014-10-13 20:23:30 +01:00
Unknwon c04aea8d9d Fix #540 2014-10-12 02:39:00 -04:00
Unknwon 0d7b9065c6 Fix #540 2014-10-12 02:06:46 -04:00
Unknwon 452ccff81c Mirror fix on add ssh key 2014-10-11 21:04:42 -04:00
Unknwon fb839ca0fb More debug info 2014-10-11 20:34:48 -04:00
Unknwon b7b7863364 Work on ssh key issue 2014-10-11 20:06:35 -04:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
lunnyxiao e848b17fab bug fixed for #540 2014-10-11 13:24:36 +08:00
Unknwon b2632dec09 Page: Compare 2 commits 2014-10-10 21:40:51 -04:00
evolvedlight 211dc74816 Got the fork count working 2014-10-10 00:21:36 +01:00
Unknwon 79262173a6 Webhook delivery locking & Hide repo for org members if they don't have access 2014-10-09 19:01:22 -04:00
Unknwon 1aa76bd279 Fix #532, add system notice 2014-10-08 18:29:18 -04:00
Unknwon 263d409326 Basic xss prevention 2014-10-04 17:15:22 -04:00
evolvedlight c9e5e38fcf Initial cut of git fork 2014-10-04 18:19:14 +01:00
Unknwon 405ee14711 Fix SMTP auth logic 2014-10-03 13:12:54 -04:00
Unknwon 86eac0842b Fix feeds display issue 2014-09-29 18:58:04 -04:00
Unknwon 3cfa4a581c Bug: 500 when transfer repository to collaborator 2014-09-29 04:04:48 -04:00
fundon eb1e6f8e3e support dsa key format 2014-09-29 12:37:34 +08:00
无闻 c1d047d16e Merge pull request #508 from chadoe/homelink
Fix user HomeLink when using a suburl
2014-09-28 18:05:58 -04:00
无闻 38f71af363 Merge pull request #509 from chadoe/avatarlink
Fix AvatarLink when using a suburl
2014-09-28 18:05:35 -04:00
evolvedlight b7b0ee7df9 Fix minor typo 2014-09-28 22:01:05 +01: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 10673417dc Mirror fix on transfer repo 2014-09-25 22:42:31 -04:00
Unknwon ad52b2d791 Mirror fix on transfer repo 2014-09-25 22:36:07 -04:00
Unknwon 71e4689d11 Page: User profile 2014-09-25 19:33:39 -04:00
Unknwon f69761563b Fix bug on transfer repo 2014-09-25 16:36:19 -04:00
lunnyxiao 089d934547 add action repousername for transfer 2014-09-25 16:43:14 +08: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
Christopher Brickley 25c8d01676 increase max commits in payload to 5 2014-09-22 08:25:39 -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
Unknwon 8a09256941 Mirror fix and fix #481 2014-09-17 14:22:51 -04:00
Christopher Brickley f94d7c3f51 clarify name/username/owner/pusher for webhook 2014-09-17 09:20:14 -04:00
lunnyxiao 061a879cea Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
	conf/app.ini
2014-09-17 12:04:18 +08:00
lunnyxiao ed84adb679 toutf8 improved & add max git diff lines 2014-09-17 12:03:03 +08:00
Unknown ebb4f1b78c Work #475 and #458 2014-09-16 13:34:09 -04:00
Unknwon 62f21ff3ed Work on #476 2014-09-16 11:29:53 -04:00
Unknwon 0d9c41be7d Work on #476 2014-09-16 10:10:33 -04:00
Unknwon c1ceec45da Fix mirror UI style and work on #475 2014-09-16 08:32:13 -04:00
Unknwon a2cac952a4 Prepare 0.5 release 2014-09-12 21:36:26 -04:00
Unknwon bba401a5dc Prepare 0.5 release 2014-09-12 19:42:11 -04:00
Unknwon 1b7adf57e9 fix https://github.com/go-xorm/xorm/issues/161 2014-09-12 18:58:24 -04:00
Unknwon cfed11f092 Bug: Transfer repository doesn't update the count 2014-09-12 18:29:58 -04:00
Christopher Brickley 52d15ddec8 deliver hooks immediately after commit 2014-09-10 08:57:11 -04:00
Unknwon 33659ed9a5 Fix #452 2014-09-09 10:17:35 -04:00
Christopher Brickley 132590fab8 update specific hook_task, not all 2014-09-09 08:37:34 -04:00
lunnyxiao d84d6dfdae add showinfo for xorm 2014-09-08 12:11:25 +08:00
无闻 e79e4b1580 Merge pull request #442 from compressed/org_hook
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
Unknwon ab7206d6b7 Fix #348 2014-09-05 17:28:09 -04:00
Christopher Brickley 85c35a6b8b add organization-level webhooks 2014-09-05 07:19:34 -04:00
Vyacheslav Bakhmutov 31d8011843 Set milestone content field to TEXT orm type 2014-09-05 08:10:41 +07:00
无闻 d8290c9bac Merge pull request #444 from tstorch/database-cleanup
Code dedoublication in models/models.go
2014-09-04 11:38:35 -04:00