Commit Graph

3697 Commits

Author SHA1 Message Date
Naoki Takezoe
43f7a61c4b Implementing file upload on the repository viewer 2017-05-24 18:19:41 +09:00
Naoki Takezoe
4727aa90ab Merge branch 'feature/file-upload-to-repo' of https://github.com/devagorilla/gitbucket into devagorilla-feature/file-upload-to-repo 2017-05-23 15:33:01 +09:00
Naoki Takezoe
dcdc0cfa55 Fix view 2017-05-23 14:48:34 +09:00
Naoki Takezoe
27dc5597bc Merge pull request #1601 from tkgdsg/dropdown_filter
dropdown menu filter applied to "variable length" dropdown.
2017-05-22 11:40:42 +09:00
Yasuhiro Takagi
af37d23a0d dropdown menu filter applied to "variable length" dropdown
1. dropdown menu filter applied where that length is variable.
2. In compare.scala.html, use default dropdown menu function for filter.
2017-05-21 17:47:53 +09:00
Naoki Takezoe
2143760185 Merge pull request #1597 from tkgdsg/dropdown_filter_modification
function helper.html.dropdown supports filter placeholder
2017-05-18 11:19:15 +09:00
Yasuhiro Takagi
e919505f4e function helper.html.dropdown supports filter placeholder
developer can specify filter input placeholder in dropdown menu.
2017-05-17 21:40:30 +09:00
Naoki Takezoe
4fc221f4f9 Take first 5 commits to store activity 2017-05-15 17:15:49 +09:00
Naoki Takezoe
532f418c2f (refs #1591)Bump markedj to 1.0.11 to allow HTML in markdown 2017-05-13 20:54:20 +09:00
Naoki Takezoe
19016aa14a (refs #1594)Filter the comparing dropdown based on user’s right 2017-05-13 16:06:36 +09:00
Naoki Takezoe
6016844327 Merge pull request #1592 from t-tsutsumi/pr/fix-conditional-expression-default-branch
Fix conditional expression for determining whether it is default branch
2017-05-12 14:46:19 +09:00
t-tsutsumi
352438ee0a Fix conditional expression for determining whether it is default branch 2017-05-12 02:49:25 +09:00
Naoki Takezoe
d1dbdb1642 Merge pull request #1590 from t-tsutsumi/pr/fix-delete-branch-feature-of-pr
Fix delete branch feature of PR does not work at all
2017-05-11 11:26:07 +09:00
t-tsutsumi
29da986b9f Fix delete branch feature of PR does not work at all 2017-05-11 03:32:40 +09:00
Naoki Takezoe
0b819ea762 Merge pull request #1588 from t-tsutsumi/pr/fix-incorrect-redirect-url-and-authorization
Fix incorrect redirect URL and authorization in Update branch feature
2017-05-10 10:06:21 +09:00
Naoki Takezoe
b3dbaaae7a Merge pull request #1587 from t-tsutsumi/pr/disabling-directory-listing-feature
Disabling directory listing feature on Jetty
2017-05-10 10:05:15 +09:00
t-tsutsumi
2dcc14b4d9 Fix incorrect redirect URL and authorization in Update branch feature 2017-05-09 04:55:55 +09:00
t-tsutsumi
fe728baee7 Disabling directory listing feature on Jetty 2017-05-09 04:12:03 +09:00
Naoki Takezoe
d6f49eb442 Merge pull request #1585 from t-tsutsumi/pr/add-scala-ide-specific-files-to-.gitignore
Add Scala-IDE specific files to .gitignore
2017-05-08 02:19:41 +09:00
t-tsutsumi
890dbf99a7 Add Scala-IDE specific files to .gitignore 2017-05-08 00:58:32 +09:00
Naoki Takezoe
61853a474a Rolled back to Jetty 9.3.19.v20170502
because Scalatra 2.5.0 does not work with Jetty 9.4.
2017-05-06 09:52:14 +09:00
Naoki Takezoe
447183c779 Merge pull request #1583 from t-tsutsumi/pr/fix-incorrect-font-color-when-screen-size-768px-or-less
Fix incorrect font color when screen size 768px or less
2017-05-06 09:34:46 +09:00
t-tsutsumi
b371f76cb6 Fix incorrect font color when screen size 768px or less 2017-05-06 08:10:07 +09:00
Naoki Takezoe
a5971bbdde https://github.com/travis-ci/travis-ci/issues/7703 2017-05-06 01:44:20 +09:00
Naoki Takezoe
0827fef978 Merge pull request #1533 from aadrian/dependency_updates
Dependency updates
2017-05-06 00:05:37 +09:00
Naoki Takezoe
a66fcb3a77 Remove uniqId from template arguments 2017-05-05 23:46:07 +09:00
Naoki Takezoe
ac9b93bbba Merge pull request #1579 from tkgdsg/dropdown_filter_improve_and_fix
dropdown helper function improvement & modification
2017-05-05 23:35:09 +09:00
aadrian
7917483dfc Merge branch 'master' into dependency_updates 2017-05-04 15:44:38 +02:00
aadrian
c0a2c8a235 change back to jldap "2009-10-07" until a replacement library is used. 2017-05-04 15:26:32 +02:00
Yasuhiro Takagi
f28dc15252 dropdown helper function improvement & modification
helper can specify placeholder for it's filter.
to identify each dropdown input filter by id, use unique Id.
2017-05-04 12:31:41 +09:00
Naoki Takezoe
9faa3e8402 Bump to 4.12.1 2017-05-04 10:41:46 +09:00
Naoki Takezoe
0f33d66cc2 Merge pull request #1576 from t-tsutsumi/pr/remove-slf4j-jdk14
Remove SLF4J JDK14 binding
2017-05-04 10:04:27 +09:00
t-tsutsumi
5f9fd23c47 Remove SLF4J JDK14 binding 2017-05-04 04:11:04 +09:00
Naoki Takezoe
e98d275de3 Merge pull request #1571 from t-tsutsumi/pr/fix-incorrect-initial-height
Fix incorrect initial height of textarea
2017-05-03 09:39:51 +09:00
t-tsutsumi
6ffb2dbad7 Fix incorrect initial height of textarea 2017-05-02 20:23:34 +09:00
aadrian
eb2bef824d use postgresql-embedded 2.0 (that is supposed to work with Java 9) 2017-05-02 11:17:15 +02:00
Naoki Takezoe
16ccf83f7a Merge pull request #1568 from dbronecki/issue/1567
Fix redirect issue - fixes #1567
2017-05-02 12:40:18 +09:00
aadrian
f60685117d remove sbt-dependency-graph plugin. 2017-05-01 23:35:29 +02:00
aadrian
a830b80965 update jetty, h2 and akka again 2017-05-01 23:33:48 +02:00
Damian Bronecki
3795de97a4 Fix redirect issue by partially reverting to 956af54 - fixes #1567 2017-05-01 22:18:12 +02:00
aadrian
c972782053 use SBT 0.13.15 2017-04-30 18:09:48 +02:00
aadrian
52f05a911b Merge remote-tracking branch 'origin/master' into dependency_updates 2017-04-30 18:06:41 +02:00
Naoki Takezoe
0a007dd4eb Merge pull request #1512 from UprootStaging/safeOpt
Enable safe optimisations in scalac
2017-05-01 00:13:51 +09:00
Naoki Takezoe
6223503511 Merge pull request #1566 from xuwei-k/ApiRepository-watchers-param-unused
fix ApiRepository#apply
2017-05-01 00:03:13 +09:00
Naoki Takezoe
2e499e88a6 Merge pull request #1564 from t-tsutsumi/pr/disabling-server-header
Disabling Server header on Jetty
2017-04-30 19:14:29 +09:00
t-tsutsumi
658fe94d0f Avoid use functional looping style 2017-04-30 17:20:59 +09:00
xuwei-k
7c2cf86674 fix ApiRepository#apply 2017-04-30 16:33:49 +09:00
Naoki Takezoe
0db4cd35f1 Merge remote-tracking branch 'origin/master' 2017-04-30 13:27:28 +09:00
Naoki Takezoe
289c38edeb Update document 2017-04-30 13:27:12 +09:00
Naoki Takezoe
650e9f0d0b Drop sbt launcher 2017-04-30 13:23:59 +09:00