nazoking
d8d18ed25c
Merge branch 'master' into feature/blame
...
Conflicts:
src/main/scala/gitbucket/core/util/JGitUtil.scala
2015-03-28 21:19:40 +09:00
Naoki Takezoe
7375ff9f97
(refs #677 )Fix Fork button for non group users
2015-03-28 17:01:41 +09:00
nazoking
83fd2648f5
follow rename
2015-03-27 21:19:02 +09:00
nazoking
8e81758941
fix link
2015-03-27 21:06:12 +09:00
nazoking
41a6a29771
fix for ie 7,8,9
2015-03-27 21:03:41 +09:00
nazoking
9a8479ee58
fix #679 jquery-hashchange-plugin for jquery 1.9
2015-03-27 16:11:39 +09:00
Naoki Takezoe
73766f11eb
(refs #664 )Normalize line separator and empty line
2015-03-25 20:56:17 +09:00
Naoki Takezoe
a22878e2c5
(refs #671 )Use servletPath instead of requestURI
2015-03-25 19:47:13 +09:00
nazoking
277ace3c8e
fix for ie 5
2015-03-25 10:21:40 +09:00
nazoking
40f376dbd9
fix for ie 7
2015-03-25 10:20:59 +09:00
nazoking
444af0935e
fix regression: blank diff output #672
2015-03-25 09:36:01 +09:00
Tomofumi Tanaka
c18702dcea
Merge remote-tracking branch 'origin/api-support'
2015-03-24 23:40:01 +09:00
Naoki Takezoe
fde4448dd0
Fix layout
2015-03-24 06:55:34 +09:00
Shintaro Murakami
d16ce90a3d
(refs #649 ) Fix condition of filtering issues from milestone view.
2015-03-24 00:54:49 +09:00
Naoki Takezoe
ccce499f7f
Merge pull request #655 from hho/patch-1
...
Fix font in line comments
2015-03-22 08:00:56 -07:00
Naoki Takezoe
9f11eaa4d3
Merge pull request #643 from team-lab/feature/diff-ignore-space
...
Improvement diff
2015-03-22 05:59:16 -07:00
Naoki Takezoe
7b85c0e55f
Merge pull request #656 from jparound30/feature_rename_detection
...
(refs #641 ) Enable rename detection
2015-03-22 02:23:31 -07:00
Tomofumi Tanaka
7e92f1abd5
Fix test code package name
2015-03-16 23:38:00 +09:00
Tomofumi Tanaka
825f2518e9
Rename migration sql
2015-03-16 23:23:59 +09:00
Tomofumi Tanaka
def1e877db
Move api package to new rule
2015-03-16 23:22:56 +09:00
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
nazoking
3d73e3922b
(api-support)fix typo
2015-03-16 00:14:52 +09:00
nazoking
224e44151f
(api-support)change crlf
2015-03-16 00:04:30 +09:00
Naoki Takezoe
d9c1293985
(refs #653 )Sort tags by date
2015-03-15 11:38:45 +09:00
jparound30
849a40d4b5
(refs #641 ) Enable rename detection
2015-03-15 09:37:56 +09:00
Henning Hoefer
177387e9b0
Fix font in line comments
...
Line comments on a diff were rendered in the browsers default font
2015-03-13 15:04:06 +01:00
Naoki Takezoe
cacce54714
(refs #644 )Fix authentication for Git access via HTTP
2015-03-13 01:58:04 +09:00
Naoki Takezoe
12082322ee
(refs #646 )Add autocomplete="true" to password field
2015-03-10 11:34:02 +09:00
Naoki Takezoe
7e0a5b7fec
(refs #645 )Fix disableByNotYourSelf validation
2015-03-10 11:31:17 +09:00
nazoking
d2cf4afc81
add diff stat bar
2015-03-10 00:54:57 +09:00
nazoking
3e0a50926f
resolve gravatar on blame
2015-03-09 23:42:04 +09:00
Naoki Takezoe
cce62de075
(refs #642 )Fix markdown rendering style
2015-03-09 19:18:38 +09:00
Antoine GIRARD
dff816324d
Rebase + Remove all unused image
2015-03-08 17:15:48 +01:00
nazoking
d9450df7e9
more github like style
2015-03-08 21:35:46 +09:00
nazoking
41fc81fab6
add filename for syntax highlight hint
2015-03-08 21:35:39 +09:00
nazoking
aa35498bdd
Implements ignore-whitespace and hilight-syntax on diff.
...
Improvement experience speed
* lazy diff rendering ( it is effective if tha diff has a lot of files ).
* some feature implemented by javascript, to implement by css.
* some javascript event handlers on each elements move to on parent elements.
2015-03-08 19:49:20 +09:00
Antoine GIRARD
a33e2c6e36
Completely moved to octicon
2015-03-04 23:46:46 +01:00
Antoine GIRARD
75ef82d18a
...
2015-03-04 23:46:46 +01:00
Antoine GIRARD
eb3c522122
Moved to octicon
2015-03-04 23:41:26 +01:00
Antoine GIRARD
6c8bcfc62e
Import of octicons
2015-03-04 23:10:55 +01:00
Rodrigo Lazoti
7390e21934
fix javascript getter for plug-in system
2015-03-03 18:07:25 -03:00
nazoking
e408eb43bb
fix parent. only path exists
2015-03-04 03:37:46 +09:00
nazoking
dc0aa0851e
implove source-line-num performance.
...
and Stop scroll when click line number.
2015-03-04 03:14:22 +09:00
nazoking
51d7c43489
add blame
2015-03-04 01:52:07 +09:00
Naoki Takezoe
6b37967162
Add Version 3.0 to versions
2015-03-03 14:05:13 +09:00
Naoki Takezoe
e6f30ef86b
Fix Profile structure
2015-03-03 10:36:14 +09:00
takezoe
9e67999ef0
Temporary fix instantiation error
2015-03-03 02:42:35 +09:00
takezoe
be75cef752
Fix testcase
2015-03-03 02:38:59 +09:00
Naoki Takezoe
7ebe1d6c62
Merge branch 'master' into profile_generalization
2015-03-02 22:21:00 +09:00
Naoki Takezoe
d495b04d85
Change package name
2015-03-02 22:15:56 +09:00
