Commit Graph

1667 Commits

Author SHA1 Message Date
Naoki Takezoe
cb12d03262 Merge pull request #143 from chris-vanvranken/master
retrieve LDAP emails as lowercase to avoid confusion
2013-10-15 10:28:05 -07:00
takezoe
9a6a2d9b78 (refs #33)Improve avatar image searching behavior. 2013-10-16 02:24:40 +09:00
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
Chris Van Vranken
05adf9345f retrieve LDAP emails as lowercase to avoid confusing gravatar 2013-10-14 13:00:29 -04:00
Naoki Takezoe
ba70fdda48 Merge pull request #156 from xuwei-k/deprecated
fix deprecation warning
2013-10-14 06:42:35 -07:00
Naoki Takezoe
3885fcb2ec Merge pull request #157 from ssogabe/failonerror
Abort build process if sbt reports errors
2013-10-14 06:42:18 -07:00
ssogabe
99800a27f5 Abort build process if sbt reports errors 2013-10-14 15:01:30 +09:00
takezoe
107622942b (refs #127)Fix testcase. 2013-10-14 14:54:38 +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
xuwei-k
af759a815f add scalacOptions 2013-10-14 14:49:52 +09:00
takezoe
0e7078c479 (refs #151)Add unique checking to group creation. 2013-10-14 14:44:26 +09:00
Naoki Takezoe
83107c7974 Merge pull request #155 from HairyFotr/patch-2
Add plugin, Update versions
2013-10-13 22:13:16 -07:00
takezoe
ff9b2dbe93 (refs #127)Display full name at the account page. 2013-10-14 14:05:25 +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
Naoki Takezoe
21c30583e5 Merge pull request #153 from xuwei-k/number-format-exception
avoid NumberFormatException
2013-10-13 21:32:52 -07:00
takezoe
d6c9ace306 Merge branch 'master' of https://github.com/takezoe/gitbucket 2013-10-14 13:25:01 +09:00
takezoe
faf1252597 (refs #154)Remove comparison for original repository which does not exist. 2013-10-14 13:24:49 +09:00
HairyFotr
7b2ee25ea2 Add plugin, Update versions 2013-10-13 21:25:44 +02:00
xuwei-k
5a3207ae42 avoid NumberFormatException 2013-10-14 03:26:47 +09:00
Naoki Takezoe
3eab4955b9 Merge pull request #152 from xuwei-k/avoid-option-get
refactoring. avoid Option#get
2013-10-13 09:41:09 -07:00
xuwei-k
d772fc3ba2 refactoring. avoid Option#get 2013-10-14 01:18:31 +09:00
Naoki Takezoe
7de0a3fd70 Fix link to IIS installation wiki page. 2013-10-13 10:47:06 +09:00
Naoki Takezoe
eb8710a336 Merge pull request #144 from chris-vanvranken/patch-1
Add note that installation on windows server IIS is possible
2013-10-12 18:45:30 -07:00
Naoki Takezoe
25c55ecbd0 Merge pull request #150 from ssogabe/specs2
configure sbt to use the junitxml option with specs2
2013-10-12 18:31:13 -07:00
ssogabe
280df2cedd configure sbt to use the junitxml option with specs2 2013-10-13 09:38:52 +09:00
Naoki Takezoe
5ba9c86bee Merge pull request #149 from jparound30/activity_problem
Fix activity message problem (related to #120)
2013-10-12 08:14:13 -07:00
jparound30
faa6591d27 Fix activity message problem (related to #120) 2013-10-12 20:50:35 +09:00
takezoe
841d442f0d (refs #131)Don't create Dropzone if image has been registered. 2013-10-12 02:54:33 +09:00
xuwei-k
3351eabc4f add AccountServiceSpec 2013-10-11 13:08:58 +09:00
takezoe
006e1bc61e Merge branch 'master' of https://github.com/takezoe/gitbucket 2013-10-11 03:10:10 +09:00
takezoe
35d1b4ea37 (refs #142)Hide "Fork" button for repositories which have no commit. 2013-10-11 03:09:25 +09:00
Naoki Takezoe
b0c5069695 Merge pull request #145 from xuwei-k/refactoring
refactoring
2013-10-10 11:01:26 -07:00
xuwei-k
dae0d0ad4b use FileUtil.withTmpDir and FileUtil.using 2013-10-11 02:44:03 +09:00
xuwei-k
79e560b7bf add FileUtil.withTmpDir 2013-10-11 02:44:03 +09:00
takezoe
cf79ac1069 (refs #142)Fix NoSuchElementException for empty repository. 2013-10-11 02:42:07 +09:00
Chris Van Vranken
8aab7a16c4 Add note that installation on windows server IIS is possible 2013-10-10 12:41:10 -04:00
shimamoto
c16b89b0be (refs #99) Improved to configure the FROM field of the email. 2013-10-10 23:57:45 +09:00
takezoe
25bbc00ff3 Display repository search field on pull request pages. 2013-10-10 19:00:56 +09:00
Tomofumi Tanaka
e667b6c139 (refs #139) Add info log for debugging LDAP Auth 2013-10-10 00:57:46 +09:00
Naoki Takezoe
195364223f Merge pull request #140 from xuwei-k/remove-unnecessary-code
remove unnecessary code
2013-10-08 21:17:50 -07:00
xuwei-k
84ce2cac8d remove unnecessary code 2013-10-09 11:09:06 +09:00
takezoe
f3507cf465 (refs #117)Add build.properties to fix sbt version. 2013-10-09 10:44:52 +09:00
Tomofumi Tanaka
f74f2c47d3 (refs #120) URL encode tag name
URL encode tag name URL like branch name.
And rename encodeBranchName to encodeRefName.
2013-10-09 09:59:30 +09:00
takezoe
72b25591a5 Resolve length issue in Slick.
https://github.com/slick/slick/issues/170
2013-10-09 03:11:27 +09:00
Naoki Takezoe
fe23a5c6da Merge pull request #136 from talios/patch-1
Change link text to 'Older'
2013-10-07 18:21:30 -07:00
Mark Derricutt
49fbc5cb62 Change link text to 'Older'
Updates the link text for previous commits to read 'Older' and not 'Order'.
2013-10-08 11:34:02 +13:00
takezoe
5a19a307a9 Merge remote-tracking branch 'origin/master' 2013-10-08 03:08:06 +09:00
takezoe
c3ec52b391 (refs #128)Add javacOptions to specify 6 as compilation target. 2013-10-08 03:07:33 +09:00
Naoki Takezoe
f2d68be0a3 Merge pull request #134 from tanacasino/fix-link-use-urlencode
(refs #120) Use encodeBranchName to tab links
2013-10-07 09:16:52 -07:00
Tomofumi Tanaka
c1f98ac481 (refs #120) Use encodeBranchName to tab links 2013-10-07 23:55:27 +09:00