Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-29 01:26:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,203 Commits 14 Branches 116 Tags
c8a4798f869ba25b51bb52ec0b5b611a4fc87fe6
Commit Graph

310 Commits

Author SHA1 Message Date
Tomofumi Tanaka
6acbd5b2cf Merge remote-tracking branch 'origin/master' into api-support 
Conflicts:
	src/main/scala/ScalatraBootstrap.scala
	src/main/scala/gitbucket/core/controller/AccountController.scala
	src/main/scala/gitbucket/core/controller/ControllerBase.scala
	src/main/scala/gitbucket/core/controller/IssuesController.scala
	src/main/scala/gitbucket/core/controller/PullRequestsController.scala
	src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
	src/main/scala/gitbucket/core/model/Profile.scala
	src/main/scala/gitbucket/core/service/PullRequestService.scala
	src/main/scala/gitbucket/core/service/WebHookService.scala
	src/main/scala/gitbucket/core/servlet/InitializeListener.scala
	src/main/scala/gitbucket/core/view/helpers.scala
	src/main/twirl/gitbucket/core/pulls/conversation.scala.html
	src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
	src/main/twirl/issues/listparts.scala.html
 2015-03-16 22:49:47 +09:00
Naoki Takezoe
19ead71b48 Bump up version number to 3.0.0 2015-03-02 22:22:52 +09:00
Naoki Takezoe
d495b04d85 Change package name 2015-03-02 22:15:56 +09:00
nazoking
3057a31a6c add test for Diretory (set GitBucketHome when test scope) 2015-03-02 03:12:20 +09:00
Naoki Takezoe
ab564cc2d4 Merge branch 'master' into new-plugin-system 
Conflicts:
	src/main/scala/servlet/AutoUpdateListener.scala
 2015-02-14 23:40:43 +09:00
takezoe
140f1eb31b Add sbt-assembly configuration 2015-01-25 02:31:21 +09:00
Rodrigo Lazoti
172af307a6 add connection pool to Database object 2015-01-20 12:14:28 -02:00
Naoki Takezoe
85c1a56cbf Purge old plugin system 2015-01-02 01:59:21 +09:00
takezoe
bd5df3977d (refs #518)Compile for Java7 2014-10-12 15:49:49 +09:00
shimamoto
e16d3c823b Update slick version. 2014-09-22 21:59:17 +09:00
Naoki Takezoe
3bb69c623b (refs #464)Switch to play-twirl 2014-08-14 18:37:37 +09:00
Naoki Takezoe
098b18fe6d (refs #464)Experimental implementation of Scala based plugin 2014-08-10 04:33:57 +09:00
Naoki Takezoe
20aabfc273 Merge branch 'scala-2.11' 2014-08-03 19:13:34 +09:00
Tomofumi Tanaka
c22aef8ee2 (refs #421)Add tar.gz archive download 
* Update jgit version
* Add new lib org.eclipse.jgit.archive
* TODO: Add link in views
 2014-08-01 23:56:02 +09:00
Naoki Takezoe
82beed1f44 (refs #374)Upgrading to Scala 2.11.2 2014-07-30 07:43:32 +09:00
Naoki Takezoe
0ede7e9921 (refs #374)Upgrading to Scalatra 2.3 and Slick 2.1. 
Some compilation errors in Slick code are remaining.
 2014-07-30 07:36:35 +09:00
Naoki Takezoe
f58f476060 (refs #441)Upgrade h2 to the latest version. 2014-07-25 15:46:29 +09:00
Naoki Takezoe
9cfa8c594b Merge branch 'master' into slick2 
Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala
 2014-07-06 17:02:49 +09:00
Naoki Takezoe
c64909ab1a Plugin updating is executed asynchronously by Quartz Scheduler 2014-06-29 16:09:41 +09:00
shimamoto
bbe455ac49 (refs #341) Migrate model package. 2014-06-16 01:29:56 +09:00
Naoki Takezoe
c4f69fbd13 (refs #32)Switch JavaScript processor to Rhino from Nashorn because GitBucket should work on both of JDK7 and JDK8 2014-06-14 10:58:58 +09:00
takezoe
cfc594805b (refs #348)Upgrade MINA to 0.11.0 2014-04-27 02:11:10 +09:00
Naoki Takezoe
dfa4816633 (refs #288)Once remove AsciiDoc support 2014-04-08 10:13:07 +09:00
Tobias Roeser
c9a1515d1f Merge branch 'master' into asciidoctorj 
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
 2014-03-29 13:53:23 +01:00
xuwei-k
087297d14c sbt 0.13 2014-03-19 00:48:57 +09:00
takezoe
4870533710 Upgrade scalatra-forms to 0.0.14 2014-03-15 01:04:28 +09:00
Tomofumi Tanaka
79e1abe624 (refs #110)Update apache sshd version 
For fix authentication partial bug
 2014-03-04 22:42:32 +09:00
Tobias Roeser
3db3bf1b74 Rewrite relative links to reflect the base url of the repo. 2014-03-04 11:38:56 +01:00
Tobias Roeser
9078aa6d08 Added asciidoctorj dependency. 2014-02-26 13:53:50 +01:00
Tomofumi Tanaka
c86ece4dc0 Add mina ssh to dependencies 2014-02-24 22:45:45 +09:00
takezoe
a4cb5c991c Upgrade scalatra-forms to 0.0.11. 2013-12-12 03:22:37 +09:00
Piotr Adamski
47714eec45 Silenced compiler warnings 2013-12-03 18:41:41 +01:00
takezoe
43152c9341 Upgrade scalatra-forms to 0.0.8. 2013-11-14 04:04:29 +09:00
takezoe
dd4abb2073 Upgrade to scalatra-forms 0.0.6. 2013-11-08 03:24:12 +09:00
takezoe
c517b44e82 Upgrade to scalatra-forms 0.0.4 2013-11-02 05:07:09 +09:00
xuwei-k
af759a815f add scalacOptions 2013-10-14 14:49:52 +09:00
HairyFotr
7b2ee25ea2 Add plugin, Update versions 2013-10-13 21:25:44 +02:00
ssogabe
280df2cedd configure sbt to use the junitxml option with specs2 2013-10-13 09:38:52 +09:00
takezoe
f3507cf465 (refs #117)Add build.properties to fix sbt version. 2013-10-09 10:44:52 +09:00
takezoe
c3ec52b391 (refs #128)Add javacOptions to specify 6 as compilation target. 2013-10-08 03:07:33 +09:00
takezoe
e6ad069509 (refs #96)Improve Jetty embedding process. 2013-09-27 02:43:22 +09:00
takezoe
38c7e3cdf8 (refs #96)Add build.xml which makes an executable war file. 2013-09-26 20:17:33 +09:00
takezoe
36115734bb (refs #74)Web hook is completed. 2013-09-14 17:14:37 +09:00
shimamoto
6d76e93ede (refs #10) Creates a E-mail sending. still working on... 2013-08-23 22:30:40 +09:00
takezoe
582df3239f (refs #78)Implementing LDAP authentication. 2013-08-16 03:45:50 +09:00
takezoe
3ea102e238 Upgrade Scalatra to 2.2.1. 2013-08-15 11:22:10 +09:00
takezoe
1a509a9a13 Use released scalatra-forms 0.0.2. 2013-08-10 02:27:07 +09:00
takezoe
629b714dab Upgrade scalatra-forms. 2013-08-09 18:06:33 +09:00
takezoe
7e05bcc81d Use released scalatra-forms 0.0.1. The jar file in /lib has been removed. 2013-08-04 13:13:18 +09:00
kxbmap
1c6f4a1d1e Upgrade to sbt-idea 1.5.1 2013-08-01 02:15:56 +09:00