Commit graph

679 commits

Author SHA1 Message Date
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
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
无闻
8e4debe99d Merge pull request #297 from nuss-justin/issue/288
Fix issue #288. Only show label form if repository collaborator/admin
2014-07-22 16:13:22 -04:00
无闻
dc2e140360 Merge pull request #296 from nuss-justin/dev
Fix issue 280 & unwatch button in Firefox
2014-07-22 16:03:58 -04:00
Justin Nuß
e194cf3291 Fix issue #259. Allow links in the repository description 2014-07-22 19:52:37 +02:00
Justin Nuß
ccca60a5a1 Fix issue #288. Only show label form if repository collaborator/admin 2014-07-22 14:20:32 +02:00
Justin Nuß
18718afb36 Hide watch/unwatch button if not loggedin 2014-07-22 11:57:10 +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
Lunny Xiao
6418caf23a add build script 2014-07-16 09:48:19 +08: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
097c8e05e6 Able to set timeout for process monitor 2014-07-06 17:32:36 -04:00
Unknown
be8ac7fb75 fix #273 2014-07-04 16:48:36 -04:00
Unknown
0820b24f0b Merge branch 'master' of github.com:gogits/gogs into dev 2014-07-04 01:25:19 -04:00
Unknown
cdffdeddc9 Fix bug that collaborators are able to modify settings of repository 2014-07-04 01:23:11 -04:00
Unknown
465dc962b5 Finish create organization team 2014-07-02 16:42:16 -04:00
António Meireles
3ad20773a2 fix typos in users' editing template. 2014-06-30 20:12:55 +01:00
Unknown
e4ea5cf598 Finish Teams page 2014-06-29 16:30:41 -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
ee9b7f322f Clean code 2014-06-27 23:14:33 -04: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
fuxiaohei
72ba273cc9 select owner when creating repository 2014-06-25 16:03:29 +08:00
Unknown
4cf7a1fca5 Mirror update on create repo page 2014-06-25 03:55:59 -04:00
fuxiaohei
80be060735 select owner when creating repository 2014-06-25 13:08:28 +08:00
Unknown
8e6c254c03 Mirror fix on create repo 2014-06-25 00:53:45 -04:00
Unknown
3624b2a7f1 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-06-25 00:44:59 -04:00
Unknown
e0f9c628c5 Add create organization 2014-06-25 00:44:48 -04:00
fuxiaohei
cc703ee663 select owner when creating repository 2014-06-25 12:22:08 +08:00
Unknown
b2801a2e98 Fix #165 2014-06-24 13:55:47 -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
bf703ef617 add dashboard context switch button 2014-06-22 14:10:12 +08:00
Unknown
ad5ec45dd6 Fix #165 2014-06-21 00:51:41 -04:00
Unknown
6c8d630bef Add database log adapter 2014-06-20 00:25:23 -04:00
Unknown
f147ad619a Basic process manager 2014-06-19 01:08:03 -04:00
Unknown
d952b4200c Add corn rask monitor panel 2014-06-13 13:01:52 -04:00
Unknown
e07674bff1 Support edit release and save as draft 2014-06-12 17:47:23 -04:00
Unknown
fb0972afad Fix #199 2014-06-12 09:35:51 -04:00
Unknown
9961f9a53c Fix #197 2014-06-12 09:10:39 -04:00
Unknown
a3e1383cac Add gogs fix location command 2014-06-10 19:11:53 -04:00
Unknown
f160b4f33c Add tar.gz download button and other mirror updates 2014-06-08 17:53:53 -04:00
Unknown
a80d8d96fa Merge branch 'dev' of github.com:gogits/gogs into dev 2014-06-08 04:45:38 -04:00
Unknown
302c863cda Fix #242 2014-06-08 04:45:34 -04:00
FuXiaoHei
4fcbf553aa organisation main page ui 2014-06-07 13:27:24 +08:00
Unknown
4f2f3c2857 Code convention 2014-06-05 22:07:35 -04:00
Unknown
63baf76ab2 Fix #214 2014-06-03 12:51:53 -04:00
Unknown
eaa7d71fc7 Fix #232 2014-06-02 21:59:56 -04:00
Unknown
afc6cbc479 Update tag 2014-06-01 11:06:03 -04:00
Unknown
2657f88d9a Fix #222 2014-05-31 17:15:04 -04:00
Unknown
617bbe3fee Fix #218 2014-05-30 06:34:24 -04:00
Unknown
ab13a29cb5 Fix #209 2014-05-28 01:53:06 -04:00
Unknown
ff690fd976 Fix #200, add VERSION to template files 2014-05-28 00:06:31 -04:00
Bruno Bigras
6227b59b1a Registeration -> Registration 2014-05-26 12:00:36 -04:00
FuXiaoHei
e0a6e6dd1a issue ui update 2014-05-26 21:21:30 +08:00
Unknown
bf5fcfb49c Add * to selected label 2014-05-25 23:46:45 -04:00
Unknown
80055bde86 Code convention 2014-05-24 15:28:31 -04:00
Unknown
e33a104448 Almost done issue label #200 2014-05-24 03:11:53 -04:00
Unknown
dce17c86ac Almost done issue label #200 2014-05-24 03:05:41 -04:00
Unknown
b1bdbd7f94 Almost done issue label #200 2014-05-24 02:31:58 -04:00
Unknown
5e9a45f74a Code convention 2014-05-21 21:37:13 -04:00
FuXiaoHei
1331134316 finish issue edit content preview 2014-05-21 20:49:47 +08:00
FuXiaoHei
4e8a1bf9c9 fix firefox zclip bug 2014-05-21 20:03:45 +08:00
FuXiaoHei
c82807a713 add issue label attach-detach ui 2014-05-19 23:47:11 +08:00
FuXiaoHei
342baf1dda add label edit and manage ui 2014-05-19 21:55:25 +08:00
Unknown
93f8f92523 Finish create new label 2014-05-18 18:07:04 -04:00
Jason
7fd22bea1e Add dropdown-menu-right class to the repo-watching dropdown
The dropdown menu was dropping down to the right and appearing outside of the page container. This made it not visible at smaller browser widths.

This commit makes it drop down into the page container, instead of out, and keeps it visible at all screen sizes.
2014-05-18 15:57:02 -05:00
Unknown
a0a95d797e Fix ui 2014-05-16 16:21:31 -04:00
Unknown
956f011dd3 Fix #186 2014-05-16 13:41:08 -04:00
FuXiaoHei
16e162b669 issue label ui design 2014-05-16 16:00:09 +08:00
Unknown
4744996f9a Make gmail auth work 2014-05-15 14:46:04 -04:00
Lunny Xiao
7869cfccb9 Merge pull request #192 from DerDackel/ldapssl
Add LDAP over SSL support
2014-05-15 20:52:05 +08:00
Sebastian Jackel
eb264a112b Add LDAP over SSL support 2014-05-15 14:27:16 +02:00
Unknown
b70db61854 Fix #185 2014-05-14 13:04:57 -04:00
Unknown
16bddd593a Finish change issue’s milestone 2014-05-14 11:14:51 -04:00
Unknown
e880a2fa48 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-05-14 10:55:41 -04:00
Unknown
46fc36c3a6 Finish change issue’s milestone 2014-05-14 10:55:36 -04:00
FuXiaoHei
a1bb3741d5 add milestone in new-issue page 2014-05-14 22:01:20 +08:00
FuXiaoHei
4a4392192b add milestone issue view ui 2014-05-14 21:29:54 +08:00
Unknown
5ed5aa5228 Finish milestone 2014-05-13 19:46:48 -04:00
Unknown
33ec0632ff Fix #183 2014-05-13 19:26:13 -04:00
Michael Litvak
cca2a53d6f Fix issue link in issues page
The link assumes that the issue belongs to the signed in
user, which is not necessarily the case
I changed it to use repository owner name instead
2014-05-13 23:37:09 +03:00
Unknown
2eee1e9bc2 Finish edit a milestone 2014-05-13 13:28:21 -04:00
Unknown
98dbbae2ef Fix #166 2014-05-13 12:40:32 -04:00
Unknown
c117f9e73f Fix #166 2014-05-12 20:22:35 -04:00
Unknown
a913aff1d0 Show collaborative repositories in dashboard 2014-05-12 15:14:22 -04:00
Unknown
54e95fa367 Finish add new milestone 2014-05-12 14:06:42 -04:00
Unknown
f1130ce5e9 Fix edit auth page bug 2014-05-12 11:02:36 -04:00
FuXiaoHei
1769bb2f26 add milestone edit ui 2014-05-12 21:51:22 +08:00
Unknown
0970d6cc38 Log to different adapter according to level 2014-05-11 14:37:12 -04:00
Unknown
68fb62347f Finish issue assignee 2014-05-11 13:46:36 -04:00
Unknown
d122aa6d88 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-05-11 10:37:36 -04:00
Unknown
2c73ced0db Fix #173 2014-05-11 10:37:31 -04:00
FuXiaoHei
fd7b0a2ba4 add user new js 2014-05-11 21:27:06 +08:00
FuXiaoHei
27f9b7a144 add user new js 2014-05-11 21:26:47 +08:00
Lunny Xiao
f68e279150 spell bug fixed 2014-05-11 20:18:57 +08:00
Unknown
c5dbc24ca4 UI fix 2014-05-11 07:43:57 -04:00
Lunny Xiao
bf58679390 add support for smtp authentication 2014-05-11 18:10:37 +08:00
FuXiaoHei
cdc87623dc add auth new js 2014-05-11 16:46:38 +08: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
FuXiaoHei
2eabeba6b7 finish milestone add page 2014-05-09 22:33:07 +08:00
FuXiaoHei
045c21de4f assignee ui in issue view 2014-05-09 20:44:08 +08:00
Unknown
e867283406 Assignee back end 2014-05-08 12:24:11 -04:00
FuXiaoHei
a03f380fa8 assignee ui in issue view 2014-05-08 21:49:05 +08:00
FuXiaoHei
11ca10ab2f issue assignee ui 2014-05-08 21:01:47 +08:00
Unknown
33d32585b1 Add mention, read/unread support of issue tracker 2014-05-07 16:51:14 -04:00
Unknown
6fb7229bea Merge branch 'dev' of github.com:gogits/gogs into dev 2014-05-07 12:09:35 -04:00
Unknown
7407f9caf3 Finish issue design 2014-05-07 12:09:30 -04:00
FuXiaoHei
d76772adb9 add milestone list page 2014-05-07 21:01:00 +08:00
Unknown
8ca14e2109 Improve delete SSH key 2014-05-06 16:28:52 -04:00
Unknown
7cb5a15c9b Batch of mirror fixes 2014-05-06 13:47:47 -04:00
Unknown
e573855a4f Fix #98, support web hook 2014-05-06 11:50:31 -04:00
Unknown
94bccbb148 Finish edit and remove web hook 2014-05-05 21:36:08 -04:00
Unknown
24f614f6db Finish add web hook 2014-05-05 20:52:25 -04:00
Unknown
6e3dba2cc5 Clean repo code 2014-05-05 19:58:13 -04:00
Unknown
bbdfe25769 User code clean and ui improve 2014-05-05 16:21:43 -04:00
Unknown
c1eb4d894a Clean api code 2014-05-05 13:08:01 -04:00
FuXiaoHei
d189b83ac1 some ui fix 2014-05-05 20:50:59 +08:00
FuXiaoHei
d34c3bb751 finish webhook ui,
some ui fix
2014-05-05 20:16:24 +08:00
Unknown
3b7465f817 fix code 2014-05-05 05:32:47 -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
02687cbdf3 Add mail notify for new collaborator 2014-05-05 04:27:28 -04:00
Lunny Xiao
79ea34e70e ldap support 2014-05-03 10:48:14 +08:00
Unknown
e10096ee2e Mirror fix on UI 2014-05-02 19:23:06 -04:00
FuXiaoHei
3e856928a2 add webhooks page ui 2014-05-02 22:07:34 +08:00
Unknown
e7d8fadb08 Add disable gravatar option 2014-05-01 21:30:04 -04:00
Unknown
100cd181bc Add router log config option 2014-05-01 18:53:41 -04:00
Unknown
75109bbd65 Fix panic when no master branch 2014-05-01 12:03:10 -04:00
Unknown
f6c4fbeb37 Collaborator 2014-05-01 11:32:12 -04:00
FuXiaoHei
1c88a541cb fix profile ui 2014-05-01 21:27:12 +08:00
FuXiaoHei
cc1eb5643e Merge branch 'dev' of https://github.com/gogits/gogs into dev 2014-05-01 20:57:11 +08:00
Unknown
89c99167b2 Fix #149 2014-05-01 08:26:41 -04:00
Unknown
2a1dc0085b fix #91 2014-05-01 07:35:21 -04:00
FuXiaoHei
52fbb9788a add collaboration page ui 2014-05-01 17:44:22 +08:00
Unknown
eb463000a9 Clean files 2014-05-01 03:27:26 -04:00
Unknown
49dc57e336 Add /api/v1/users/search 2014-04-30 23:48:01 -04:00
Unknown
48bfbb7ddf Mirror changes 2014-04-30 03:44:28 -04:00
Robert Speicher
494e5fd40c Install: Set the default host string based on database type 2014-04-29 16:35:25 -04:00
Unknown
2401e68d7e Prepare for v0.3.1 hotfix 2014-04-28 21:53:40 -04:00
无闻
31805e2bbe Merge pull request #135 from clee/show-parents
Show parents in commit diff page
2014-04-27 19:46:38 -04:00