Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,002 Commits 14 Branches 116 Tags
ae7ead62724a85e9674850feba8fb69a80c8ad6b
Commit Graph

1263 Commits

Author SHA1 Message Date
bati11
6175eb7c08 Merge branch 'master' into feature-tasklist 
Conflicts:
	src/main/twirl/issues/commentform.scala.html
	src/main/twirl/issues/create.scala.html
	src/main/twirl/pulls/compare.scala.html
	src/main/twirl/wiki/edit.scala.html
 2014-05-31 12:17:30 +09:00
Naoki Takezoe
db5395ddbc Update version number to 2.0. 2014-05-31 10:38:31 +09:00
HairyFotr
7698f12112 Small cleanup using static analysis 2014-05-31 00:57:03 +02:00
Naoki Takezoe
a846c77c7e (refs #346)Add group members as collaborator when transfer repository to the group. 2014-05-25 18:14:53 +09:00
Tomofumi Tanaka
29812f4a82 (refs #375)Show merge commit diffs correctly 2014-05-20 21:26:51 +09:00
takezoe
7811926779 (refs #367)Redirect if forked repository already exists 2014-05-12 23:56:42 +09:00
takezoe
70772f0d74 (refs #364)Keep links which start with '#' 2014-05-11 13:13:16 +09:00
takezoe
259637ce3c Fix wiki styles 2014-05-11 01:38:12 +09:00
takezoe
cf047a8cee Migrate: add extension to files which are attached to issue 2014-05-04 18:45:58 +09:00
bati11
ebb9d9329a Merge branch 'master' into feature-tasklist 2014-05-03 10:51:18 +09:00
Tomofumi Tanaka
619f72d929 Add link for image file 
* Render image tag with link tag on issue and wiki
* Correct response content-type of attached image on issue
 2014-05-03 00:56:36 +09:00
Tomofumi Tanaka
dc21e8388e Improve update pull request query 
commitIdFrom and commitIdTo columns update by one query.
 2014-05-02 19:55:49 +09:00
yjkony
8c35310cd6 Merge commit Tag 1.13 ('3e82534c78a72e17dd3b79e091521d75cb4d3855') into add-features-to-ldapauth 
Conflicts:
	src/main/scala/service/AccountService.scala
	src/main/scala/util/LDAPUtil.scala
 2014-05-01 11:56:56 +09:00
Tomofumi Tanaka
dd694d27b5 (refs #324)Update commitIdFrom when pullrequest branch is updated 2014-04-29 17:24:51 +09:00
takezoe
2fe6b8c1e7 Fix TestCase 2014-04-29 17:02:16 +09:00
takezoe
b0360db105 Merge branch 'master' of https://github.com/takezoe/gitbucket 2014-04-29 15:44:58 +09:00
takezoe
0f9c95c15a baseUrl calculation is concentrated to SystemSettings 2014-04-29 15:43:41 +09:00
shimamoto
8efd1da7e6 Merge branch 'fileupload' 2014-04-29 14:42:25 +09:00
shimamoto
52ebba43d5 (refs #12) Modified the response status when the file does not exist. 2014-04-29 13:54:06 +09:00
takezoe
257c5aef51 Merge branch 'ace-editor' 2014-04-29 02:43:01 +09:00
takezoe
779df30ec8 Fix #355 2014-04-29 02:03:28 +09:00
takezoe
7da2c650d2 (refs #13)Bug fix 2014-04-28 01:33:13 +09:00
shimamoto
27fa9df2ee (refs #12) Implemented the process of saving image. 2014-04-27 21:08:31 +09:00
shimamoto
63c4e12259 (refs #12) Change the Markdown notation of images. 2014-04-27 19:11:14 +09:00
shimamoto
1f66670819 (refs #12) Implemented the upload area in preview.hrml. 2014-04-27 16:59:54 +09:00
takezoe
a97edb7ef5 (refs #13)File editing (add, edit and delete) in repository viewer is available. 2014-04-27 02:02:36 +09:00
Yasuhito Suganuma
7a1c872861 Fix #308 2014-04-25 23:49:17 +09:00
Naoki Takezoe
0e5591017a Refactoring 2014-04-25 10:38:34 +09:00
Naoki Takezoe
ad244adbfa (refs #13)Commit from AceEditor is available. 2014-04-24 21:49:30 +09:00
takezoe
3721b328a6 (refs #13)Implementing file editing on the repository viewer 2014-04-24 07:42:00 +09:00
takezoe
dd688f48b7 (refs #13)Implementing file editing on the repository viewer 2014-04-24 02:19:29 +09:00
shimamoto
296a0b2124 Removed FileUploadControllerBase(in the middle of improving file 
upload).
 2014-04-23 02:02:19 +09:00
takezoe
b9cc46e5ef (refs #13)Trying to embed ace editor into repository viewer. 2014-04-22 07:24:50 +09:00
Naoki Takezoe
375211fc30 Remove unused code 2014-04-21 16:04:25 +09:00
Naoki Takezoe
6760ff34ef Adjust avatar icon style 2014-04-18 10:49:48 +09:00
takezoe
82ef5457b0 Merge branch 'master' of https://github.com/takezoe/gitbucket 2014-04-18 07:54:10 +09:00
takezoe
d558476cd2 (refs #327)Fix baseURL and host in Context 2014-04-18 07:53:09 +09:00
takezoe
644701d995 (refs #327)Add atom feed of the specified user 2014-04-18 07:23:52 +09:00
takezoe
b60e2c07c7 (refs #327)Move feed.scala.xml to helper package because it breaks compilation by overriding xml package 2014-04-18 07:04:31 +09:00
takezoe
86f0307633 Merge branch 'feedactivities' of https://github.com/kaakaa/gitbucket into kaakaa-feedactivities 2014-04-18 06:44:27 +09:00
Naoki Takezoe
1db891a771 (refs #345)Fix an error for users who are authenticated with mail address through LDAP in push over HTTP. 2014-04-15 19:26:09 +09:00
Naoki Takezoe
e0f1658120 Use retro as default Gravator image 2014-04-11 12:12:24 +09:00
Naoki Takezoe
da105b7180 Merge remote-tracking branch 'origin/master' 2014-04-11 11:58:51 +09:00
Naoki Takezoe
9c4f7cc530 Fix message for empty repository 2014-04-11 11:57:16 +09:00
takezoe
d7eef8bd25 (refs #343)Add drop COMMIT_LOG table statement in migration for 1.13 2014-04-11 07:40:07 +09:00
Tomofumi Tanaka
7b7c0e1eee Fix getAllcommitIds bug in empty repository 2014-04-11 01:35:31 +09:00
Naoki Takezoe
2ae7798591 (refs #343)Apply fix to ssh pushing also 2014-04-10 17:55:58 +09:00
Naoki Takezoe
3f76453f34 (refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table 2014-04-10 17:42:25 +09:00
Naoki Takezoe
8fbbe7f31e (refs #337)Fix JavaScript not found problem in JBoss/WildFly 2014-04-10 11:25:39 +09:00
takezoe
92a43b4f99 Merge branch 'remove-asciidoc' 2014-04-10 07:44:02 +09:00