Commit Graph

219 Commits

Author SHA1 Message Date
takezoe
bf2ed81eb1 (refs #163)Allow '.' in user name. 2013-10-19 12:56:55 +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
xuwei-k
5a3207ae42 avoid NumberFormatException 2013-10-14 03:26:47 +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
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
380cdbcf75 Add FileUtil#getContentType(). 2013-10-04 04:17:30 +09:00
takezoe
5430564065 (refs #105)Specify suitable Content-Type header for downloaded file. 2013-09-29 16:27:40 +09:00
shimamoto
54bc8c16d8 (refs #100) Fix bug that can't get ServletContext in the future block. 2013-09-28 21:03:55 +09:00
takezoe
0affdb6ad0 Bug fix caused by path splitting. 2013-09-27 14:33:27 +09:00
takezoe
d34118bdfd Define request attribute keys. 2013-09-23 02:03:10 +09:00
takezoe
c57bc487a3 Define session keys. 2013-09-23 00:51:57 +09:00
takezoe
296fc9a3df Improve session handling. 2013-09-23 00:18:38 +09:00
takezoe
fd8b5780f3 Use ControlUtil. 2013-09-22 19:28:14 +09:00
takezoe
602b6c635a Add RichRequest which extends HttpServletRequest. 2013-09-22 14:25:50 +09:00
takezoe
f30c9f6171 Use ControlUtil. 2013-09-22 01:24:04 +09:00
takezoe
c00b704843 Use ControlUtil#using() to handle RevWalk. 2013-09-21 22:21:59 +09:00
takezoe
e89b2020a3 Use ControlUtil. 2013-09-21 22:13:15 +09:00
takezoe
062d6cd066 Add ControlUtil. 2013-09-19 18:53:50 +09:00
takezoe
b4dd067d61 Introduce ControlUtil which provides control facilities such as using() or defining(). 2013-09-19 18:53:14 +09:00
takezoe
ec6f4ff734 Fix typo. 2013-09-18 14:30:41 +09:00
shimamoto
420ca85393 (refs #10) Except group account in notification. 2013-09-04 18:45:37 +09:00
Tomofumi Tanaka
d588531ab8 Make configurable data(git,db) dir using env vars 2013-09-04 00:11:13 +09:00
shimamoto
3fc792fcf8 (refs #10) Add notification. Notification of when merging is not
implemented yet.
2013-09-02 07:40:41 +09:00
shimamoto
f5520e7991 (refs #10) Completed notification implementation. 2013-09-01 21:17:55 +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
takezoe
f7de3bab74 Fix LDAPUtil#findUser() for OpenLDAP. 2013-08-24 01:45:30 +09:00
odz
13578dcee8 Add encoding detection 2013-08-24 00:54:40 +09:00
shimamoto
6d76e93ede (refs #10) Creates a E-mail sending. still working on... 2013-08-23 22:30:40 +09:00
takezoe
2b2bf88a37 Scalized :-) 2013-08-22 02:27:45 +09:00
Tomofumi Tanaka
bfc1d1d6b0 LDAP authentication by using bind account 2013-08-21 19:49:43 +09:00
takezoe
7e26b4695d (refs #78)LDAP port is optional. 2013-08-17 01:48:01 +09:00
takezoe
582df3239f (refs #78)Implementing LDAP authentication. 2013-08-16 03:45:50 +09:00
takezoe
52ab3c625e (refs #76)Show the content of the previous commit for removed files. 2013-08-15 02:22:11 +09:00
takezoe
dee13542cd Remove unused import statements. 2013-08-15 01:14:44 +09:00
takezoe
629b714dab Upgrade scalatra-forms. 2013-08-09 18:06:33 +09:00
takezoe
e52aa7ad3c Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
	src/main/scala/service/RepositoryService.scala
2013-08-04 05:10:01 +09:00
Tomofumi Tanaka
d26faac0e6 (fix #58) Fix bug that failed to view tag tree 2013-08-04 01:28:47 +09:00
Tomofumi Tanaka
7079d50fdf Make more fast and github-like repository viewer 2013-07-30 03:26:36 +09:00
takezoe
4bd4c3e833 Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/util/JGitUtil.scala
2013-07-26 18:22:14 +09:00
takezoe
1af52d16c0 Add lock for repository operation. 2013-07-26 18:14:31 +09:00
takezoe
88caff38f0 (refs #2)Fix pull request. Basic pattern had been tested but it's still unstable. 2013-07-24 22:05:36 +09:00
Tomofumi Tanaka
62a6d74393 (refs #50)Fix search logic in empty repository 2013-07-24 16:46:46 +09:00
takezoe
f10f98abf2 Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/resources/update/1_3.sql
	src/main/resources/update/1_4.sql
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/twirl/account/repositories.scala.html
2013-07-24 13:29:23 +09:00
takezoe
91d94de1d2 Merge branch '#3_repository-search'
Conflicts:
	src/main/scala/app/UserManagementController.scala
	src/main/scala/service/IssuesService.scala
	src/main/twirl/issues/issue.scala.html
2013-07-20 03:00:16 +09:00
takezoe
0c131ec990 Move FileUploadUtil to FileUploadControllerBase. 2013-07-19 20:33:40 +09:00
shimamoto
b23133c79c Move Implicit && to model package object. 2013-07-18 20:21:24 +09:00
takezoe
e7b9293f3b Merge branch 'master' into #3_repository-search 2013-07-18 17:07:22 +09:00