Commit Graph

123 Commits

Author SHA1 Message Date
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
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
takezoe
323e25951f Use Gravatar if committer is not registered in GitBucket. 2013-07-18 13:40:21 +09:00
takezoe
900e91e101 Bugfix 2013-07-17 19:00:35 +09:00
takezoe
7f0aff8c03 (refs #3)Cleanup 2013-07-17 16:59:38 +09:00
takezoe
d06a986293 Remove unused import statement. 2013-07-17 13:57:45 +09:00
takezoe
ce8168d97a Fix typo. 2013-07-17 11:54:10 +09:00
takezoe
27670525a3 (refs #3)Search by AND if query words are separated by whitespace. 2013-07-17 11:52:28 +09:00
takezoe
aae40a7087 Bugfix 2013-07-16 00:11:45 +09:00
takezoe
fc29b34573 (refs #2)Fix comparing diffs before sending pull request. 2013-07-15 21:40:54 +09:00
takezoe
78d48c8be3 Remove var! 2013-07-15 13:02:26 +09:00
takezoe
eb82af9006 (refs #2)Implementing the comparing view. 2013-07-13 20:09:19 +09:00
takezoe
0760b6a89c Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/util/JGitUtil.scala
2013-07-12 15:50:53 +09:00
takezoe
f163e348e0 (refs #34)Link conversion checks existence of accounts and issues. 2013-07-12 15:15:58 +09:00
takezoe
28cafbcad2 (refs #35)Fixed. 2013-07-12 02:14:27 +09:00
takezoe
386f0dc142 (refs #36)Handle unresolved revision string. 2013-07-11 21:24:09 +09:00
takezoe
72e2c6dca7 Replace String#format() with string interpolation. 2013-07-11 20:19:11 +09:00
takezoe
81fe467b20 Improve Git repository creation. 2013-07-11 19:47:48 +09:00
takezoe
6dd1299dff (refs #2)Experimental implementation of forking repository. 2013-07-11 18:49:03 +09:00
takezoe
f104fab593 Rename StringUtil#encrypt() to sha1(). 2013-07-11 11:09:30 +09:00
takezoe
0170f9b44a Replace implicit conversion with implicit class. 2013-07-11 11:03:59 +09:00
takezoe
796a276b65 (refs #28)Look up Gravatar if user icon is not configured. 2013-07-11 03:51:50 +09:00
takezoe
02c015574f (refs #28)Fix information message. 2013-07-10 18:24:46 +09:00
takezoe
2da756692b (refs #28)Avatar image can be uploaded at the account editing page. 2013-07-10 14:15:56 +09:00
takezoe
e4324258d3 (refs #28)Implementing avatar image uploading. 2013-07-10 11:34:36 +09:00
takezoe
ebc858aed9 (refs #31)Make it possible to create empty repository. 2013-07-09 19:41:00 +09:00
takezoe
67d6cf37a5 Display the commit count at the repository viewer. 2013-07-06 16:49:06 +09:00
takezoe
9688afac02 Authenticators are renamed. 2013-07-04 03:37:49 +09:00
takezoe
45639c1dc5 Fix OneselfAuthenticator. 2013-07-03 18:00:45 +09:00
takezoe
b59a4ce94b Add OneselfAuthenticator. 2013-07-03 16:53:04 +09:00
takezoe
04da7eb9de Fix OwnerOnlyAuthenticator 2013-07-03 16:34:01 +09:00
takezoe
d26a07e28e Authenticator pass RepositoryInfo to actions. 2013-07-03 15:13:25 +09:00
takezoe
23bea37ed6 Authenticator pass RepositoryInfo to actions. 2013-07-03 14:53:40 +09:00
takezoe
1393d919c3 Fix retrieving user name and repository name from request path in Authenticator. 2013-07-03 14:23:41 +09:00
takezoe
14187795fb Fix some Ajax URLs and Authenticators. 2013-07-03 01:45:38 +09:00
takezoe
16f42f6087 Add TODO. 2013-06-29 15:31:29 +09:00
takezoe
4370ad06ea Move extendsHtmlSeq which provides mkHtml to view.helpers because it's used at only views. 2013-06-29 15:30:24 +09:00
takezoe
10f2cbbc3e Encrypt password. 2013-06-29 15:13:20 +09:00
takezoe
cd2486344f CompressUtil and FileTypeUtil are merged to FileUtil. 2013-06-29 13:58:44 +09:00
takezoe
00ad0c1745 Add System Settings page. 2013-06-28 13:45:31 +09:00
takezoe
e334570670 Add validation for label name and color. 2013-06-26 02:11:19 +09:00
takezoe
f335d30ac7 Implementing conditional issue searching. 2013-06-25 21:41:23 +09:00
takezoe
dfcac1e7a4 Separate extension of scalatra-forms to trait from ControllerBase. 2013-06-24 00:23:01 +09:00
takezoe
fd0047e3b5 Fix typo in Scaladoc. 2013-06-24 00:15:20 +09:00
takezoe
27977d3263 Move implicit conversion for mkHtml to util.Implicits. 2013-06-23 22:26:38 +09:00
takezoe
cc1be57d5f Fix commit message presentation. 2013-06-22 14:19:08 +09:00