takezoe
ff0af477cb
Merge branch 'master' into #33_match-by-email
...
Conflicts:
src/main/scala/view/helpers.scala
2013-10-16 01:51:44 +09:00
xuwei-k
9794f14a65
fix deprecation warning. use HttpClientBuilder
...
https://github.com/apache/httpclient/blob/4.3/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java#L113
2013-10-14 14:52:42 +09:00
takezoe
ebf4e5f2e9
Merge branch 'account-full-name' of https://github.com/robinst/gitbucket into robinst-account-full-name
...
Conflicts:
src/main/scala/app/PullRequestsController.scala
2013-10-14 13:40:06 +09:00
xuwei-k
5a3207ae42
avoid NumberFormatException
2013-10-14 03:26:47 +09:00
xuwei-k
d772fc3ba2
refactoring. avoid Option#get
2013-10-14 01:18:31 +09:00
shimamoto
c16b89b0be
(refs #99 ) Improved to configure the FROM field of the email.
2013-10-10 23:57:45 +09:00
Tomofumi Tanaka
e667b6c139
(refs #139 ) Add info log for debugging LDAP Auth
2013-10-10 00:57:46 +09:00
takezoe
72b25591a5
Resolve length issue in Slick.
...
https://github.com/slick/slick/issues/170
2013-10-09 03:11:27 +09:00
Robin Stocker
13bff2963e
Add full name to account and use it to create commits ( #125 )
...
The Git practice is to use the full name when creating commits, not a
user name. This commit fixes that by introducing a fullName field to
Account and using it when creating commits.
For migrating from earlier versions, the user name is used as an initial
value for the full name field.
2013-10-06 23:11:09 +02:00
takezoe
e94411ebeb
(refs #121 )Create WebHookPayload only when web hook has been registered.
2013-10-06 23:22:29 +09:00
takezoe
f1476c52e6
(refs #121 )Optimize push performance for a lot of commit.
2013-10-06 18:31:09 +09:00
takezoe
f4f2bf34fc
(refs #73 )Add Wiki conflict detection and some fix.
2013-10-04 03:48:51 +09:00
takezoe
40a52d5ad5
Clone Wiki working repository if it does not exist before reverting.
2013-10-03 13:48:31 +09:00
takezoe
d95bd20cbe
Fix commit message for Wiki editing.
2013-10-03 11:44:15 +09:00
takezoe
70ca98d6a2
(refs #38 )Add reverting wiki from history.
2013-10-03 03:42:38 +09:00
takezoe
0affdb6ad0
Bug fix caused by path splitting.
2013-09-27 14:33:27 +09:00
takezoe
2be79f6590
Replace trace log with debug log.
2013-09-26 12:02:34 +09:00
takezoe
2f7125b6c0
Add trace log to WebHookService to check future execution.
2013-09-25 13:12:35 +09:00
takezoe
e89b2020a3
Use ControlUtil.
2013-09-21 22:13:15 +09:00
takezoe
b4dd067d61
Introduce ControlUtil which provides control facilities such as using() or defining().
2013-09-19 18:53:14 +09:00
takezoe
7e4c29f4cf
(refs #74 )Remove an auxiliary constructor from case class because json4s can't serialize correctly if case class have that.
2013-09-19 00:47:46 +09:00
takezoe
d8698d02b7
(refs #74 )Add "Test Hook" button.
2013-09-18 20:10:53 +09:00
takezoe
98d24248c2
Add ExecutionContext for Future.
2013-09-14 18:34:05 +09:00
takezoe
cec1dc98a9
(refs #74 )Web hook request is sent asynchronously.
2013-09-14 17:43:06 +09:00
takezoe
36115734bb
(refs #74 )Web hook is completed.
2013-09-14 17:14:37 +09:00
takezoe
7f81ec52c1
(refs #74 )JSON conversion test.
2013-09-13 19:06:45 +09:00
takezoe
aa9e34e992
(refs #74 )Added case classes for payload of web hook.
2013-09-12 12:57:07 +09:00
takezoe
9d526b32e0
Delete from WEB_HOOK before deleting repository.
2013-09-12 01:38:52 +09:00
takezoe
90a83c5c64
Merge branch 'master' into webhook
2013-09-12 01:34:31 +09:00
takezoe
e6e5cc67d5
Delete from PULL_REQUEST before deleting repository.
2013-09-11 18:05:34 +09:00
takezoe
4d1605ded2
(refs #74 )Add web hook URL addition.
2013-09-06 02:32:51 +09:00
shimamoto
897c5ecac7
Fix default smtp port in constant.
2013-09-01 21:15:17 +09:00
Naoki Takezoe
dd29456384
Merge pull request #86 from odz/chardet
...
Add encoding detection
2013-08-23 21:24:41 -07:00
takezoe
cd298eb5c1
bindDN and bindPassword became optional for OpenLDAP.
2013-08-24 03:06:19 +09:00
odz
13578dcee8
Add encoding detection
2013-08-24 00:54:40 +09:00
takezoe
6b57cca64d
Merge branch 'ldap-auth'
2013-08-22 02:31:24 +09:00
Tomofumi Tanaka
bfc1d1d6b0
LDAP authentication by using bind account
2013-08-21 19:49:43 +09:00
takezoe
42ecae944e
Remove unused import statements.
2013-08-17 11:11:31 +09:00
takezoe
b9aa6a234b
(refs #78 )Authentication moved to AccountService.
2013-08-17 11:05:11 +09:00
takezoe
5f2d62030f
(refs #77 )Display issue count and pull request count on the global nav.
2013-08-17 02:55:33 +09:00
takezoe
7e26b4695d
(refs #78 )LDAP port is optional.
2013-08-17 01:48:01 +09:00
takezoe
df5600f03f
(refs #78 )Fix for LDAP authentication.
2013-08-17 01:10:06 +09:00
takezoe
582df3239f
(refs #78 )Implementing LDAP authentication.
2013-08-16 03:45:50 +09:00
takezoe
03e903eef9
Improved the list of forked repositories presentation.
2013-08-10 04:21:31 +09:00
takezoe
1e566f4a20
(refs #69 )Forked repositories tree is changed to flat list.
...
Because it can't render forked tree correctly if parent repository has been removed.
2013-08-09 21:43:30 +09:00
takezoe
f2787a547f
Add "View the diff" link to the edit wiki page activity.
2013-08-09 18:38:34 +09:00
takezoe
629b714dab
Upgrade scalatra-forms.
2013-08-09 18:06:33 +09:00
shimamoto
5462f0a7a1
Merge branch 'master' of https://github.com/takezoe/gitbucket.git
2013-08-08 20:59:27 +09:00
shimamoto
6d453ea80b
(refs #10 ) Add notification email form.
2013-08-08 20:58:57 +09:00
takezoe
d2373a00ea
Add icon for create tag activity.
2013-08-07 21:02:35 +09:00
