Commit Graph

4535 Commits

Author SHA1 Message Date
Naoki Takezoe
6029d9ef29 Adjust condition to display pull request creation suggestion for branches 2018-06-13 17:48:10 +09:00
Naoki Takezoe
db1d437a93 Fix style of some text fields 2018-06-13 15:39:50 +09:00
Naoki Takezoe
5de893f5d3 Merge pull request #2052 from uli-heller/jgit5
Upgraded to jgit-5.0-rc2
2018-06-13 15:32:41 +09:00
Naoki Takezoe
11d73816af Merge pull request #2047 from sraabe/patch-1
Added mime-type mapping for SVG files
2018-06-13 15:16:11 +09:00
Naoki Takezoe
4106276616 Merge pull request #2066 from gitbucket/render-html-as-text
Render HTML as text/plain
2018-06-13 10:51:32 +09:00
Naoki Takezoe
f1ffb25e43 Render HTML as text/plain 2018-06-12 20:02:49 +09:00
Naoki Takezoe
2586b436cf Merge pull request #2042 from kazuki43zoo/keep-showing-fold-comment
Keep showing a fold comment when tasklist is not complete
2018-06-11 09:09:51 +09:00
Naoki Takezoe
abeef42a53 Merge pull request #2037 from kazuki43zoo/focus-on-comment-area
Focus to textarea at add and edit a comment
2018-06-11 09:09:22 +09:00
Naoki Takezoe
f42792d9c3 Merge pull request #2018 from kounoike/pr-notification-hooks
Add notification hooks
2018-06-11 08:46:29 +09:00
Naoki Takezoe
42acd60527 Merge pull request #2061 from uli-heller/mariadb-2.2.5
org.mariadb.jdbc: 2.2.4 -> 2.2.5
2018-06-11 08:45:25 +09:00
Uli Heller
a53c0a8386 org.mariadb.jdbc: 2.2.4 -> 2.2.5 2018-06-07 20:52:29 +02:00
Naoki Takezoe
97d2f6ba02 Merge pull request #2056 from kazuki43zoo/support-line-comment-on-split-mode
Support line comment on split mode
2018-06-07 11:22:43 +09:00
Kazuki Shimizu
05e1807a95 Fix to add a line comment correctly on split mode
Related with #2051
2018-06-05 22:33:48 +09:00
Kazuki Shimizu
3611b77c54 Merge branch 'gh-2050' into support-line-comment-on-split-mode 2018-06-05 22:18:31 +09:00
Naoki Takezoe
f2d561c557 (refs #2048)Fix wrong copy-and-pasted code :P 2018-06-05 13:56:30 +09:00
Naoki Takezoe
ea547a43a5 (refs #2040)Fix permission check for the repository menu 2018-06-05 12:36:50 +09:00
Naoki Takezoe
8068bb41ca Fix indent 2018-06-05 12:14:28 +09:00
Naoki Takezoe
c3eb30c01d (refs #2048)Fix archive downloading 2018-06-05 11:58:05 +09:00
Naoki Takezoe
7a795525ed Merge pull request #2044 from kazuki43zoo/fix-disable-comment-button
Release the disable status on line comment adding button when validation error occurred
2018-06-04 15:38:19 +09:00
Naoki Takezoe
082b2f7123 Merge pull request #2043 from kazuki43zoo/move-into-commentform-area
Move buttons into commentform area
2018-06-04 15:37:04 +09:00
Uli Heller
7a4bbccdd9 Upgraded to jgit-5.0-rc2 2018-06-04 08:29:06 +02:00
Kazuki Shimizu
c58f6377fc Find all text when collect diff data
Fixes #2050
2018-06-04 00:18:09 +09:00
kenji yoshida
1e330b42a8 sbt 1.1.6 (#2039) 2018-06-03 13:41:25 +09:00
Steffen Raabe
889f4f0a0f Added mime-type mapping for SVG files
I added a mime-type mapping for SVG files because when serving gitbucket from Wildfly, SVG files like the logo "gitbucket.svg" are being sent with "Content-Type: text/html", causing the image not to be displayed in the browser.
Adding this mapping to web.xml fixes that behavior for deployments on Wildfly and possibly other application servers.
2018-06-02 16:41:43 +02:00
Kazuki Shimizu
ff4ad2d903 Release the disable status on line comment adding button when validation error occurred 2018-06-01 07:01:01 +09:00
Kazuki Shimizu
42fc021939 Move buttons into commentform area 2018-06-01 01:18:45 +09:00
Kazuki Shimizu
20af5aa742 Keep showing a fold comment when tasklist is not complete 2018-05-31 08:35:08 +09:00
Kazuki Shimizu
d2047ac985 Focus to textarea at add and edit a comment 2018-05-30 08:57:21 +09:00
Naoki Takezoe
65ac7b7b13 Fixup 2018-05-29 03:23:04 +09:00
Naoki Takezoe
165cf88219 Bump gist-plugin to 4.15.0 which supports GitBucket 4.25.0 4.25.0 2018-05-29 02:09:19 +09:00
Naoki Takezoe
80b7e15d94 Bump to 4.15.0 2018-05-29 00:04:02 +09:00
Naoki Takezoe
6eadebede2 Merge pull request #2035 from kazuki43zoo/gh-2015_count-conversations
Count multiple comments on the same line
2018-05-28 23:54:25 +09:00
Kazuki Shimizu
beb0401500 Count multiple comments on the same line
See #2015
2018-05-28 22:58:34 +09:00
Naoki Takezoe
eface25cf8 Update README and CHANGELOG 2018-05-28 15:56:36 +09:00
Naoki Takezoe
9eff4cb485 (refs #2031) Fix permission check for the repository menu 2018-05-28 15:49:47 +09:00
Naoki Takezoe
c65c3e2c49 Escape HTML 2018-05-28 15:42:32 +09:00
Naoki Takezoe
d064ca85fb Encode parameters in url generation helpers 2018-05-28 12:30:07 +09:00
Naoki Takezoe
df9c34bcec Fix indent 2018-05-28 12:26:11 +09:00
Naoki Takezoe
172701105a URL encode username in user link 2018-05-28 12:15:26 +09:00
Naoki Takezoe
e2da18a763 (refs #2030) Fix isolation level issue in MySQL 2018-05-28 00:46:53 +09:00
Naoki Takezoe
77383c4e8f Merge pull request #2034 from gitbucket/extra-mail-address-migration
Migration to delete empty extra mail addresses
2018-05-28 00:45:02 +09:00
Naoki Takezoe
aba9db3857 Migration to delete empty extra mail addresses 2018-05-27 22:46:50 +09:00
Naoki Takezoe
d97677aaaa Merge branch 'ThaFridge-master' 2018-05-27 13:14:10 +09:00
Naoki Takezoe
d02a4baf47 Remove duplicated X-UA-Compatible meta tag 2018-05-27 13:13:51 +09:00
ThaFridge
4ce07ee3dd Update with propper mobile/tablet scalling 2018-05-27 13:11:52 +09:00
Naoki Takezoe
a354522406 Merge pull request #2032 from kounoike/pr-fix-extra-email-bug
fix extra email bug in account registration
2018-05-27 12:31:42 +09:00
Naoki Takezoe
c4bdf86253 Merge pull request #2015 from kazuki43zoo/count-conversation
Counting conversations on pull request screen
2018-05-27 03:36:45 +09:00
KOUNOIKE Yuusuke
87fa283b65 fix extra email bug in account registration 2018-05-26 12:58:31 +09:00
Kazuki Shimizu
71828e5d08 Counting conversations on pull request screen 2018-05-26 09:51:56 +09:00
Naoki Takezoe
89bf8db087 Add new line to the end of response 2018-05-25 02:07:13 +09:00