Commit graph

832 commits

Author SHA1 Message Date
Unknwon ebbe6177a9 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-12-22 03:44:52 -05:00
Unknwon 97b39ae2e4 fix invite bug(shouldn't include full name to search box) 2014-12-22 03:44:49 -05:00
Peter Smit 8b31be43c6 Forgot to i18n "Primary" 2014-12-22 09:41:29 +02:00
Peter Smit 21dbcb7c77 Create English locale keys for multiple e-mails feature
Also, change all current 'emails' to 'e-mails'.
Still todo: some CSS for the user/settings/email page, but that is not my specialty
2014-12-22 09:11:30 +02:00
无闻 a18decf4cc Merge pull request #755 from phsmit/multiple_emails
Multiple emails
2014-12-20 22:47:05 -05:00
Unknwon 57b3be4016 work on #756 2014-12-17 23:04:05 -05:00
Peter b033f2f535 Finish method for having multiple emails/user.
All basics are implemented. Missing are the right (localized) strings
and the page markup could have a look at by a frontend guy.
2014-12-17 17:42:54 +02:00
Peter f34b04cfc0 Template for email activation email 2014-12-17 17:42:31 +02:00
Unknwon 1a5aa5e0c0 fix #741 2014-12-16 02:28:57 -05:00
Unknwon 9803c421f5 fix binding api broken 2014-12-15 01:49:59 -05:00
Unknwon c9e0b3b987 prepare for 0.5.9 2014-12-13 20:32:30 -05: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 42c7bb7529 mirror code clean 2014-12-11 18:55:09 -05:00
Unknwon bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon 9ee80e3e54 fix compile error 2014-12-10 05:10:26 -05:00
Unknwon 9a1fe801e5 fix #711 2014-12-09 02:18:25 -05:00
fuxiaohei 0daef29053 add label-create ui elements 2014-12-07 21:29:37 +08:00
Unknwon 069486d169 fix #165 2014-12-05 17:54:57 -05:00
dennis-smurf 528c075ad6 Added issue link rendering in commit messages 2014-12-05 11:02:52 +01:00
Tony Tsang d4a1d9f82a Display multi-line commit message on commit diff page. 2014-12-05 10:53:37 +08:00
fuxiaohei 0af3a5b603 add issue list filter ui 2014-12-04 23:22:16 +08:00
Unknwon d75013a0e8 fix #580 2014-11-30 02:26:29 -05:00
Unknwon db4951bc61 mirror fix on oauth2 2014-11-28 21:38:35 -05:00
Unknwon d6132aaa88 fix oauth2 2014-11-28 21:20:13 -05:00
无闻 9adc8e9d3f Merge pull request #683 from jcracknell/admin-repos-cols
Fix swapped issue/star columns in /admin/repos
2014-11-28 15:28:08 -05:00
James Cracknell 64d90a761b Fix swapped issue/star columns in /admin/repos 2014-11-28 12:40:02 -07:00
James Cracknell 4d123d0a93 Fix user links 2014-11-28 11:53:00 -07:00
Unknwon 9c2120eb34 fix #675 2014-11-27 21:36:12 -05:00
Unknwon a43164877c fix #664 2014-11-25 23:05:43 -05:00
fuxiaohei 23d53561d1 update milestone page design 2014-11-24 23:13:42 +08:00
Unknwon 0cce61de3a Merge branch 'dev' of github.com:gogits/gogs into dev 2014-11-24 09:54:22 -05:00
Unknwon 5b96e3fcc7 fix #660 2014-11-24 09:54:08 -05:00
fuxiaohei 79dae254cf add milestone page design 2014-11-24 22:33:04 +08:00
Unknwon dc53270da9 Fix 653 2014-11-22 10:22:53 -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 0c92da7e9c fix invalid user links in admin panels 2014-11-19 21:19:37 -05:00
Unknwon 2d8c414f8c Fix #635 2014-11-18 19:05:33 -05:00
Unknwon 37d8d3afe9 more APIs on #12 2014-11-18 11:07:16 -05:00
Unknwon 32dcaefafa fox #620 2014-11-17 14:53:41 -05:00
fuxiaohei d1a60e3643 add pull-request and labels page design 2014-11-17 23:07:34 +08: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 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 4f360d8f08 Fix #617 and update Germeny locale 2014-11-11 15:30:11 -05:00
Unknwon e0de6cb5ad work on #616 and update locales 2014-11-10 05:30:07 -05:00
Unknwon 35977cd34c continue work on #255 2014-11-07 16:44:25 -05:00
Unknwon abc57b6e43 work on #609 2014-11-07 14:46:13 -05:00
Unknwon 23eec25274 Fix #605, fix #255, fix #101 2014-11-06 22:06:41 -05:00
Unknwon 4e7eb5be9d Work on #5 fork and fix #608 2014-11-05 23:30:04 -05:00
Unknwon b375192352 fix tpl error 2014-11-04 12:07:43 -05:00
Unknwon 0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
fuxiaohei b866dc92d7 finish issue list ui draft 2014-11-04 21:58:28 +08:00
Unknwon e9875edcad Update gopmfile 2014-11-02 10:57:29 -05:00
Unknwon c7f56d7483 Fix #584 2014-10-27 11:18:00 -04: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
Eryx 8209bf74f8 Fix #575 2014-10-20 11:44:11 +08:00
Unknwon d88ebd9a4b Fix #554 2014-10-19 02:22:38 -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
Unknwon 3abc41ccca Fix API broken 2014-10-18 23:26:55 -04:00
fuxiaohei 9e3a1bc11a add nav bar in issue list 2014-10-18 22:52:34 +08:00
Unknwon 1aa12c7452 Fix #572 2014-10-15 16:28:38 -04:00
Unknwon ecf3eb4307 Fix #570 2014-10-15 07:55:20 -04:00
Unknwon 9ae92459a5 Fix repo css and rel path img in md 2014-10-14 23:44:34 -04: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 451f328a4c Fix #457 and fix #557 2014-10-13 03:07:47 -04:00
Unknwon 3005c4f6db Fix diff css style, hooks \r char 2014-10-11 18:20:07 -04:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
Vyacheslav Bakhmutov 5103f16f78 add omitted lang 2014-10-11 13:43:21 +07:00
Unknwon 3600498c8f Add push tag action 2014-10-10 21:58:13 -04:00
Unknwon b2632dec09 Page: Compare 2 commits 2014-10-10 21:40:51 -04:00
Unknwon 41dbb4c148 Hide org member in collar page 2014-10-10 06:15:27 -04:00
Unknwon d78abd3561 Mirror fix on admin/orgs paging 2014-10-10 03:28:21 -04: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 39931f8e00 Allow mail with self-signed certificates 2014-10-09 18:08:07 -04:00
Unknwon 1aa76bd279 Fix #532, add system notice 2014-10-08 18:29:18 -04:00
Vyacheslav Bakhmutov ce7422473a add omitted lang 2014-10-08 12:27:05 +04:00
Unknwon fc18741cc7 Fix #524 2014-10-07 07:02:53 -04:00
Unknwon 64c68220d2 Fix #264 2014-10-06 17:50:00 -04:00
Unknwon 91e5c24a31 Fix #522 2014-10-06 10:36:32 -04:00
Unknwon 263d409326 Basic xss prevention 2014-10-04 17:15:22 -04:00
unknown 1031271224 Add German translation to home page 2014-10-04 21:33:32 +02: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 f03b6be8f9 Work on #516 2014-10-01 07:40:48 -04:00
Unknwon 2a031c1365 Fix #515 2014-09-30 04:39:53 -04:00
Unknwon a046a31d2b UI: Confirmation box 2014-09-29 18:52:28 -04:00
Unknwon 3cfa4a581c Bug: 500 when transfer repository to collaborator 2014-09-29 04:04:48 -04:00
Unknwon 5e747bc877 Clean old dockerfiles 2014-09-28 03:31:50 -04:00
Unknwon 11af8658cf Simple fix 2014-09-28 01:54:25 -04:00
Unknwon e3b78c47e2 Merge branch 'master' of github.com:gogits/gogs
Conflicts:
	public/ng/less/gogs/repository.less
	templates/repo/home.tmpl
2014-09-28 01:44:09 -04:00
Unknwon 49193bebd2 UI: Confirmation box 2014-09-28 01:38:25 -04:00
fuxiaohei 7d48f811f1 add issue router for new issue page ui preview 2014-09-27 19:03:07 +08:00
fuxiaohei e3a27aeb25 template and ui fix 2014-09-27 17:31:44 +08:00
fuxiaohei dccc50e9d4 template and ui fix 2014-09-27 17:08:57 +08:00
Unknwon ad2ab6d214 Add modal to change username
Signed-off-by: Unknwon <joe2010xtmf@163.com>
2014-09-26 22:33:30 -04:00
Unknwon b8368f98ff Add directory level commit message 2014-09-26 08:55:13 -04:00
fundon 54724c33ec no neet for md5 email 2014-09-26 13:46:51 +08: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
fuxiaohei 7c30ae7002 is utils improvement 2014-09-25 21:52:58 +08:00
Unknwon 25268577a5 Fix download archive issue 2014-09-24 17:43:33 -04:00
Unknwon 5bbeeb0f1b Page: Commits and fix #249 2014-09-23 15:30:04 -04:00
Unknwon a1109e6fbc Page: Repository home page 2014-09-23 13:47:54 -04:00
Unknwon ebb05475ed Fix #495 and cannot view repository by tag 2014-09-23 13:06:25 -04:00
fuxiaohei b3f0d25ce5 pull request ui review, change sidebar 2014-09-23 23:48:28 +08:00
fuxiaohei 8d5a4cc9eb pull request ui review, change sidebar 2014-09-23 23:36:09 +08:00
fuxiaohei 60c65415dd pull request page ui review, upgrade octicon icons 2014-09-23 22:28:03 +08:00
Unknwon 3f707b3f32 Add basic submodule support 2014-09-22 17:01:19 -04:00
Unknwon 063aacd436 UI: Use tooltip not alert when copy clone URL 2014-09-22 14:47:47 -04:00
Unknwon 196efecaaa Fix #491 2014-09-22 11:04:46 -04:00
lunnyxiao 7df60af60e submodule support and closed #478 2014-09-22 14:23:36 +08:00
lunnyxiao 79ec08141a Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-22 10:45:20 +08:00
lunnyxiao 150eef93b2 add submodule basic support & buf fixed #478 2014-09-22 10:43:16 +08:00
Unknwon 4a01bb8fa4 Mirror bug fix 2014-09-21 12:19:50 -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 a596388ebf Add success message after transfer repository #481 2014-09-17 14:52:46 -04:00
Unknwon 8a09256941 Mirror fix and fix #481 2014-09-17 14:22:51 -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
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
Benjamin Peng cff3ca23a5 Fix TimeSince arguments error. 2014-09-16 15:55:41 +08:00
Unknwon 632b1b694d Fix #465 2014-09-15 09:56:12 -04:00
Unknwon 7027ac9308 Fix #461 2014-09-14 16:43:22 -04:00
Unknwon b9560374cd UI fix 2014-09-13 22:12:11 -04:00
Mathieu Gagnon 3549fb0ea8 Remove APP_LOGO setting 2014-09-13 03:52:51 -04:00
Unknwon cfed11f092 Bug: Transfer repository doesn't update the count 2014-09-12 18:29:58 -04:00
Unknwon fdc8c34258 Fix clone panel z-index 2014-09-10 11:32:14 -04:00
Unknwon 33659ed9a5 Fix #452 2014-09-09 10:17:35 -04:00
Unknwon f8977f4847 Organization level webhooks 2014-09-07 19:39:26 -04:00
无闻 e79e4b1580 Merge pull request #442 from compressed/org_hook
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
Unknwon 0ddb1eb769 Finish new install page, almost ready for 0.5 release 2014-09-07 19:02:58 -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
Michael Dyrynda aee46bac01 add rel attribute such that font-awesome icons load correctly 2014-09-04 09:12:51 +09:30
Michael Dyrynda dcb10a41d4 Add handling to branch switcher label to make label more consistent with
GitHub behaviour

Addresses #431
2014-09-03 10:01:32 +09:30
Unknwon 830efc90da update docs and mirror bug fix 2014-09-02 07:11:39 -04:00
Christopher Brickley 00a864e693 add commit compare functionality 2014-09-01 14:56:19 -04:00
Unknwon c5ce33047e Mirror fix and hide missing pages for 0.5 release 2014-09-01 00:33:40 +08:00
Christopher Brickley 2bce24068d add Slack API webhook support 2014-08-31 12:01:59 -04:00
无闻 ae2f4866d0 Merge pull request #400 from deringer/dev
Add missing 'new migration' link
2014-08-31 21:07:14 +08:00
Unknwon 676bd764fa UI: SSH/HTTPS address switch and copy 2014-08-31 21:03:16 +08:00
Michael Dyrynda 1bbf4c9768 Add missing 'new migration' link
Addresses issue #399
2014-08-31 21:06:50 +09:30
Unknwon 7e36bf448d Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
	dockerfiles/README.md
2014-08-31 15:11:55 +08:00
Tristan Storch 69e332f432 Removed trailing white spaces
Removed trailing whitespaces with

```sh
for file in `grep -r " $" * | cut -d : -f 1 | sort | uniq | grep -v " "`; do sed -i 's/[ \t]*$//' $file; done
```

and some handwork.
2014-08-30 15:12:53 +02:00
Unknwon 9bc63bda7d Finish all new admin pages. 2014-08-30 20:49:51 +08:00
Unknwon d2aff9a46a Continue working on new admin pages 2014-08-29 20:50:43 +08:00
Unknwon 8829174574 Finish new admin users pages 2014-08-29 15:32:52 +08:00
Unknwon 1aec1a2dda Finish new admin dashboard 2014-08-28 22:29:00 +08:00
Unknwon 81287ba022 Mirror issue fix 2014-08-27 22:40:45 +08:00
Unknwon 9baf2b38d0 Bug fix on organization 2014-08-27 16:39:36 +08:00
Unknwon 74b31566cf Finsih add/remove repo in organization 2014-08-26 18:11:15 +08:00
Unknwon f2c263c54f fix #367 2014-08-25 09:45:39 +08:00
Unknwon 21a1b8e5a3 Finish new edit team page, add member to team 2014-08-24 21:09:05 +08:00
Unknwon b765229a6d Fix code style 2014-08-23 20:30:29 +08:00
Unknwon fa60502a70 Working on organization pages 2014-08-23 20:24:02 +08:00
Unknwon bba707de36 Finish team list, create new team, join/leave team page 2014-08-16 16:21:17 +08:00
Unknwon 78add502d7 Finish new organization members and invitation page 2014-08-15 23:37:33 +08:00
Unknwon 36b4c57ff1 Finish new organization members and invitation page 2014-08-15 18:29:41 +08:00
Unknwon 5acc948562 Page: /org/:orgname/settings 2014-08-14 14:12:21 +08:00
Unknwon 5fbf8531e6 Finish new home page of organization 2014-08-10 20:11:18 -07:00
Unknwon 7af7584d25 Finish new reset password, etc. 2014-08-09 21:02:00 -07:00
Unknwon 78defd238c Page: Manage social accounts 2014-08-09 17:25:02 -07:00
Unknwon 08c6d07aad UI: Bare repository does not have visual link to settings page 2014-08-09 15:50:06 -07:00
Unknwon 9a1d5d2489 Finish new web hook pages 2014-08-09 15:40:10 -07:00
Unknwon 9820b8e134 Finish new hooks list page 2014-08-09 10:29:51 -07:00
lunnyxiao 7c7014262b Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-08 13:51:43 +08:00
lunnyxiao 57f6ec672a bug fixed 2014-08-08 13:51:02 +08:00
Unknwon e8c9bb2c66 Finish new collaboration page 2014-08-07 06:40:05 -04:00
Unknwon a8e05fdf1b Use toolbox 2014-08-06 17:21:24 -04:00
Unknwon fa0a389dc4 Fix bare repo bug 2014-08-05 19:40:01 -04:00
Unknwon 755eec745f Finish new repo settings page 2014-08-02 13:47:33 -04:00
Unknwon dabf5b057c Finish new migrate page 2014-08-01 00:06:19 -04:00
Unknwon 7bbf644dd5 Convert captcha, cache, csrf as middlewares 2014-07-31 17:25:34 -04:00
Unknwon 3428baa3b5 Mirror fix on template 2014-07-30 10:02:31 -04:00
Unknwon 9813161411 Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page 2014-07-26 23:53:16 -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 5c4bc3c848 Huge updates!!!!! Be careful to merge!!!! 2014-07-26 02:28:04 -04:00
Unknwon 3f38ff6c09 Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
	templates/status/500.tmpl
2014-07-26 00:25:43 -04:00
Unknwon 8dd07c0ddd New UI merge in progress 2014-07-26 00:24:27 -04:00
Ciaran Downey 7921e60f30 Change "an error is occurred" to "has occurred" 2014-07-25 20:51:05 -07:00
Justin Nuß 12fb42de5a Fix IE bug and show errors. 2014-07-25 11:13:42 +02:00
Justin Nuß 4e2477a1a5 Fix #318. Switch to JS(ON) implementation for issue/comment creation. 2014-07-25 10:47:37 +02:00
Justin Nuß dedb156d4a Fix #321. Allow empty comments as long as there are attachments. 2014-07-25 08:01:34 +02:00
Justin Nuß 4d702eb345 Allow disabling uploads 2014-07-24 15:51:40 +02:00
Justin Nuß bfe5b86004 Add file upload for attachments 2014-07-24 15:19:59 +02:00
Justin Nuß 43e5de7f83 Show attachments in issues/comments and add preview for images 2014-07-24 13:50:03 +02:00
Justin Nuß 1129f756c8 Fix missing . (dot) in issue templates 2014-07-24 12:37:26 +02:00
Justin Nuß 967856f36e Merge branch 'dev' into feature/attachments
Conflicts:
	models/issue.go
	routers/repo/issue.go
2014-07-24 12:29:37 +02:00
Justin Nuß d43c5895bc Update template and style, only close commit if commit is in same repository 2014-07-24 10:15:05 +02:00