Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-02-26 16:31:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,334 Commits 16 Branches 117 Tags
a74bbd3eeb47c4ff63ddec5b41af0f64b64c6758
Commit Graph

1183 Commits

Author SHA1 Message Date
yjkony
a74bbd3eeb Merge branch 'master' into add-features-to-ldapauth 2014-03-13 18:10:41 +09:00
takezoe
49bf88f7a7 (refs #312)Fix redirection for non git client 2014-03-12 22:39:12 +09:00
yjkony
4e2a3fdbd0 Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty". 2014-03-11 12:56:00 +09:00
yjkony
8d200c72d3 Merge branch 'master' into add-features-to-ldapauth 2014-03-10 11:05:02 +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
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
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
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
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
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
takezoe
d870896cfb Rename CreateRepositoryController to CreateController. 2014-03-03 01:21:22 +09:00
takezoe
270eb7cf1d (refs #198)Allow create group by normal users. 2014-03-03 01:17:52 +09:00
takezoe
04e4572088 Merge branch '1.11-update' 2014-03-03 00:04:18 +09:00
takezoe
0961eb5976 (refs #279)Fix redirect url generation. 2014-03-02 23:55:03 +09:00
takezoe
ec09adf03e Merge branch 'odz-closing-issues-via-commit-messages' 2014-03-02 04:49:53 +09:00
takezoe
b031103df8 (refs #218)Separate StringUtil#extractCloseId() to add unit test. 2014-03-02 04:49:14 +09:00
takezoe
7701521a2e Fix to use Exception#ignoring to ignore Exception. 2014-03-02 04:24:24 +09:00
takezoe
0c683d4f75 Merge branch 'closing-issues-via-commit-messages' of https://github.com/odz/gitbucket into odz-closing-issues-via-commit-messages 2014-03-02 04:02:45 +09:00
Naoki Takezoe
200d095034 Merge pull request #290 from lefou/compare-email-caseinsensitive 
Compare email adresses case-insensitive.
 2014-03-02 01:35:00 +09:00
takezoe
94576a876a (refs #280)Commit count limitation is changed to 10000 from 1000. 2014-03-02 01:23:30 +09:00
takezoe
0fa1922bb0 Small fix to pull request #289 2014-03-02 01:05:42 +09:00
Naoki Takezoe
c557905858 Merge pull request #289 from lefou/description-in-header 
Show repository description below the name on repository page.
 2014-03-02 00:56:07 +09:00
takezoe
e97b5c3c89 (refs #279)Remove --https option because it's possible to substitute in the base url configuration. 2014-03-01 15:24:55 +09:00