Commit Graph

29 Commits

Author SHA1 Message Date
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
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
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
f2787a547f Add "View the diff" link to the edit wiki page activity. 2013-08-09 18:38:34 +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
47f082e2fc Remove unused code. 2013-07-26 18:15:19 +09:00
takezoe
1af52d16c0 Add lock for repository operation. 2013-07-26 18:14:31 +09:00
takezoe
34e2663492 Use JGitUtil.isEmpty() to check whether repository is empty. 2013-07-24 23:10:55 +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
b760361184 (refs #8)Implementing repository creation for group. 2013-07-23 22:05:30 +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
rabitarochan
8226073506 Fix resource leak. 2013-07-19 18:18:44 +09:00
takezoe
d06a986293 Remove unused import statement. 2013-07-17 13:57:45 +09:00
takezoe
fc29b34573 (refs #2)Fix comparing diffs before sending pull request. 2013-07-15 21:40:54 +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
1997050a3a Fix wiki repository creation. 2013-06-24 00:40:33 +09:00
takezoe
c3a4c36ac2 Pull to the working copy of the wiki repository before modifying. 2013-06-16 02:41:26 +09:00
takezoe
5875772c21 Remove debug code. 2013-06-16 02:11:51 +09:00
takezoe
e5b3399127 Synchronization of modification to the working repository for Wiki. 2013-06-16 02:08:34 +09:00
takezoe
1ab58d0363 Implementing authentication. 2013-06-03 00:36:51 +09:00
takezoe
43e9da54b7 Move case classes in RepositoryViewerController to JGitUtil. 2013-06-02 15:15:54 +09:00
takezoe
f83d9a63b9 Remove unused code. 2013-06-02 14:19:53 +09:00
takezoe
2a6c130f71 Remove unused import statements. 2013-06-02 14:19:17 +09:00
takezoe
358f59261a WikiUtil moved to WikiService and applied cake pattern to
WikiController.
2013-05-07 02:31:39 +09:00