Commit Graph

3618 Commits

Author SHA1 Message Date
Naoki Takezoe
4b1235b484 (refs #1271)Fixup 2016-12-10 11:25:16 +09:00
Naoki Takezoe
f354b9cfd7 (refs #1271)Add merged_by property 2016-12-10 02:25:39 +09:00
Naoki Takezoe
0c2283ce28 (refs #1271)Add some properties to ApiPullRequest model 2016-12-09 20:19:55 +09:00
Naoki Takezoe
840479a022 Merge pull request #1368 from tomoki1207/master
Fixed username suggestion on issue/PR.
2016-12-09 02:23:30 +09:00
Naoki Takezoe
1bceaaab1d (refs #1337)Fixup 2016-12-08 21:43:10 +09:00
Naoki Takezoe
65ece3292a (refs #1337)Use the specified port number as the SSL port number as well 2016-12-08 21:34:12 +09:00
Naoki Takezoe
e410623cac (refs #1367)Allow fast-forward push even if branch is protected 2016-12-08 21:06:18 +09:00
tomoki1207
09f7f036aa Fixed user name suggestion on issue/PR. 2016-12-06 18:58:02 +09:00
Naoki Takezoe
5249224dec Merge pull request #1365 from uli-heller/issue-1364-inconsistent-labels
Use lowercase for the first character of most 2nd words
2016-12-04 21:42:41 +09:00
Naoki Takezoe
00def3a46d (refs #1357)Fix error page 2016-12-04 13:28:26 +09:00
Uli Heller
134c0010b5 Use lowercase for the first character of most 2nd words
Unchanged: Mail Address, Full Name
2016-12-03 10:39:38 +01:00
Naoki Takezoe
fe3b40557a Tweak arguments of copy.scala.html 2016-12-01 14:58:30 +09:00
Naoki Takezoe
d3cdc5d5fc (refs #1359)Fix AdminLTE JavaScript importing 2016-12-01 09:27:20 +09:00
Naoki Takezoe
7ebb28be74 Remove ZeroClipboard 2016-12-01 02:07:24 +09:00
Naoki Takezoe
707cd3c5c3 Merge pull request #1359 from UprootStaging/adminlte-update
Updated admin lte to 2.3.8
2016-12-01 00:33:48 +09:00
Naoki Takezoe
4c5017d108 Merge pull request #1358 from tksugimoto/enable-copy-button-without-flash
Enable copy button without flash if JavaScript copy command is enable
2016-12-01 00:32:40 +09:00
hrj
fdd91b1e0e Updated admin lte to 2.3.8 2016-11-29 10:33:08 +05:30
Naoki Takezoe
9124777ce7 Merge pull request #1354 from mark-velez/fix-apostrophe-in-issue-text
Prevent LinkConverter matching escaped apostrophe (fixes #1148)
2016-11-28 18:41:53 +09:00
Naoki Takezoe
7c575fdc52 Update README.md 4.7.1 2016-11-28 00:17:12 +09:00
Naoki Takezoe
f9d6f1334f Update README.md 2016-11-28 00:16:06 +09:00
Naoki Takezoe
65d4900325 Update version to 4.7.1 2016-11-28 00:08:44 +09:00
Takashi Sugimoto
64248d1fce Enable copy button without flash 2016-11-27 23:18:35 +09:00
Naoki Takezoe
bec75120bc Update version to 4.7.1 2016-11-27 19:09:45 +09:00
Naoki Takezoe
3b0eed48d9 (refs #1355)Fix getUserRepositories() and getAllRepositories() too 2016-11-27 19:03:58 +09:00
Naoki Takezoe
25c4b1e6a7 (refs #1355)Fix RepositoryService#getVisibleRepositories() condition 2016-11-27 16:42:28 +09:00
Naoki Takezoe
cccff46715 (refs #1355)Fix RepositoryService#getVisibleRepositories() to contain group repositories 2016-11-27 04:03:23 +09:00
Matthieu Brouillard
fc0ffd1b4f Merge pull request #1356 from uli-heller/typo_ans_guests
Fixed typo in 4.7: '... ans guests...' -> '... and guests...'
2016-11-26 12:25:06 +01:00
Uli Heller
b70a2a2327 Fixed typo 2016-11-26 11:24:28 +01:00
Mark Velez
b5ca7ca0e1 Prevent LinkConverter matching escaped apostrophe (fixes #1148) 2016-11-26 02:17:51 -05:00
Naoki Takezoe
7bb5379b45 Update for 4.7 release 4.7 2016-11-26 13:31:12 +09:00
Naoki Takezoe
5692a8c83e Fix update branch authentication 2016-11-26 13:07:54 +09:00
Naoki Takezoe
6c6126148e Refactor new permission system 2016-11-26 13:00:24 +09:00
Naoki Takezoe
5b2e24daef Merge pull request #1353 from mashabow/link-milestone-label
Link milestone label to its issue list
2016-11-25 12:01:13 +09:00
Masaya Nakamura
29f390e48c Use helpers.urlEncode()/encodeURIComponent() 2016-11-25 11:40:05 +09:00
Masaya Nakamura
c49eff6e54 Link milestone label to its issue list 2016-11-24 17:35:49 +09:00
Naoki Takezoe
27930a5849 Fix testcase 2016-11-20 00:00:58 +09:00
Naoki Takezoe
6ffc139d2f (refs #1275)Keep sidebar status during same session 2016-11-19 23:02:41 +09:00
Naoki Takezoe
59ed027b60 Distinct assignable user names 2016-11-19 21:28:39 +09:00
Naoki Takezoe
5dc55822d7 Fix multi statement splitting 2016-11-17 00:16:02 +09:00
Naoki Takezoe
9bfe5115cc (refs #1350) Accept max 100 characters as repository name 2016-11-15 02:21:55 +09:00
Naoki Takezoe
aaf9c65f30 Fix scaladoc 2016-11-12 18:29:03 +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