Naoki Takezoe
71cce5b470
Fix user interface of releases
2018-01-13 16:30:50 +09:00
Naoki Takezoe
bb188ec948
Merge branch 'master' into pr-add-release
2018-01-13 16:30:18 +09:00
Naoki Takezoe
281522fc88
(refs #1836 ) Make same behavior with H2 console when table is clicked
2018-01-12 02:25:22 +09:00
Naoki Takezoe
a045fc6ae4
(refs #1838 ) Fix rebase merge
2018-01-11 15:58:17 +09:00
Naoki Takezoe
8e8e794574
Merge pull request #1829 from kounoike/pr-dropdown-close-and-comment-button
...
Change Close/Reopen button to dropdown-selectable button.
2018-01-11 13:22:27 +09:00
Naoki Takezoe
5f47b126e3
(refs #1808 ) Specify medium color for text in the sidemenu
2018-01-08 22:41:08 +09:00
KOUNOIKE Yuusuke
33d82beb72
set maxFilesize for dropzone
2018-01-08 18:29:18 +09:00
Naoki Takezoe
3de5d806b5
(refs #1836 ) Add context menu to the database viewer
...
Also "Run query" button runs only selected text if some text is selected.
2018-01-08 01:00:55 +09:00
Naoki Takezoe
8eb522fb38
(refs #1836 ) Add "Clear" button to the database viewer
2018-01-07 21:32:26 +09:00
KOUNOIKE Yuusuke
370e4339f3
Change tag-based list to release-based list (releases page)
2018-01-07 16:53:19 +09:00
KOUNOIKE Yuusuke
5b0eb7ece5
Change icon to octicon-gift
2018-01-07 16:52:16 +09:00
KOUNOIKE Yuusuke
18434854d8
Update migrate filename
2018-01-07 14:16:07 +09:00
KOUNOIKE Yuusuke
d3f57bdb45
fix imports
2018-01-07 14:14:54 +09:00
KOUNOIKE Yuusuke
37734ce26b
Merge remote-tracking branch 'upstream/master' into pr-add-release
...
# Conflicts:
# build.sbt
# src/main/scala/ScalatraBootstrap.scala
# src/main/scala/gitbucket/core/GitBucketCoreModule.scala
# src/main/scala/gitbucket/core/controller/FileUploadController.scala
# src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
# src/main/scala/gitbucket/core/service/RepositoryService.scala
# src/main/twirl/gitbucket/core/menu.scala.html
2018-01-07 13:22:56 +09:00
Naoki Takezoe
bbc817d86d
(refs #1823 ) Link submodule to the online repository viewer
...
Supports following services:
- GitBucket (need to set the base url at the system settings)
- GitHub
- BitBucket
- GitLab.com
If a repository url doesn't match above services, generate a link to the git repository as before.
2018-01-07 04:41:00 +09:00
Naoki Takezoe
5e88f3f787
(refs #1808 ) Fix inline CSS styles
2018-01-07 02:26:16 +09:00
Naoki Takezoe
f64d4843f3
(refs #1816 ) Apply max_file_size to dropzone as well
2018-01-07 02:01:40 +09:00
Naoki Takezoe
c607045b7c
Merge pull request #1825 from gitbucket/features/dbviewer
...
Replace H2 console
2018-01-06 17:40:35 +09:00
Naoki Takezoe
f8e9093273
Display primary keys in the tree
2018-01-06 17:32:01 +09:00
KOUNOIKE Yuusuke
c8d666baba
Change Close/Reopen button to dropdown-selectable button.
2018-01-04 00:49:13 +09:00
Naoki Takezoe
a64741011c
Implement displaying result as a scrollable table
2017-12-30 01:02:09 +09:00
Naoki Takezoe
ae9ee4779f
Add tables tree
2017-12-29 04:50:58 +09:00
Naoki Takezoe
5fd2d61861
Database viewer (replacement of H2 console)
2017-12-28 18:55:55 +09:00
Yan Su
939c9156ad
treat LFS files as large binaries in the web viewer
2017-12-28 16:27:09 +08:00
Steve K
5e5a1ea5a8
Update dependencies
...
Updates dependencies except scalatra and jetty
Includes fix for Cache2K api breaking change
2017-12-27 18:49:22 +00:00
Naoki Takezoe
86b67863f8
(refs #1263 ) Fix BLOB download in Wiki
2017-12-28 03:15:40 +09:00
Naoki Takezoe
b7bb6b0787
Update plugins.json schema
2017-12-23 04:31:01 +09:00
gageas
f8bda516d6
Fix typo in style attribute
...
Because of the typo, image displayed in unintended aspect ratio, in some case.
2017-12-21 22:49:01 +09:00
Naoki Takezoe
378c031ecb
Merge pull request #1813 from atware/WIP-webhook-create-event
...
support CreateEvent in webhook
2017-12-21 18:42:58 +09:00
Naoki Takezoe
9a5db80dea
(refs #1783 ) hide overflowed chars in the sidebar
2017-12-21 18:41:19 +09:00
Naoki Takezoe
992eb0ceda
Bump to 4.20.0
2017-12-21 15:22:07 +09:00
guyon
39e1ac2398
support CreateEvent in webhook
2017-12-21 15:21:51 +09:00
Naoki Takezoe
d1c77de5a0
Bump to 4.19.3
2017-12-21 15:21:07 +09:00
Naoki Takezoe
8df30ef01b
Fix message
2017-12-12 13:06:04 +09:00
Naoki Takezoe
dd2e5bfedf
Fix testcase
2017-12-12 12:04:24 +09:00
Naoki Takezoe
e3c7eb092f
Fix merge failure
2017-12-12 12:02:04 +09:00
Naoki Takezoe
5b3c3e2e7c
Merge branch 'master' into show-conflict-files
2017-12-12 11:58:57 +09:00
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
1033122fec
Show conflicting files
2017-12-12 03:20:50 +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
