Commit Graph

2009 Commits

Author SHA1 Message Date
takezoe
0cfe31ccd9 (refs #115)Fix TestCase 2014-03-08 22:00:36 +09:00
takezoe
8fc1a5473b (refs #115)Add table and model to store public keys 2014-03-08 19:26:49 +09:00
takezoe
049b12b908 Merge branch 'master' into ssh-access
Conflicts:
	src/main/scala/servlet/GitRepositoryServlet.scala
2014-03-08 18:59:13 +09:00
takezoe
45f992b2bc (refs #115)ServletContext is passed to Command 2014-03-08 14:57:17 +09:00
takezoe
9e2c66c341 (refs #115)ServletContext is passed to Command 2014-03-08 14:48:58 +09:00
takezoe
2d0f59b6f2 (refs #307)Fix deletion problem for branches which contains '/' 2014-03-08 04:22:55 +09:00
takezoe
fbba29e810 (refs #303)Submodule support 2014-03-08 02:58:49 +09:00
Tomofumi Tanaka
07a108760c (refs #115)Use regex to create git command
And add GitCommandFactory Unit Test Spec
2014-03-06 23:36:01 +09:00
takezoe
b641bfb56a (refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2 2014-03-06 16:17:41 +09:00
takezoe
c65d80bc72 (refs #241)Fix error occurring when member name contains special characters. 2014-03-06 15:51:12 +09:00
takezoe
e0d266bf16 (refs #241)Allow group manager to use repository settings 2014-03-06 15:30:58 +09:00
takezoe
b62f7c5aee Fix TestCase 2014-03-06 14:27:49 +09:00
takezoe
c89f04b926 (refs #241)Fix group editing in the administration console 2014-03-06 12:17:25 +09:00
takezoe
ff8b4b4a88 Move newrepo.scala.html to account package 2014-03-06 11:39:41 +09:00
takezoe
07d63ae63a Add caret to new icon 2014-03-06 11:39:13 +09:00
takezoe
c0f5cb1641 Move group.scala.html to account package 2014-03-06 11:26:58 +09:00
takezoe
50d84835cb Merge CreateController to AccountController 2014-03-06 11:24:28 +09:00
takezoe
8cdf4ef618 Merge branch 'improve-group' 2014-03-06 11:06:19 +09:00
takezoe
eff3a7acb4 (refs #241)Fix group creation / edition form presentation 2014-03-06 11:05:47 +09:00
yjkony
18cd967a9c Modify wrong label of "Additional filter condition" label in system settings page 2014-03-06 11:03:04 +09:00
yjkony
328d6c1d17 Merge branch 'master' into add-features-to-ldapauth 2014-03-06 10:52:16 +09:00
takezoe
716eddac7b (refs #241)Checkbox for manager is replaced with toggle buttons 2014-03-06 02:46:40 +09:00
takezoe
9b15af3bb7 Update README.md for 1.11.1 release 2014-03-05 22:16:37 +09:00
takezoe
b732e0d55a Fix error when base url is configured. 2014-03-05 22:12:34 +09:00
takezoe
d92a1cee1c Replace Context#path with the base url if it's configured. 2014-03-05 19:18:50 +09:00
Tobias Roeser
10a40bfcaf Removed commented out code. 2014-03-05 09:28:13 +01:00
Tobias Roeser
af397ba150 Fix page-relative links, e.g. in TOC. 2014-03-05 09:12:03 +01:00
takezoe
c7a2ec8290 (refs #299)Fix redirection path in PullRequestsController 2014-03-05 16:23:27 +09:00
shimamoto
145c155ba5 Remove unnecessary import. 2014-03-05 14:40:52 +09:00
shimamoto
6f9ef32d96 (refs #292) Fix to limit issue result before joins issue labels. 2014-03-05 14:35:49 +09:00
takezoe
aa5b9dbbbd Remove unnecessary code 2014-03-05 04:23:44 +09:00
takezoe
f11be44c02 (refs #330)Return NotFound if specified file does not exist 2014-03-05 04:18:45 +09:00
Tobias Roeser
4276c8f23e Support relative links in asciidoc files. 2014-03-04 16:43:56 +01:00
Tobias Roeser
9e1352c8b1 Enabled rendering of renderable files in blob view. 2014-03-04 16:43:50 +01:00
Tomofumi Tanaka
d46589ad29 (refs #115)Ensure exit status 1 on GitCommand error 2014-03-04 23:19:58 +09:00
Tomofumi Tanaka
09b7e67c52 (refs #110)Correct authentication and CommitHook 2014-03-04 22:49:25 +09:00
Tomofumi Tanaka
79e1abe624 (refs #110)Update apache sshd version
For fix authentication partial bug
2014-03-04 22:42:32 +09:00
Tobias Roeser
3db3bf1b74 Rewrite relative links to reflect the base url of the repo. 2014-03-04 11:38:56 +01:00
yjkony
a335c31385 Revert unnecessary format changes. 2014-03-04 10:54:54 +09:00
takezoe
9bd1f0a492 (refs #241)Remove unnecessary code 2014-03-04 10:53:26 +09:00
takezoe
7a2c82461e (refs #241)Group management improvement is completed in user side 2014-03-04 10:52:37 +09:00
takezoe
21f7888f55 (refs #241)Add validation for create / edit group form. 2014-03-04 10:23:44 +09:00
yjkony
97349a9bb2 Merge branch 'master' into add-features-to-ldapauth 2014-03-04 10:16:24 +09:00
yjkony
ce3b6ed7c2 Revert line separator from LF to CRLF 2014-03-04 10:16:12 +09:00
takezoe
e3fd564efd (refs #241)Work for specifying group manager 2014-03-04 04:25:44 +09:00
takezoe
5cf96134d5 (refs #296)Fix redirection path generation again 2014-03-04 03:25:18 +09:00
takezoe
607c477e7d Add options for remote debugging 2014-03-04 02:39:18 +09:00
yjkony
5e0619b500 Sync upstream/maste to master and Merge branch 'master' into add-features-to-ldapauth
Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/twirl/admin/system.scala.html
2014-03-03 15:46:38 +09:00
takezoe
17920e1195 (refs #198)Allow group editing by group members. 2014-03-03 01:45:00 +09:00
Naoki Takezoe
721454aa90 Merge pull request #294 from eiryu/work
fix typo
2014-03-03 01:21:59 +09:00