Commit Graph

4240 Commits

Author SHA1 Message Date
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
b6cf080822 Merge pull request #1834 from gitbucket/submodule-link
Links submodule to the online repository viewer
2018-01-07 04:56:38 +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
kenji yoshida
bcb3450e2b sbt 1.1.0 2018-01-06 17:54:08 +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
Naoki Takezoe
40c06417e5 Merge pull request #1830 from xuwei-k/addSbtCoursier
use addSbtCoursier
2018-01-06 02:20:50 +09:00
Naoki Takezoe
c3c5535022 Merge pull request #1824 from yaroot/lfs
Treat LFS files as large binaries in the web viewer
2018-01-05 13:52:08 +09:00
xuwei-k
b7fc76d932 use addSbtCoursier
- https://github.com/coursier/coursier/blob/v1.0.0/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala#L57-L59
- a743f1183e
2018-01-04 13:46:07 +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
Naoki Takezoe
d17aed2357 (refs #1819) Restore sbt-coursier for the nested project 2017-12-28 12:00:47 +09:00
Naoki Takezoe
13382b47d1 Merge pull request #1819 from stevegk/dependencies
Update Dependencies and Plugins
2017-12-28 11:32:26 +09: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
Steve K
cf6d1ea137 Update plugins 2017-12-27 18:49:22 +00:00
Steve K
f735e4a133 Remove redundent project directory 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
718582af44 Merge pull request #1822 from uli-heller/mariadb-java-client-2.2.1
Upgraded to mariadb-java-client-2.2.1
2017-12-27 21:01:03 +09:00
Naoki Takezoe
23024cacaa Merge pull request #1821 from uli-heller/jgit-4.9.2.201712150930-r
jgit-4.9.2.201712150930-r
2017-12-27 21:00:46 +09:00
Uli Heller
f62cf409eb Upgraded to mariadb-java-client-2.2.1 2017-12-27 10:07:49 +01:00
Uli Heller
47845dfe1b jgit-4.9.2.201712150930-r 2017-12-27 10:01:34 +01:00
Naoki Takezoe
b7bb6b0787 Update plugins.json schema 4.20.0 2017-12-23 04:31:01 +09:00
Naoki Takezoe
ea41786f8c Fixup 2017-12-23 02:43:11 +09:00
Naoki Takezoe
962ae2130e Update README and CHANGELOG for GitBucket 4.20.0 release 2017-12-23 02:43:11 +09:00
Naoki Takezoe
90ea05f2a1 Merge pull request #1814 from gageas/fix-typo
Fix typo in style attribute
2017-12-22 03:27:37 +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
3f8069638c Merge pull request #1807 from uli-heller/mariadb-java-client-2.2.0
Upgraded to mariadb-java-client-2.2.0
2017-12-15 13:58:26 +00:00
Uli Heller
d62fc1185c Upgraded to mariadb-java-client-2.2.0 2017-12-14 07:59:19 +01:00
Naoki Takezoe
768706e1d1 Resurrect the pages plugin 2017-12-12 19:25:34 +09:00
Naoki Takezoe
8cc9771237 Merge pull request #1804 from gitbucket/show-conflict-files
Show conflicting files if pull request can't be merged
2017-12-12 13:32:31 +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