Commit Graph

3275 Commits

Author SHA1 Message Date
Naoki Takezoe
1e3bd9ebc0 (refs #1346)Fix warnings 2016-12-28 01:41:36 +09:00
Naoki Takezoe
e93e32b349 (refs #1346)Update libraries 2016-12-28 01:23:02 +09:00
Naoki Takezoe
1d03e83d95 (refs #1346)Update to use blocking-slick for Scala 2.12 support 2016-12-14 12:36:27 +09:00
Naoki Takezoe
5698692b26 Merge branch 'slick-3.1-blocking'
Conflicts:
	build.sbt
2016-12-14 10:57:21 +09:00
Naoki Takezoe
7fa921e7e5 Merge branch 'master' into slick-3.1-blocking
Conflicts:
	src/main/scala/gitbucket/core/service/IssuesService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/util/DatabaseConfig.scala
	src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
2016-11-11 16:29:34 +09:00
Naoki Takezoe
47a55354fe (refs #1346) Update libraries for Scala 2.12 2016-11-11 11:53:53 +09:00
Naoki Takezoe
d6197261fb (refs #1343) Keep file permission in online file editing 2016-11-09 10:34:53 +09:00
Naoki Takezoe
8fd7df2a9d (refs #1345) Remove large size avatar image to use width efficiently 2016-11-09 02:11:21 +09:00
Naoki Takezoe
4eb148f4a6 (refs #1340)Add dropdown filter
Because the large dropdown list makes  impossible to choose items below the screen.
2016-11-08 21:19:37 +09:00
Naoki Takezoe
8f1e460893 Merge pull request #1338 from gitbucket/new-permission-system
New permission system
2016-11-08 18:04:17 +09:00
Naoki Takezoe
8c80f8a506 (refs #1286) Rename CollaboratorsAuthenticator to WritableUsersAutheticator 2016-11-08 17:48:28 +09:00
Naoki Takezoe
9eb9fc666c (refs #1286) Bugfix 2016-11-08 02:32:11 +09:00
Naoki Takezoe
d70c6cece7 (refs #1286) Fix testcase 2016-11-06 16:37:44 +09:00
Naoki Takezoe
dbdee135a3 (refs #1286) Update collaborators setting form 2016-11-06 16:32:46 +09:00
Naoki Takezoe
132bb6bee4 (refs #1286) Update controllers 2016-11-04 13:57:39 +09:00
Naoki Takezoe
2dfa7a1190 (refs #1286) Update the repository settings form 2016-11-02 10:34:28 +09:00
Naoki Takezoe
06d559b47e (refs #1286) Add columns: ISSUES_OPTION and WIKI_OPTION 2016-11-02 02:15:21 +09:00
Naoki Takezoe
83baaa6ed9 (refs #1286) Show group marker when collaborator is added 2016-11-01 21:04:27 +09:00
Naoki Takezoe
85d38a47f1 (refs #1286) Refactoring 2016-11-01 18:01:57 +09:00
Naoki Takezoe
0c3c6ea15a (refs #1286) Show whether group account on the collaborators proposal 2016-11-01 16:03:02 +09:00
Naoki Takezoe
2ce436bddc Merge pull request #1336 from yanma/issue_1318
(refs #1318) make record***Activity via ssh works again
2016-11-01 14:16:26 +09:00
Hiroaki Yamazoe
a60c607fcb enable transaction for SSH access 2016-11-01 11:56:36 +09:00
Naoki Takezoe
0456739118 (refs #1286) Update collaborators setting form 2016-11-01 09:10:40 +09:00
Naoki Takezoe
368052bd8f (refs #1286) Fix services and beat compilation errors 2016-11-01 07:24:51 +09:00
Naoki Takezoe
ce916a7d4b (refs #1286) Fix models 2016-11-01 06:51:30 +09:00
Naoki Takezoe
60ff046823 (refs #1286) Prototyping of new permission system 2016-11-01 06:45:18 +09:00
Naoki Takezoe
7d3bda42e2 Update version 4.6 2016-10-29 15:00:20 +09:00
Naoki Takezoe
83a39f1e39 Update README.md 2016-10-29 15:00:01 +09:00
Naoki Takezoe
de726d8d96 (refs #1325) Prepend one more empty line when the first line is an empty line. 2016-10-26 12:21:21 +09:00
Naoki Takezoe
91bb241e8c (refs #1334) Indicate who is group manager 2016-10-26 10:44:20 +09:00
Naoki Takezoe
8da55d8aa8 Merge pull request #1311 from gitbucket/fix-issues-sorting
(refs #1308)Fix issues sorting
2016-10-19 01:29:00 +09:00
Naoki Takezoe
3355c46503 (refs #1308)Fix issues sorting again 2016-10-18 02:30:23 +09:00
Naoki Takezoe
0a3d457218 Merge pull request #1328 from kw-udon/custom-media-type-in-content-api
Support custom media types in get-content API
2016-10-17 09:31:24 +09:00
Naoki Takezoe
7fa5fdfbd0 Merge pull request #1326 from kounoike/pr/suppress-transition-on-load-in-ie
Suppress noisy transition animation on load in IE11
2016-10-17 01:14:43 +09:00
Naoki Takezoe
95f88891d0 Merge pull request #1327 from kounoike/pr/fix-logo
Cleanup white pixels in gitbucket logo.
2016-10-17 01:13:20 +09:00
Keiichi Watanabe
550f8f415c Support custom media types in get-content API
cf. https://developer.github.com/v3/repos/contents/#custom-media-types
2016-10-16 20:31:26 +09:00
KOUNOIKE Yuusuke
5ab947d8ec Cleanup white pixels in gitbucket logo. 2016-10-16 13:02:20 +09:00
KOUNOIKE Yuusuke
ec793535e7 Suppress noisy transition animation on load in IE11
http://stackoverflow.com/a/25674229
2016-10-16 12:44:43 +09:00
Naoki Takezoe
2f1d81cc4c Create issue comment by online file editing as well 2016-10-13 20:36:11 +09:00
Naoki Takezoe
0f189ca710 (refs #1319)Get rid of the duplication of issue id extracted from commit message 2016-10-13 20:24:01 +09:00
Naoki Takezoe
6afd51bb8d (refs #1312)Fix badge position on the side menu 2016-10-13 06:42:58 +09:00
Naoki Takezoe
e415f9d24e (refs #1316)Add "Page History" button to the wiki page view 2016-10-13 00:59:19 +09:00
Naoki Takezoe
ba5d587a1e Merge pull request #1321 from int128/gh-compatibility
Improve GitHub compatibility for Jenkins
2016-10-11 12:32:43 +09:00
Naoki Takezoe
92f778b6e9 Merge pull request #1320 from kw-udon/file-content-api
Add API to get a file content
2016-10-10 18:12:03 +09:00
Hidetake Iwata
b52981a845 Provide GitHub compatible URL for Git clients 2016-10-10 15:13:47 +09:00
Keiichi Watanabe
9c5d3edc72 Add API to get a file content 2016-10-10 02:04:43 +09:00
Naoki Takezoe
56d68c6145 Merge pull request #1313 from xuwei-k/remove-scalaz
remove unused scalaz
2016-10-05 17:45:01 +09:00
xuwei-k
4d13282915 remove unused scalaz 2016-10-05 12:14:43 +09:00
Naoki Takezoe
872320ccab (refs #1129)Not use Option.get for non-able value 2016-10-04 10:28:47 +09:00
Naoki Takezoe
28ee80b727 (refs #1129)Not delete from REPOSITORY table when user is disabled 2016-10-03 16:55:20 +09:00