Commit Graph

479 Commits

Author SHA1 Message Date
takezoe
14de86afa0 Fix redirect behaviour after sign in. 2013-08-10 23:13:43 +09:00
takezoe
69c5f9e19a Always display repository selector in the new pull request page. 2013-08-10 12:34:07 +09:00
takezoe
03e903eef9 Improved the list of forked repositories presentation. 2013-08-10 04:21:31 +09:00
takezoe
1e566f4a20 (refs #69)Forked repositories tree is changed to flat list.
Because it can't render forked tree correctly if parent repository has been removed.
2013-08-09 21:43:30 +09:00
takezoe
f2787a547f Add "View the diff" link to the edit wiki page activity. 2013-08-09 18:38:34 +09:00
takezoe
629b714dab Upgrade scalatra-forms. 2013-08-09 18:06:33 +09:00
takezoe
1b0269c567 Fix default label creation for group repository. 2013-08-09 12:18:51 +09:00
shimamoto
5462f0a7a1 Merge branch 'master' of https://github.com/takezoe/gitbucket.git 2013-08-08 20:59:27 +09:00
shimamoto
6d453ea80b (refs #10) Add notification email form. 2013-08-08 20:58:57 +09:00
takezoe
c071284a56 (refs #2)Recover "New Request" button which has been removed temporary while implementing dashboard. 2013-08-08 02:06:55 +09:00
takezoe
5930cf48d5 (refs #2)Fix redirect path after sending pull request. 2013-08-08 02:04:55 +09:00
takezoe
9dd070887a (refs #2)Merge comment is displayed on the comment list (but it's not included in comment count). 2013-08-08 01:42:42 +09:00
takezoe
a0a284ad26 (refs #2)Fix comment to pull request activity. 2013-08-07 04:13:14 +09:00
takezoe
1ebf4276e7 (refs #2)'Pull Requests' tab in dashboard has been completed. 2013-08-07 03:31:26 +09:00
takezoe
908931b9ed (refs #2)Implementing 'Pull Requests' tab in the dashboard. 2013-08-06 22:04:09 +09:00
takezoe
1b71b81953 (refs #71)Fix authentication for forking repository. 2013-08-06 08:17:19 +09:00
takezoe
b31b7e1e86 Merge branch 'master' into toggle_gravatar
Conflicts:
	src/main/scala/view/AvatarImageProvider.scala
2013-08-06 01:58:47 +09:00
takezoe
8c86e23a4c (refs #2)HTML parts sharing in issues and pull requests. 2013-08-05 21:57:45 +09:00
takezoe
fe98d35d4e (refs #2)Fix redirect path for pull request. 2013-08-05 21:06:42 +09:00
takezoe
6101e141d8 (refs #2)Add opened user filter and count to the pull request list. 2013-08-05 18:47:40 +09:00
takezoe
71d84e7475 (refs #2)Limit of pull request list is 25. 2013-08-05 16:34:11 +09:00
takezoe
735ad4c972 Fix comment. 2013-08-05 15:19:16 +09:00
takezoe
50cb59f569 (refs #2)Add action type "merge" for ISSUE_COMMENT. 2013-08-05 15:16:26 +09:00
takezoe
4ea23a96ae (refs #2)Implementing pull request list. 2013-08-05 03:31:27 +09:00
takezoe
b015645ed0 (refs #2)Add flag for identifying whether it's a pull request. 2013-08-05 02:06:15 +09:00
takezoe
ce3b10ef03 (refs #2)Restore checkConflict method. 2013-08-05 01:35:08 +09:00
takezoe
d7af5551eb (refs #2)Fix temporary branch name. 2013-08-05 00:53:30 +09:00
takezoe
1d03a82be4 (refs #2)Pull request works! 2013-08-05 00:49:09 +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
takezoe
f93c8965be Bug fix. 2013-07-30 22:03:48 +09:00
shimamoto
66855e65bb (refs #26) Implements repository filter. 2013-07-30 19:36:20 +09:00
shimamoto
0296a0bde6 Merge branch 'master' of https://github.com/takezoe/gitbucket.git
Conflicts:
	src/main/scala/app/DashboardController.scala
2013-07-30 10:51:44 +09:00
shimamoto
8409384232 (refs #26) Implements the dashboard issue display. 2013-07-30 10:47:46 +09:00
takezoe
7d65717784 The method of RepositoryService was cleaned up. 2013-07-30 03:41:47 +09:00
takezoe
41a613e151 Move private method. 2013-07-30 02:45:14 +09:00
takezoe
25d402c9d1 (refs #53)Fix path extraction for branch which contains '/'. 2013-07-29 22:57:57 +09:00
takezoe
7a8958741d (refs #2)Add NO_FF option to merging pull request. 2013-07-29 02:10:21 +09:00
takezoe
f317d74bb4 (refs #2)Pull request to the branch in the same repository is available. 2013-07-27 13:02:22 +09:00
takezoe
5f0eb91a81 (refs #2)Compare to its own branch if repository is not specified. 2013-07-27 04:24:58 +09:00
takezoe
66f3a1fe7d (refs #2)Comparing between all forked repositories. 2013-07-27 04:11:33 +09:00
takezoe
59d85531ce Bugfix 2013-07-26 18:29:00 +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
2f52ed3ee0 (refs #2)Fork repository can not be changed repository type. 2013-07-26 10:01:28 +09:00
takezoe
a09407da8e Remove TODO. 2013-07-26 09:47:22 +09:00
Tomofumi Tanaka
4d9c8e8d3e Initial commiter should be repository creator
like wiki repository.
Now it seems that set $HOME/.gitconfig user.name,user.email or
machine username and username@hostname.
2013-07-26 00:29:00 +09:00
takezoe
e15bd77789 (refs #2)Add forked count and repository tree view. 2013-07-25 20:47:35 +09:00
takezoe
07ef06ad95 Improve authentication for H2 console. 2013-07-25 03:16:34 +09:00
takezoe
b61836adf7 Toggle Gravatar support at the system settings. 2013-07-25 03:00:46 +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