Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-11 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,964 Commits 14 Branches 116 Tags
dd54ab31cb029be13e032a8f7a632aae1585f24c
Commit Graph

1964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
eiryu
527fd94145 fix typo 2014-03-03 00:28:48 +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. 1.11 2014-03-02 23:55:03 +09:00
Tobias Roeser
0311359922 Merge branch 'master' into asciidoctorj 2014-03-02 09:15:57 +01: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
31b21d74b1 Remove --https option. 2014-03-02 00:25:56 +09:00
takezoe
153244c390 Update README.mf for GitBucket 1.11 release 2014-03-01 15:26:10 +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
takezoe
374893a5ae Apply scala.util.control.Exception to exception handling. 2014-03-01 15:22:58 +09:00
takezoe
17f581f654 (refs #279)Override ScalatraBase#fullUrl() to apply the configured base url to redirection. 2014-03-01 15:19:42 +09:00
takezoe
590b431ec1 Add FlashMapSupport to ControllerBase. 2014-03-01 13:27:36 +09:00
takezoe
98266fe0e1 (refs #279)Fix webhook URL to use the configured base URL. 2014-03-01 13:05:42 +09:00
Tomofumi Tanaka
2e236e90ba (refs #110) Add CommitHook sample 
WIP: Some important functions are not implement yet.
 2014-03-01 02:09:24 +09:00
Tomofumi Tanaka
c5aee0810c (refs #115) Add PublicKeyAuthenticator sample impl 
Auth TODOs

* Fetch user account pubkeys from DB
 2014-03-01 01:00:00 +09:00
Tobias Roeser
f13d757976 Compare email adresses case-insensitive. 2014-02-28 16:28:40 +01:00
Tobias Roeser
7a0a62af2d Show repository description below the name on repository page. 2014-02-28 15:25:32 +01:00
Tomofumi Tanaka
ceab1d2fd2 (refs #115) Reorganize ssh sources 2014-02-28 22:41:01 +09:00
yjkony
639e7e0b3f Add features (additional filter condition / disable mail resolve) to LDAP authentication. 2014-02-28 21:32:42 +09:00
Tobias Roeser
89601305f6 Merge branch 'master' into asciidoctorj 
Conflicts:
	src/main/twirl/repo/files.scala.html
 2014-02-28 09:42:50 +01:00
Tobias Roeser
4600b5a3bf Enabled rendering of page document title. 2014-02-28 09:36:04 +01:00
Naoki Takezoe
b620307983 Merge pull request #287 from lefou/correct-readme-name 
Show the correct name of the readme file
 2014-02-27 15:37:55 +09:00
Tomofumi Tanaka
891ca70ade refs #115: Support git access via ssh (1st step) 
EXPERIMENTAL

TODOs

* Authentication (PublicKey)
* Publickey management in profile view
* Commit hooks integration (WebHook too)
* Parse command correctly
* Make Configurable many options(enable/disable, port, etc...)
* ShellProcessFactory
* Test, test, test...
 2014-02-27 02:05:58 +09:00
Tomofumi Tanaka
9ed2a50d26 Add SSH Service Listener 2014-02-27 02:02:37 +09:00
Tobias Roeser
cbf615d699 Support plain text readme files (with .txt or no extension). 2014-02-26 16:13:39 +01:00
Tobias Roeser
97b1a0090d Initial support for rendering asciidoc files. 2014-02-26 15:14:39 +01:00
Tobias Roeser
9078aa6d08 Added asciidoctorj dependency. 2014-02-26 13:53:50 +01:00
Tobias Roeser
8677146a8d Show the correct name of the readme file (instead of showing always README.md). 2014-02-26 12:12:49 +01:00
Tobias Roeser
2c14dfb781 Show the correct name of the readme file (instead of showing always README.md). 2014-02-26 12:09:14 +01:00
Ali Ayas
057c5f073c Improve diff view 2014-02-26 12:09:25 +02:00
Ali Ayas
e902da6595 Improve code view 
Now it's more similar to GitHub
 2014-02-26 11:40:15 +02: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
Tomofumi Tanaka
c86ece4dc0 Add mina ssh to dependencies 2014-02-24 22:45:45 +09:00
Naoki Takezoe
1f71619b6b Merge pull request #281 from maliayas/patch-1 
Apply GitHub diff colors
 2014-02-24 12:15:57 +09:00
Naoki Takezoe
5b34b9c795 Update README.md 2014-02-24 02:34:13 +09:00
Naoki Takezoe
99d15899f6 Update README.md 2014-02-24 02:32:19 +09:00
takezoe
c114a8b507 (refs #279)Fix TestCase. 2014-02-24 02:16:18 +09:00