1667 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
takezoe	3282a8d76a	(refs #39)Small fix for copy button.	2013-07-16 21:30:21 +09:00
Naoki Takezoe	d04befb8d0	Merge pull request #39 from tanacasino/feature/copy-to-clipboard ... Add copy to clipboard git clone URL	2013-07-16 05:04:47 -07:00
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
Tomofumi Tanaka	fc7481c60c	Add copy to clipboard clone URL	2013-07-16 01:10:52 +09:00
takezoe	e59ae9c6e9	(refs #2)Remove unused code.	2013-07-16 00:29:30 +09:00
takezoe	aae40a7087	Bugfix	2013-07-16 00:11:45 +09:00
takezoe	9f9148fc1f	(refs #2)Display commit and diff count on the tab.	2013-07-15 23:07:09 +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	78d48c8be3	Remove var!	2013-07-15 13:02: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	dc59d1f3ca	(refs #2)Display forked repository at the repository list of the account page.	2013-07-15 03:49:43 +09:00
takezoe	1ab3f53a31	Merge branch 'fork-and-pullreq' of https://github.com/takezoe/gitbucket into fork-and-pullreq	2013-07-15 03:48:06 +09:00
takezoe	fd7d387fb0	(refs #2)Experimental implementation of merge pull request.	2013-07-15 03:47:43 +09:00
takezoe	17a64506f8	(refs #3)Experimental implementation of merge pull request.	2013-07-15 03:23:28 +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	6fd312f784	Formatted.	2013-07-14 03:29:17 +09:00
takezoe	12d59231c5	(refs #2)Record 'open pull request' activity.	2013-07-14 03:28:37 +09:00
takezoe	3a7e2c0249	(refs #2)Record 'open pull request' activity.	2013-07-14 03:27:59 +09:00
takezoe	62f2defd91	Fix typo.	2013-07-14 03:23:35 +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	bf3380755b	(refs #2)Fix PULL_REQUEST schema.	2013-07-14 01:25:27 +09:00
takezoe	5d327ccd53	(refs #2)Implementing comparing settings.	2013-07-13 23:07:36 +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	f4cb0625bc	(refs #2)Add PullRequest model.	2013-07-12 16:37:58 +09:00
takezoe	edd40ebe9d	(refs #2)Add 'Pull Requests' tab to the header.	2013-07-12 16:30:30 +09:00
takezoe	4e8c130cbf	Expand column COMMENT.ACTION to VARCHAR(20).	2013-07-12 16:07:20 +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	3c2675fd0d	Remove unused import statement.	2013-07-12 15:23:01 +09:00
takezoe	f163e348e0	(refs #34)Link conversion checks existence of accounts and issues.	2013-07-12 15:15:58 +09:00
takezoe	71a3d79c82	Fix commit list presentation.	2013-07-12 04:34:54 +09:00
takezoe	bd1ba67647	Add avatar to the blob view.	2013-07-12 04:29:27 +09:00
takezoe	828688ddd0	(refs #33)Match committer by mail address.	2013-07-12 04:27:20 +09:00
takezoe	60cd1320d2	Migration for wiki repository configuration in 1.3 which add http.receivepack=true.	2013-07-12 03:30:25 +09:00
takezoe	a31de89f9c	Remove debug code.	2013-07-12 03:26:41 +09:00
takezoe	a129f53e0c	Remove fixed TODO.	2013-07-12 03:01:28 +09:00
takezoe	6aa86ac2e3	Use StringUtil#urlEncode() instead of URLEncode#encode().	2013-07-12 02:18:29 +09:00
takezoe	28cafbcad2	(refs #35)Fixed.	2013-07-12 02:14:27 +09:00
takezoe	991f60ce44	(refs #34)@xxxx in markdown as link.	2013-07-12 01:29:23 +09:00
takezoe	5dbeabcc58	Support formaction attribute.	2013-07-11 22:19:03 +09:00
takezoe	b6bcebc588	Fix activity message.	2013-07-11 22:13:53 +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