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
9b15af3bb7
Update README.md for 1.11.1 release
2014-03-05 22:16:37 +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
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
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
Naoki Takezoe
721454aa90
Merge pull request #294 from eiryu/work
...
fix typo
2014-03-03 01:21:59 +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.
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
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
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
yjkony
639e7e0b3f
Add features (additional filter condition / disable mail resolve) to LDAP authentication.
2014-02-28 21:32:42 +09: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
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
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
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
takezoe
0dd37c2481
(refs #279 )Fix redirect URL generation in authentication.
2014-02-24 02:14:10 +09:00
Ali Ayas
b5d7c96bba
Apply GitHub diff colors
...
However, jsdifflib is still not a good approach. It requires dumping all the two text to the browser and do the work there. Instead, maybe the diff should be taken from the git itself and highlighting should be applied on that.
OTOH, word level diff would be good when applicable (like GitHub does).
2014-02-23 13:11:10 +02: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
39091240ff
(refs #60 )Mentioned issue reference from other issue or issue comment.
2014-02-22 05:13:39 +09:00
takezoe
0ccb753892
(refs #187 )Add large icons for repository.
2014-02-22 02:00:49 +09:00
