Commit graph

701 commits

Author SHA1 Message Date
evolvedlight 8d2a6fc484 Merge remote-tracking branch 'upstream/dev'
Conflicts:
	models/repo.go
2014-10-13 20:30:31 +01:00
Unknwon 452ccff81c Mirror fix on add ssh key 2014-10-11 21:04:42 -04:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -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 85c9f7c5f3 Issue: Show error prompt when add repository to team and it does not exist #533 2014-10-10 05:06:12 -04:00
Unknwon d78abd3561 Mirror fix on admin/orgs paging 2014-10-10 03:28:21 -04:00
evolvedlight 211dc74816 Got the fork count working 2014-10-10 00:21:36 +01:00
Unknwon 1aa76bd279 Fix #532, add system notice 2014-10-08 18:29:18 -04:00
Unknwon 1e1f9e7166 Update with macaron 2014-10-06 19:12:52 -04:00
Unknwon 64c68220d2 Fix #264 2014-10-06 17:50:00 -04:00
evolvedlight c9e5e38fcf Initial cut of git fork 2014-10-04 18:19:14 +01: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
fuxiaohei 7d48f811f1 add issue router for new issue page ui preview 2014-09-27 19:03:07 +08:00
Unknwon b8368f98ff Add directory level commit message 2014-09-26 08:55:13 -04:00
lunnyxiao d1911658e1 remove debug info 2014-09-26 12:17:46 +08:00
Unknwon ad52b2d791 Mirror fix on transfer repo 2014-09-25 22:36:07 -04:00
Unknwon 977779cdcf Mirror template bug fix 2014-09-25 20:55:14 -04: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 3f707b3f32 Add basic submodule support 2014-09-22 17:01:19 -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
Martin van Beurden 976f1486e0 Set cookiepath to AppSubUrl 2014-09-21 14:25:22 +02: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
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
tobyzxj ad041167f7 fix user's actions on domain/org/name-of-organization/dashboard 2014-09-16 16:20:32 +08:00
Unknwon 632b1b694d Fix #465 2014-09-15 09:56:12 -04:00
Unknwon efb68a0a96 Fix UI issue 2014-09-14 19:22:52 -04:00
Mathieu Gagnon 3549fb0ea8 Remove APP_LOGO setting 2014-09-13 03:52:51 -04:00
Unknwon a2cac952a4 Prepare 0.5 release 2014-09-12 21:36:26 -04:00
Unknwon cfed11f092 Bug: Transfer repository doesn't update the count 2014-09-12 18:29:58 -04:00
Unknwon 25d6ae69d1 Remove hg dep 2014-09-07 19:58:01 -04:00
无闻 e79e4b1580 Merge pull request #442 from compressed/org_hook
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
无闻 40bc130b19 Merge pull request #447 from m0sth8/fix-milestone-render-markdown
Render milestone content as markdown
2014-09-07 19:19:10 -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 f7be61c819 getOrgRepoCtx returns values directly & err 2014-09-05 07:19:34 -04:00
Christopher Brickley 85c35a6b8b add organization-level webhooks 2014-09-05 07:19:34 -04:00
Christopher Brickley 7269b06fd5 HookType is case-sensitive
Update webhook wasn’t showing up because of the wrong case
2014-09-05 07:19:34 -04:00
Vyacheslav Bakhmutov 6498fce04b Render milestone content as markdown 2014-09-05 09:10:58 +07:00
Vyacheslav Bakhmutov 2a7a03e5b3 take params for milestone and assignee from query instead of path args 2014-09-03 00:04:22 +07:00
Christopher Brickley 00a864e693 add commit compare functionality 2014-09-01 14:56:19 -04:00
Christopher Brickley 2bce24068d add Slack API webhook support 2014-08-31 12:01:59 -04: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 904bf1a50b Add migrate repo API 2014-08-29 17:31:53 +08:00
Unknwon 8829174574 Finish new admin users pages 2014-08-29 15:32:52 +08:00
lunnyxiao a6ec6def8d Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-29 11:25:03 +08:00
lunnyxiao c40e815763 add migrate api 2014-08-29 11:24:37 +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 50de06056b Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-26 18:11:27 +08:00
Unknwon 74b31566cf Finsih add/remove repo in organization 2014-08-26 18:11:15 +08:00
Marios Andreopoulos 510d5a5d74 import strings 2014-08-25 21:07:08 +03:00
Marios Andreopoulos cd0ddcfa01 fix typo 2014-08-25 20:35:23 +03:00
Marios Andreopoulos 3d79f59671 fix wrong variable name 2014-08-25 20:20:44 +03:00
Marios Andreopoulos b40922f4d4 remove extra comma 2014-08-25 20:07:47 +03:00
Marios Andreopoulos 12639c577f Remove newline characters from ssh key before processing it.
Fixes issue #370: https://github.com/gogits/gogs/issues/370
2014-08-25 18:54:50 +03: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 e0a2d23baf Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-23 20:24:31 +08:00
Unknwon fa60502a70 Working on organization pages 2014-08-23 20:24:02 +08:00
lunnyxiao 97fb62f51e auto detect text file encode and convert to utf8 2014-08-20 16:34:48 +08:00
Unknwon a60edbe88c Add/remove member need add/remove access to repositories as well 2014-08-16 16:58:32 +08:00
Unknwon bba707de36 Finish team list, create new team, join/leave team page 2014-08-16 16:21:17 +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 5605af973b Feature: Social sign in 2014-08-09 18:01:29 -07:00
Unknwon 78defd238c Page: Manage social accounts 2014-08-09 17:25:02 -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
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 6fc2107529 Add missing less files 2014-08-05 21:18:29 -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 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
Justin Nuß 7de3dd01de Use :index instead of :issue in UpdateIssueMilestone 2014-07-26 11:10:49 +02:00
Unknwon 5c4bc3c848 Huge updates!!!!! Be careful to merge!!!! 2014-07-26 02:28:04 -04:00
Unknwon 8dd07c0ddd New UI merge in progress 2014-07-26 00:24:27 -04: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 ad7beb78d0 Fix #312. Quote file names of attachments. 2014-07-24 23:13:35 +02:00
Justin Nuß 620c0ef297 Merge branch 'dev' of https://github.com/gogits/Gogs into trello/244 2014-07-24 19:15:35 +02:00
Justin Nuß cbcd08aa17 Mention organisation users when organisation gets mentioned 2014-07-24 19:15:31 +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ß ef1cbcd761 Allow admins to delete attachments. 2014-07-24 12:39:03 +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
Justin Nuß 3c025b3950 Add delete route for attachments, remove upload buttons from issues/comments 2014-07-24 09:05:15 +02:00
Justin Nuß 34304e6a0c WIP: Allow attachments for issues, not only comments 2014-07-23 21:24:24 +02:00
Justin Nuß 4617bef895 WIP: Allow attachments for comments 2014-07-23 21:15:47 +02:00
Justin Nuß 469cbc8813 Update progress of milestones when closing/reopening issues and allow closing of issues in commit messages 2014-07-23 13:48:06 +02:00
Justin Nuß 812f71e21b Update milestone issue stats when reopening/closing issue 2014-07-22 22:35:59 +02:00
无闻 536f65b8ad Merge pull request #293 from wmark/master
Enable users to upload other key types than RSA (+ ED25519, ECDSA, NTRU, McE)
2014-07-20 21:05:27 -04:00
W-Mark Kubacki 887ad1ec8b Utilize ssh-keygen for checking of keys.
Removes the limitation to RSA and enables us to use all key types
SSH recognizes.
2014-07-20 18:56:07 +02:00
gima 5a97cc69ed Make possible for administrators to change user's password (fix proposal for #290) 2014-07-18 05:30:57 +03: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
fuxiaohei c127d84777 add organization team-single page 2014-07-07 18:13:42 +08:00
Unknown 63cc14062a Paging function for users and repositories 2014-07-07 04:15:08 -04:00
Unknown 7ffdabb28f Move debug router location 2014-07-06 18:25:07 -04:00
Justin 10f932b952 Fix wrong method for profiling routes. 2014-07-05 17:24:44 +02:00
Unknown be8ac7fb75 fix #273 2014-07-04 16:48:36 -04:00
Unknown 7f3015b32b Merge branch 'dev' of github.com:gogits/gogs into dev 2014-07-04 14:44:31 -04:00
Unknown 13b032f829 update name 2014-07-04 14:44:27 -04:00
Justin Nuß a481672c5c Add 'pprof' tag for enabling debugging 2014-07-04 11:41:43 +02:00
Unknown 465dc962b5 Finish create organization team 2014-07-02 16:42:16 -04:00
Unknown e4ea5cf598 Finish Teams page 2014-06-29 16:30:41 -04:00
Unknown 99713e1180 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-06-28 15:43:28 -04:00
Unknown 5dbfe3c26c Finish organization homepage 2014-06-28 15:43:25 -04:00
Lunny Xiao 4ce2fa520a Merge branch 'master' into dev 2014-06-28 15:00:38 +08:00
Lunny Xiao 86e2627175 Merge branch 'master' of github.com:gogits/gogs
Conflicts:
	models/update.go
	routers/repo/http.go
2014-06-28 14:58:59 +08:00
Lunny Xiao e5ae41e21f bug fixed #261 2014-06-28 14:55:33 +08:00
Unknown 6e448b0714 Finish delete organization 2014-06-28 00:40:07 -04:00
Unknown ee9b7f322f Clean code 2014-06-27 23:14:33 -04:00
Unknown 57ac15aa20 Merge branch 'master' of github.com:gogits/gogs into dev 2014-06-27 23:12:55 -04:00
Lunny Xiao 7dbeee94e3 bug fixed #236 2014-06-28 11:06:07 +08:00
fuxiaohei 1d55ecd29c add organization team-create page 2014-06-27 22:04:04 +08:00
fuxiaohei b5ba2bd268 add organization team-create page 2014-06-27 21:33:49 +08:00
Unknown 19e9104289 Organization settings page 2014-06-27 03:37:01 -04:00
Unknown 32b09681b2 Migrate repository by organization 2014-06-25 05:35:23 -04:00
Unknown 43b33440b5 Work on create organization repo and #257 2014-06-25 05:14:36 -04:00
Unknown 4cf7a1fca5 Mirror update on create repo page 2014-06-25 03:55:59 -04:00
Unknown e0f9c628c5 Add create organization 2014-06-25 00:44:48 -04:00
Unknown b2801a2e98 Fix #165 2014-06-24 13:55:47 -04:00
Unknown 98f614a58e Work on #249 issue1 2014-06-23 19:16:09 -04:00
Unknown 47d29a1ee0 Mirror fix on #248 2014-06-23 16:22:34 -04:00
fuxiaohei fb53cc4fa8 add organization setting page 2014-06-23 19:11:20 +08:00
fuxiaohei f393dc6520 add organization dashboard page 2014-06-23 12:08:53 +08:00
fuxiaohei ea507e20d4 add organization create page 2014-06-23 11:40:49 +08:00
Unknown 314193029a Use constants to name template file 2014-06-22 23:11:12 -04:00
Unknown 9c82073091 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-06-22 13:17:47 -04:00
Unknown 9924e65ca1 In progress of name template name constant 2014-06-22 13:14:03 -04:00
fuxiaohei adda10f4a4 add organization teams page 2014-06-22 21:53:40 +08:00
fuxiaohei 514d7e1922 add organization memebers page 2014-06-22 16:53:46 +08:00