Peter Smit
03af37554e
Merge branch 'dev' into newcollaboration
2015-02-05 11:08:10 +02:00
Alexey Makhov
01cef678a3
new lines highlighting format
2015-02-05 10:49:04 +03:00
无闻
02c5bade0f
Merge pull request #892 from EtienneBruines/commit_reference
...
Referencing issues from commit messages is now possible.
2015-02-04 23:21:20 -05:00
Unknwon
f706102890
models: sanitize user full name when update settings
2015-02-04 20:04:01 -05:00
Unknwon
7140f50637
public/ng/js: script fix on #901
2015-02-04 19:52:31 -05:00
Unknwon
e0329c0eb5
Merge branch 'dev' of github.com:gogits/gogs into dev
2015-02-04 19:14:13 -05:00
Unknwon
4dfffee9fb
cmd: update csrf version requirement
2015-02-04 19:14:09 -05:00
无闻
3e307e7862
Merge pull request #901 from makhov/fix-diff-view
...
fix lines highlighting at diff view
2015-02-04 19:13:40 -05:00
Alexey Makhov
e91b28eb9b
little fix
2015-02-04 22:06:40 +03:00
Alexey Makhov
5d4425bbbc
add multifile support to diff view highlighting
2015-02-04 21:54:45 +03:00
Peter Smit
fd1df86c44
Fix dashboard issue after collaboration migration
2015-02-04 16:08:55 +02:00
Peter Smit
bef38d9d3f
Fix collaboration migration code
2015-02-04 16:03:39 +02:00
Alexey Makhov
7f71fe9dae
fix diff lines highlighting
2015-02-04 12:41:35 +03:00
Unknwon
5589445557
scripts: remove confuse scripts
2015-02-04 12:36:40 +03:00
Unknwon
98f7f6bef8
scripts: remove confuse scripts
2015-02-03 12:42:34 -05:00
无闻
43bf94e1aa
Merge pull request #897 from makhov/makhov/fix-admin-config
...
fix error at admin/config
2015-02-03 12:21:50 -05:00
Alexey Makhov
a7662f4a39
fix error at admin/config
2015-02-03 17:26:56 +03:00
Unknwon
8e238058b2
public/ng/css: code fix on #895
...
- templates/user/settings: fix email panel nav highlight
2015-02-03 06:54:29 -05:00
Unknwon
26bccef297
Merge branch 'master' of github.com:gogits/gogs into dev
2015-02-03 06:51:44 -05:00
无闻
e8b62e8957
Merge pull request #895 from makhov/makhov/fix-settings-email-html
...
fix settings/email html&css
2015-02-03 06:50:57 -05:00
Alexey Makhov
32fb5ea5d0
fix settings/email html&css in less
2015-02-03 11:05:13 +03:00
Alexey Makhov
e43bd15b96
fix settings/email html&css
2015-02-03 10:32:55 +03:00
Unknwon
4de0b19cec
models: mirro code fix for #821
2015-02-02 23:42:53 -05:00
无闻
902f19f70b
Merge pull request #821 from phsmit/fix_819
...
Fix #819 by fetching the repository from db before updating
2015-02-02 23:38:04 -05:00
Unknwon
bfce0def25
modules/base: fix README filename checker, fix #877
2015-02-02 23:04:36 -05:00
Etienne Bruines
5c4b85c029
Referencing issues from commit messages is now possible.
...
Code-wise: the fixing-part of the code now doesn't reference the issue any more, because this is done by the referencing-part of the code, which is called just before.
Fixes #462 , #668 , #732 .
2015-02-02 16:34:07 +01:00
Unknwon
57291d1e2a
conf/locale: update Japanese locale
2015-02-02 09:44:51 -05:00
Unknwon
956c59b282
conf/locale: update Japanese locale
2015-02-02 07:33:24 -05:00
Unknwon
0a2068d7fb
models: code fix on #818
2015-02-01 17:21:56 -05:00
无闻
cd6376f093
Merge pull request #818 from fzerorubigd/master
...
add a function to rewrite all public keys on admin request
2015-02-01 16:56:34 -05:00
无闻
d4fc8880eb
Merge pull request #889 from mgdelacroix/patch-1
...
Add Miguel de la Cruz as a translator
2015-02-01 16:48:48 -05:00
Miguel de la Cruz
b8425ccbec
Add Miguel de la Cruz as a translator
2015-02-01 22:47:58 +01:00
Unknwon
7ec42465a7
Merge branch 'dev' of github.com:gogits/gogs into dev
2015-02-01 14:40:05 -05:00
Unknwon
89ea3e1acc
routers: save partial config when install
2015-02-01 14:39:58 -05:00
无闻
facd491a6d
Merge pull request #888 from tstorch/docker_hp_update
...
correction: updated docker link
2015-02-01 14:38:36 -05:00
Tristan Storch
4c4488213a
correction: updated docker link
2015-02-01 20:30:22 +01:00
Unknwon
ac29dc93cd
conf/locale: add Japanese support
...
README: remove duplicated travis badge
2015-02-01 13:36:40 -05:00
Unknwon
27bd2157ed
update travis.yml and add badge
2015-02-01 12:44:10 -05:00
Unknwon
b293b6eaa6
cmd: CMD option for port number of gogs web to prevent first time run conflict
...
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
2015-02-01 12:41:03 -05:00
Unknwon
3d9cda2d98
public/ng: fix auto-completion #832
2015-02-01 08:46:53 -05:00
Unknwon
faddaff90d
templates: fix commit message render issue #828
2015-01-31 15:31:09 -05:00
Unknwon
569fcc30f3
Merge branch 'dev' of github.com:gogits/gogs into dev
2015-01-31 15:28:05 -05:00
Unknwon
32152d2363
routers/repo: set raw page content type to 'text/plain' #828
2015-01-31 15:27:57 -05:00
无闻
69d98e9edd
Merge pull request #885 from clinta/dev
...
Add a freebsd init script.
2015-01-30 23:00:51 -05:00
Clint Armstrong
66a9c0d71d
Rename scripts/rc/freebsd/gogs to scripts/init/freebsd/gogs
2015-01-30 22:52:57 -05:00
Clint Armstrong
7e3d66673d
Add freebsd rc script
2015-01-30 22:51:38 -05:00
Unknwon
fb9dcfa921
modules/midlleware: little auth code fix, #777
2015-01-30 20:30:42 -05:00
Unknwon
d8394bb2e0
modules/midlleware: little auth code fix
2015-01-30 20:30:07 -05:00
Unknwon
ee6786216a
modules/base: clean code with #838
2015-01-30 18:12:30 -05:00
Unknwon
37fcc8daf2
modules/base: add RenderCommitMessage with XSS-safe and special links
...
- update russian locale
2015-01-30 18:05:20 -05:00
