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
662 Commits 14 Branches 116 Tags
2c52a4c40c5e94c68e3cadc298f693c2075ea05a
Commit Graph

284 Commits

Author SHA1 Message Date
takezoe
2c52a4c40c (refs #2)Fix pull request and marge behavior. 2013-07-16 21:02:22 +09:00
takezoe
f53f71ecf1 (refs #2)Add conflict checking. 2013-07-16 03:43:26 +09:00
takezoe
e59ae9c6e9 (refs #2)Remove unused code. 2013-07-16 00:29:30 +09:00
takezoe
20e5832ce3 (refs #2)Pull request details page became a single page. 2013-07-15 23:02:54 +09:00
takezoe
fc29b34573 (refs #2)Fix comparing diffs before sending pull request. 2013-07-15 21:40:54 +09:00
takezoe
5ea9150af8 (refs #2)Fix requested repository url in the merge guidance. 2013-07-15 14:40:50 +09:00
takezoe
159a5835e0 (refs #2)Close issue when pull request is merged. 2013-07-15 14:17:26 +09:00
takezoe
9bb6b216e9 (refs #2)Add columns MERGE_START_ID and MERGE_END_ID to PULL_REQUEST. 2013-07-15 04:49:14 +09:00
takezoe
fd7d387fb0 (refs #2)Experimental implementation of merge pull request. 2013-07-15 03:47:43 +09:00
takezoe
b68977597b (refs #2)Add tabs to the pull request page. 2013-07-14 14:06:48 +09:00
takezoe
2fb9f83227 (refs #2)Add merge pull request form. 2013-07-14 12:49:49 +09:00
takezoe
3a7e2c0249 (refs #2)Record 'open pull request' activity. 2013-07-14 03:27:59 +09:00
takezoe
9048e07b6b (refs #2)Add the details page for the pull request. 2013-07-14 03:01:46 +09:00
takezoe
0903721a62 (refs #2)Create pull request is available. 2013-07-14 02:43:45 +09:00
takezoe
eb82af9006 (refs #2)Implementing the comparing view. 2013-07-13 20:09:19 +09:00
takezoe
2cc2902930 (refs #2)Comparing between the forked repository and the source repository. 2013-07-13 03:52:27 +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
f34f60b255 Returns a gray image if username has not been registered. 2013-07-12 15:43:23 +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
shimamoto
2f3aa57d23 Merge branch 'master' of https://github.com/takezoe/gitbucket.git 2013-07-11 22:02:44 +09:00
shimamoto
a123774bab (refs #11) When the issue is closed or reopened, the comment id not 
required.
 2013-07-11 22:02:12 +09:00
takezoe
7f56b50267 Remove unnecessary code. 2013-07-11 21:26: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
5e1eb39b87 (refs #2)Experimental implementation of forking repository. 2013-07-11 14:39:25 +09:00
shimamoto
f8a9851bb3 Merge branch 'master' of https://github.com/takezoe/gitbucket.git 2013-07-11 13:44:12 +09:00
shimamoto
b81a30ef12 (refs #11) Implemented the batch update. 2013-07-11 13:43:42 +09:00
takezoe
62fb968c9a Fix showing branch if specified branch, tag or id does not exist. 2013-07-11 13:07:50 +09:00
takezoe
07dd459f3c Add method for request cache to app.Context. 2013-07-11 11:20:56 +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
2c33abe5d1 (refs #28)Implementing avatar image uploading. 2013-07-10 03:01:46 +09:00
takezoe
1978061a06 Display the message after settings updating is completed. 2013-07-10 00:16:55 +09:00
takezoe
617370e822 Rename SettingsController to RepositorySettingsController. 2013-07-10 00:09:30 +09:00
takezoe
0ed6a96781 Display the message after settings updating is completed. 2013-07-09 21:33:46 +09:00
takezoe
ebc858aed9 (refs #31)Make it possible to create empty repository. 2013-07-09 19:41:00 +09:00
takezoe
97101248a2 (refs #22)Fix constraint for adding collaborator. 2013-07-08 15:23:40 +09:00
takezoe
96dac65e31 (refs #4)Add 'News Feed' to the index page. 2013-07-07 14:05:01 +09:00
takezoe
54e0242030 (refs #4)Record wiki activity. 2013-07-07 01:24:08 +09:00