Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,294 Commits 14 Branches 116 Tags
e3fd564efd874c2b2f419cdb72db2ab95f73255d
Commit Graph

514 Commits

Author SHA1 Message Date
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
shimamoto
cb94447290 (refs #26) Add Dashboard controller. Uses a common design at issue. 2013-07-24 14:10:17 +09:00
takezoe
205119cc01 (refs #2)Fix compile errors. 2013-07-24 13:33:07 +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
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
db8305b5e9 (refs #8)Change create/edit user template name and path. 2013-07-24 02:03:42 +09:00
takezoe
e8330eedc3 (refs #8)Group repository creation is completed. 2013-07-24 02:00:52 +09:00
takezoe
b760361184 (refs #8)Implementing repository creation for group. 2013-07-23 22:05:30 +09:00
takezoe
7150befa54 (refs #8)Group register/edit form is completed. 2013-07-23 18:52:36 +09:00
takezoe
5bf0b275cb (refs #8)Remove unused code. 2013-07-23 15:39:47 +09:00
takezoe
c86bf1d68b (refs #8)Merge user name proposal API to IndexController. 2013-07-23 15:37:59 +09:00
takezoe
e61bde1415 (refs #8)Implementing group register/edit form. 2013-07-23 13:02:30 +09:00
takezoe
e4b3f0ddef (refs #8)Implementing group register/edit form. 2013-07-23 11:59:49 +09:00
takezoe
30eb949ce1 (refs #8)Start to implement group management. 2013-07-22 22:22:49 +09:00
takezoe
3cc39489bd (refs #40)Enable H2 Console. 2013-07-22 21:12:22 +09:00