3300 Commits

Author	SHA1	Message	Date
Naoki Takezoe	0e04925b6b	Merge pull request #1802 from gitbucket/merge-strategy ... Add a pulldown menu to choose the merge strategy	2017-12-12 11:48:12 +09:00
Naoki Takezoe	9a127256f3	Update reflog message	2017-12-12 11:39:00 +09:00
Naoki Takezoe	847f96d537	Filter proposed branches which have been already raised as pull request	2017-12-12 02:25:36 +09:00
Naoki Takezoe	70f40846bb	Show pull request proposals for the current repository ... if the repository doesn't have a parent repository.	2017-12-12 00:39:30 +09:00
Naoki Takezoe	1adc9b3223	Refactoring	2017-12-11 20:20:58 +09:00
Naoki Takezoe	0309496df6	Fix rebase process	2017-12-11 20:16:11 +09:00
Naoki Takezoe	cd4d75e35e	Format code	2017-12-11 12:33:06 +09:00
Naoki Takezoe	eb61bc50d6	Implemented squash merge strategy	2017-12-11 12:32:52 +09:00
Naoki Takezoe	4bbb22f73b	Fix branch selector presentation	2017-12-11 03:47:02 +09:00
Naoki Takezoe	fcb374c5c2	Implemented rebase strategy	2017-12-10 18:04:45 +09:00
Naoki Takezoe	a03d1c97c2	Format code	2017-12-10 17:39:45 +09:00
Naoki Takezoe	2d58b7f2d7	Add a pulldown menu to choose the merge strategy	2017-12-10 14:59:53 +09:00
Naoki Takezoe	332a1b4b0b	Add "Compare & pull request" button on the top of the repository viewer (#1476)	2017-12-09 04:52:21 +09:00
Naoki Takezoe	6bd58b0c45	Don't filter pull request target repositories ... because users who can access the forked repository should see the original repositories and other forked repositories basically.	2017-12-08 15:10:41 +09:00
Naoki Takezoe	fb175df851	(refs #1797) Fix accessible check for pull request repositories	2017-12-08 03:05:21 +09:00
Naoki Takezoe	b41aad92f2	Increase wait before refreshing the screen	2017-12-08 02:02:09 +09:00
Naoki Takezoe	aabae2ef7f	Fix compilation error	2017-12-07 20:07:16 +09:00
Naoki Takezoe	0c3d1fd86d	(refs #1799) Fix permalinks for pull request comments	2017-12-07 20:03:47 +09:00
Naoki Takezoe	adba849ec5	(refs #1798) Fix specification method of offset	2017-12-07 14:37:48 +09:00
Naoki Takezoe	86f4b41beb	Fix comment reply form behavior in the diff view (#1796)	2017-12-06 14:38:05 +09:00
Naoki Takezoe	aa54eff3d6	Fix diff class attribute in split mode	2017-12-06 10:46:37 +09:00
Naoki Takezoe	27ab21c9a7	Fix file uploading issue	2017-12-06 03:53:43 +09:00
Naoki Takezoe	9cc466a727	Add a Patch button to the diff view	2017-12-05 13:06:17 +09:00
Naoki Takezoe	9a9be12324	Fix error	2017-12-05 12:37:18 +09:00
Naoki Takezoe	8e91b9f0b5	Improve DiffEntry searching and add download patch endpoint	2017-12-05 03:31:23 +09:00
Naoki Takezoe	d157426d66	Fix error page for repository creation	2017-12-04 20:55:11 +09:00
Naoki Takezoe	58635674cb	Asynchronize repository forking	2017-12-04 20:18:39 +09:00
Naoki Takezoe	f6a048e0f7	FeedAdd validation for sourceUrl	2017-12-04 19:59:48 +09:00
Naoki Takezoe	c4dc1d7334	Feedback error in repository creation to users	2017-12-04 16:42:15 +09:00
Naoki Takezoe	efd5a64749	Asynchronize repository creation	2017-12-04 16:12:43 +09:00
Naoki Takezoe	13800a7023	Implement repository cloning	2017-12-04 14:00:57 +09:00
Naoki Takezoe	43d19d7d52	Add create new repository from existing git repository option	2017-12-04 01:32:35 +09:00
Naoki Takezoe	8a8278906a	Bump to 4.19.2	2017-12-03 05:28:49 +09:00
Naoki Takezoe	d15b3fb2f6	Modify id of "Test Hook" button	2017-12-03 05:20:32 +09:00
Naoki Takezoe	bcd92916ca	Fix routing in CompositeScalatraFilter	2017-12-03 04:36:05 +09:00
Naoki Takezoe	28105d6d3a	Update notification plugin	2017-12-03 01:00:40 +09:00
guyon	0a12b82b48	fix redirect URL path encode	2017-12-01 17:40:15 +09:00
Naoki Takezoe	c4bea091fe	Update version to 4.19.0	2017-11-29 03:13:21 +09:00
Naoki Takezoe	f2c9d99f30	Merge branch 'master' into composite-filter	2017-11-23 14:05:55 +09:00
Naoki Takezoe	6073497e5e	Fix validation rules for scalatra-forms	2017-11-23 14:00:55 +09:00
Naoki Takezoe	5d2ccfb0df	Refactoring	2017-11-17 21:18:53 +09:00
Naoki Takezoe	3745243078	Mount filters with path	2017-11-17 18:23:41 +09:00
Naoki Takezoe	30a1968793	Handle plugin controllers by loop as same as CompositeScalatraFilter	2017-11-17 18:20:12 +09:00
Naoki Takezoe	581bcb3dc8	Introduce CompositeScalatraFilter to merge controllers to one filter	2017-11-17 17:44:35 +09:00
Naoki Takezoe	cd243f910a	Merge pull request #1760 from gitbucket/scalatra-2.6 ... Bump to Scalatra 2.6.0	2017-11-16 16:53:10 +09:00
reap3r119	208f08c552	Use POST for /sidebar-collapse	2017-11-10 02:34:51 -05:00
Naoki Takezoe	b66852ec28	Fix for jQuery update	2017-11-10 16:15:41 +09:00
Naoki Takezoe	ad5a0bb442	Use ex.toString instead of ex.getMessage to show exception type as well	2017-11-04 23:20:14 +01:00
Naoki Takezoe	6056642f69	Merge pull request #1765 from reap3r119/fix-proposals ... Fix user proposals and update typeahead	2017-11-04 23:15:59 +01:00
Naoki Takezoe	21dcbf20b4	Merge pull request #1756 from reap3r119/admin-settings ... Layout changes for System settings page	2017-11-04 22:41:53 +01:00