Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,670 Commits 14 Branches 116 Tags
601f8c42490fba8487c93c256843b99fcecdc9b5
Commit Graph

251 Commits

Author SHA1 Message Date
shimamoto
601f8c4249 (refs #374) Fix compile error. 2014-08-03 18:41:03 +09:00
shimamoto
b13820fc0e Improved model package. The details are as follows: 
* Fix the Profiles class from package object to simple object
* Fix the row case class to model package
* Define the alias of JdbcBackend#Session
 2014-07-28 04:52:56 +09:00
takezoe
2a8706630a (refs #445)Fix yen to backslash 2014-07-27 17:11:27 +09:00
Naoki Takezoe
34e299bf52 (refs #445)Keep line separator in online file editing 2014-07-26 23:15:47 +09:00
shimamoto
01f6590c04 Fix TODO. 2014-07-14 00:08:34 +09:00
Naoki Takezoe
9dbc0c3fd6 Change LDAPUtil method name 2014-07-13 15:53:12 +09:00
Naoki Takezoe
56bb43ea6b AccountUtil is merged to LDAPUtil 2014-07-13 15:13:59 +09:00
Naoki Takezoe
b287c1f60d Merge branch 'add-features-to-ldapauth' of https://github.com/yjkony/gitbucket into yjkony-add-features-to-ldapauth 
Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/scala/util/LDAPUtil.scala
	src/main/scala/util/Notifier.scala
 2014-07-13 13:49:04 +09:00
Naoki Takezoe
9cfa8c594b Merge branch 'master' into slick2 
Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala
 2014-07-06 17:02:49 +09:00
Naoki Takezoe
606cd83f44 Fix CRLF to LF 2014-07-06 13:19:27 +09:00
Naoki Takezoe
32897c36f9 (refs #341)Fix compilation error other than date mapping and delete statement 2014-07-06 13:07:05 +09:00
Naoki Takezoe
09b9a52ad3 Merge branch 'plugin-system' 2014-07-05 17:36:02 +09:00
shimamoto
c361d24ba4 (refs #341) Implement a method to get the session. 2014-07-01 03:43:55 +09:00
Yuta Okamoto
66b7b69d20 specify LDAP search filter explicitly 2014-06-30 23:38:43 +09:00
Naoki Takezoe
d8c27046f6 Merge branch 'master' into plugin-system 
Conflicts:
	src/main/scala/servlet/AutoUpdateListener.scala
 2014-06-29 04:20:58 +09:00
Naoki Takezoe
fd09058a7d (refs #310)Convert all CRLF to LF 2014-06-29 04:16:37 +09:00
shimamoto
9ee739d102 (refs #341) Migrate slick session. 2014-06-27 08:48:58 +09:00
Naoki Takezoe
707ad866e1 (refs #408)Performance improvement for index page. 2014-06-20 01:42:42 +09:00
Naoki Takezoe
4af4c4e7c6 (refs #32)Add plugin install tab 2014-06-15 13:11:08 +09:00
Naoki Takezoe
f3900ca8f9 (refs #32)Add plugin system initialization 2014-06-14 14:00:21 +09:00
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
HairyFotr
7698f12112 Small cleanup using static analysis 2014-05-31 00:57:03 +02:00
Tomofumi Tanaka
29812f4a82 (refs #375)Show merge commit diffs correctly 2014-05-20 21:26:51 +09:00
takezoe
cf047a8cee Migrate: add extension to files which are attached to issue 2014-05-04 18:45:58 +09:00
Tomofumi Tanaka
619f72d929 Add link for image file 
* Render image tag with link tag on issue and wiki
* Correct response content-type of attached image on issue
 2014-05-03 00:56:36 +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
shimamoto
8efd1da7e6 Merge branch 'fileupload' 2014-04-29 14:42:25 +09:00
takezoe
a97edb7ef5 (refs #13)File editing (add, edit and delete) in repository viewer is available. 2014-04-27 02:02:36 +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
shimamoto
296a0b2124 Removed FileUploadControllerBase(in the middle of improving file 
upload).
 2014-04-23 02:02:19 +09:00
Naoki Takezoe
da105b7180 Merge remote-tracking branch 'origin/master' 2014-04-11 11:58:51 +09:00
Naoki Takezoe
9c4f7cc530 Fix message for empty repository 2014-04-11 11:57:16 +09:00
Tomofumi Tanaka
7b7c0e1eee Fix getAllcommitIds bug in empty repository 2014-04-11 01:35:31 +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
takezoe
91bd9d1111 (refs #335)Oops, fix substring condition 2014-04-03 08:55:50 +09:00
takezoe
a6a08d13e9 (refs #335)Use string before '@' of mail address if user name is mail address in LDAP authentication. 2014-04-03 06:54:56 +09:00
yjkony
00af52815d Merge commit '5317ac5e031a29438657952fb882532af296135b' (tag 1.12) into add-features-to-ldapauth 2014-03-31 12:37:23 +09:00
takezoe
7f78a98de0 Display the first line of commit message on the file list 2014-03-15 18:03:52 +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
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
yjkony
a335c31385 Revert unnecessary format changes. 2014-03-04 10:54:54 +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
17920e1195 (refs #198)Allow group editing by group members. 2014-03-03 01:45:00 +09:00
takezoe
ec09adf03e Merge branch 'odz-closing-issues-via-commit-messages' 2014-03-02 04:49:53 +09:00