Commit Graph

56 Commits

Author SHA1 Message Date
Naoki Takezoe
53d0974760 (refs #457)Fix the target of updateRef 2014-08-17 13:01:05 +09:00
Naoki Takezoe
9cfa8c594b Merge branch 'master' into slick2
Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala
2014-07-06 17:02:49 +09:00
shimamoto
259bcfc14f (refs #341) Fix compile errors. 2014-07-01 04:08:15 +09:00
Naoki Takezoe
1c99b57709 (refs #412)Fix repository lock 2014-06-29 03:29:03 +09:00
takezoe
7811926779 (refs #367)Redirect if forked repository already exists 2014-05-12 23:56:42 +09:00
takezoe
0f9c95c15a baseUrl calculation is concentrated to SystemSettings 2014-04-29 15:43:41 +09:00
takezoe
644701d995 (refs #327)Add atom feed of the specified user 2014-04-18 07:23:52 +09:00
Naoki Takezoe
3f76453f34 (refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table 2014-04-10 17:42:25 +09:00
Tomofumi Tanaka
06978a4fc4 (refs #340)Add public key validation 2014-04-07 22:56:13 +09:00
takezoe
02a367fd99 Add SystemSettings to Context properties 2014-03-15 01:24:34 +09:00
takezoe
3d251fa8ad (refs #115)Disable ssh key setting page if ssh access is disabled 2014-03-11 02:37:02 +09:00
takezoe
1043b13228 (refs #115)Small fix for views 2014-03-09 01:48:30 +09:00
takezoe
5e6c33df6c (refs #115)Fix account registration page and add public key deletion 2014-03-09 01:38:23 +09:00
takezoe
f99d37cfad (refs #115)Adding SSH Key form is available 2014-03-09 00:57:00 +09:00
takezoe
b641bfb56a (refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2 2014-03-06 16:17:41 +09:00
takezoe
ff8b4b4a88 Move newrepo.scala.html to account package 2014-03-06 11:39:41 +09:00
takezoe
c0f5cb1641 Move group.scala.html to account package 2014-03-06 11:26:58 +09:00
takezoe
50d84835cb Merge CreateController to AccountController 2014-03-06 11:24:28 +09:00
takezoe
e3fd564efd (refs #241)Work for specifying group manager 2014-03-04 04:25:44 +09:00
takezoe
17920e1195 (refs #198)Allow group editing by group members. 2014-03-03 01:45:00 +09:00
takezoe
590b431ec1 Add FlashMapSupport to ControllerBase. 2014-03-01 13:27:36 +09: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
a0bd969140 (refs #114)Add functionality to remove account by themselves. 2013-11-03 14:54:28 +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
7d65717784 The method of RepositoryService was cleaned up. 2013-07-30 03:41:47 +09:00
takezoe
3a7391fbb3 (refs #8)Some fix for group management. 2013-07-24 03:36:42 +09:00
takezoe
2155734e23 (refs #8)Add Members tab to account information page for group account. 2013-07-24 02:12:35 +09:00
takezoe
b2d050d136 Remove unused import statement. 2013-07-19 12:17:40 +09:00
takezoe
f34f60b255 Returns a gray image if username has not been registered. 2013-07-12 15:43:23 +09:00
takezoe
72e2c6dca7 Replace String#format() with string interpolation. 2013-07-11 20:19:11 +09:00
takezoe
f104fab593 Rename StringUtil#encrypt() to sha1(). 2013-07-11 11:09:30 +09:00
takezoe
46b3807f21 Fix redirect path after sign in. 2013-07-11 04:08:06 +09:00
takezoe
796a276b65 (refs #28)Look up Gravatar if user icon is not configured. 2013-07-11 03:51:50 +09:00
takezoe
9d61f73e22 Generalize some methods in AccountController and UserManagementController. 2013-07-10 20:44:28 +09:00
takezoe
7a3c61a8d0 Generalize some methods in AccountController and UserManagementController. 2013-07-10 20:38:24 +09:00
takezoe
96872d7d41 (refs #28)Upload avatar part is separated from account editing form. 2013-07-10 20:20:05 +09:00
takezoe
02c015574f (refs #28)Fix information message. 2013-07-10 18:24:46 +09:00
takezoe
248079f041 (refs #28)Display avatar icon on the activity timeline. 2013-07-10 14:37:00 +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
f84078c7ca (refs #4)Add 'Public Activity' tab to the account information page. 2013-07-06 20:03:34 +09:00
takezoe
c53f3843b8 (refs #19)Add unique checking for mail address. 2013-07-05 01:37:29 +09:00
takezoe
b59a4ce94b Add OneselfAuthenticator. 2013-07-03 16:53:04 +09:00
takezoe
1b13ca1c8d Fix template file names. 2013-07-01 13:07:02 +09:00
takezoe
414c455662 Add unique user name checking to the account creation. 2013-06-29 15:44:27 +09:00
takezoe
10f2cbbc3e Encrypt password. 2013-06-29 15:13:20 +09:00
takezoe
7da39b4785 Add the password field to the account editing page. 2013-06-29 02:23:32 +09:00
takezoe
c308e1993a Add account creation page for users. 2013-06-28 14:13:58 +09:00
takezoe
d75b4112d1 Small fix. 2013-06-26 02:13:28 +09:00
takezoe
1ff87ff6b3 Use Option.map instead of pattern matching. 2013-06-25 14:44:02 +09:00