Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 22:45:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,554 Commits 14 Branches 116 Tags
e2c99a46be4e7ef0456095d5135fc5874f06c062
Commit Graph

325 Commits

Author SHA1 Message Date
yjkony
e2c99a46be Merge commit Tag 2.0 'db5395ddbc4aef485415408720dd09cfc215b527' into add-features-to-ldapauth 
Conflicts:
	src/main/twirl/account/edit.scala.html
 2014-06-02 17:01:22 +09:00
Naoki Takezoe
a846c77c7e (refs #346)Add group members as collaborator when transfer repository to the group. 2014-05-25 18:14:53 +09:00
Tomofumi Tanaka
dc21e8388e Improve update pull request query 
commitIdFrom and commitIdTo columns update by one query.
 2014-05-02 19:55:49 +09:00
yjkony
8c35310cd6 Merge commit Tag 1.13 ('3e82534c78a72e17dd3b79e091521d75cb4d3855') into add-features-to-ldapauth 
Conflicts:
	src/main/scala/service/AccountService.scala
	src/main/scala/util/LDAPUtil.scala
 2014-05-01 11:56:56 +09:00
Tomofumi Tanaka
dd694d27b5 (refs #324)Update commitIdFrom when pullrequest branch is updated 2014-04-29 17:24:51 +09:00
takezoe
0f9c95c15a baseUrl calculation is concentrated to SystemSettings 2014-04-29 15:43:41 +09:00
Naoki Takezoe
0e5591017a Refactoring 2014-04-25 10:38:34 +09:00
Naoki Takezoe
ad244adbfa (refs #13)Commit from AceEditor is available. 2014-04-24 21:49:30 +09:00
Naoki Takezoe
3f76453f34 (refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table 2014-04-10 17:42:25 +09:00
Naoki Takezoe
c128086778 (refs #335)Revert account updating in LDAP authentication 2014-04-08 16:34:01 +09:00
Naoki Takezoe
cc4fb8bf79 (refs #335)Add Scaladoc 2014-04-08 16:24:53 +09:00
Naoki Takezoe
c3ac0f3d9f (refs #335)Fix account updating in LDAP authentication 2014-04-08 16:21:10 +09:00
Naoki Takezoe
b357d52ec5 (refs #335)Fix LDAP authentication 2014-04-07 21:08:13 +09:00
takezoe
1ec825050d (refs #335)Use string before '@' of mail address if user name is mail address in LDAP authentication. 2014-04-03 08:47:42 +09:00
takezoe
9a47c4a990 Fix #334 2014-04-03 00:32:39 +09:00
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