yjkony
00af52815d
Merge commit '5317ac5e031a29438657952fb882532af296135b' (tag 1.12) into add-features-to-ldapauth
2014-03-31 12:37:23 +09:00
takezoe
1fe649e70f
(refs #326 )SSH clone URL includes username for logged-in users and it's hidden for non logged-in users.
2014-03-25 05:11:29 +09:00
takezoe
40d3f0ef9e
(refs #313 )Search files which have FileMode.EXECUTABLE_FILE mode not only REGULAR_FILE
2014-03-16 01:55:26 +09:00
takezoe
f5883abf04
Use Context#settings instead of loadSystemSettings()
2014-03-15 04:07:31 +09:00
yjkony
9175cf5c71
Merge branch 'master' into add-features-to-ldapauth
...
Conflicts:
src/main/twirl/account/edit.scala.html
2014-03-14 15:56:08 +09:00
takezoe
d1c6c763e2
(refs #115 )Add button to toggle http/ssh for wiki repository url box
2014-03-14 10:59:42 +09:00
takezoe
63de780527
Remove last '/' in base url
2014-03-14 03:21:35 +09:00
takezoe
70192ce420
(refs #115 )Add new method to get sshUrl to RepositoryInfo
2014-03-13 22:26:15 +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
845f2d6faa
(refs #115 )Start and stop sshd at the system settings
2014-03-10 00:44:25 +09:00
takezoe
5e6c33df6c
(refs #115 )Fix account registration page and add public key deletion
2014-03-09 01:38:23 +09:00
takezoe
f99d37cfad
(refs #115 )Adding SSH Key form is available
2014-03-09 00:57:00 +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
e0d266bf16
(refs #241 )Allow group manager to use repository settings
2014-03-06 15:30:58 +09:00
takezoe
8cdf4ef618
Merge branch 'improve-group'
2014-03-06 11:06:19 +09:00
yjkony
328d6c1d17
Merge branch 'master' into add-features-to-ldapauth
2014-03-06 10:52:16 +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
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
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
b031103df8
(refs #218 )Separate StringUtil#extractCloseId() to add unit test.
2014-03-02 04:49:14 +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
98266fe0e1
(refs #279 )Fix webhook URL to use the configured base URL.
2014-03-01 13:05:42 +09:00
Tobias Roeser
f13d757976
Compare email adresses case-insensitive.
2014-02-28 16:28:40 +01:00
yjkony
639e7e0b3f
Add features (additional filter condition / disable mail resolve) to LDAP authentication.
2014-02-28 21:32:42 +09:00
odz
8b5414c8f7
Merge branch 'master' into closing-issues-via-commit-messages
...
Conflicts:
src/main/scala/app/PullRequestsController.scala
src/main/scala/servlet/GitRepositoryServlet.scala
2014-02-25 00:07:25 +09:00
takezoe
a76792ced4
(refs #279 )Add configuration to specify the base URL. But still one problem has not been resolved.
2014-02-22 14:20:51 +09:00
takezoe
d683dd2c38
(refs #268 )Fix label filter bug when label contains whitespaces.
2014-02-08 07:04:18 +09:00
takezoe
b885a1a0d4
(refs #256 )If account is already registered but disabled, authentication fails.
2014-02-01 17:05:33 +09:00
takezoe
e87c69f989
(refs #251 )Remove BOM from UTF-8 string.
2014-02-01 07:08:03 +09:00
takezoe
5a1f541e13
(refs #245 )Add full name attribute for LDAP authentication.
2014-01-25 05:07:32 +09:00
takezoe
fba81138ea
(refs #102 )Experimental implementation of transfer repository ownership
2014-01-18 04:14:32 +09:00
takezoe
f33b398428
(refs #102 )Change for transfer repository owner.
2014-01-16 19:39:14 +09:00
takezoe
ebcc5ab4b1
(refs #101 )Update links in activity message also.
2014-01-15 04:35:38 +09:00
takezoe
df1f3d8a00
(refs #101 )Modification to add rename repository name.
2014-01-13 02:09:05 +09:00
takezoe
0e9bf59c0f
Remove some functions from ControlUtil.
2013-12-15 04:21:39 +09:00
odz
dc78dc9b0d
Close issues via commit messages
2013-11-30 18:57:19 +09:00
takezoe
7e10618ceb
Merge branch 'pullreq-update-in-push' of https://github.com/odz/gitbucket into odz-pullreq-update-in-push
...
Conflicts:
src/main/scala/app/PullRequestsController.scala
2013-11-30 02:35:21 +09:00
odz
223ba791fe
Fetch pull request from source repository after updating repository.
2013-11-20 23:59:26 +09:00
odz
0d49bbe7ac
Resolves error when deleting repsository with PR.
2013-11-20 01:53:18 +09:00
Naoki Takezoe
f38924c7fe
Merge pull request #190 from jtyr/master
...
Adding LDAP StartTLS support
2013-11-15 09:10:38 -08:00
Jiri Tyr
612aba1365
Use the system keystore by default
...
Default system keystore is in:
$JAVA_HOME/lib/security/jssecacerts
or in:
$JAVA_HOME/lib/security/cacerts
Custom keystore can be set either in /etc/sysconfig/gitbucket by
specifying the following option:
GITBUCKET_JVM_OPTS="-Djavax.net.ssl.trustStore=/path/to/your/cacerts"
or in Gitbucket's System Settings.
2013-11-07 16:57:40 +00:00
Jiri Tyr
cc241c5a7b
Moving keystore definition into settings
2013-11-05 15:08:03 +00:00
takezoe
3dec2b8159
Fix test case.
2013-11-03 15:12:01 +09:00
takezoe
2118f8c764
(refs #114 )Add group deletion.
2013-11-03 01:37:23 +09:00
takezoe
81e2ac44c3
(refs #114 )Remove user related data when user is removed.
2013-11-02 14:01:07 +09:00