Commit graph

2720 commits

Author SHA1 Message Date
Unknwon
a6a2f59d1d Merge branch 'access' of github.com:gogits/gogs into dev 2015-02-28 22:25:10 -05:00
Unknwon
d446be9f5f models: mirror fix on #964 2015-02-28 22:24:53 -05:00
无闻
8d17ff8ce7 Merge pull request #964 from phsmit/access_rewriteserv
Rewrite/simplify gogs serve
2015-02-28 21:57:58 -05:00
Unknwon
b0b11fd7b1 Merge branch 'access' of github.com:gogits/gogs into dev 2015-02-28 21:50:29 -05:00
Unknwon
f44204e944 REAMDE: update 2015-02-28 21:50:04 -05:00
Unknwon
473e265727 models: done testing on new access system 2015-02-28 21:44:09 -05:00
无闻
3a6ba39a61 Merge pull request #992 from theangryangel/fix/ldap-auth
Attempt 3 to fix LDAP login issues when git pushing after password change
2015-02-28 06:57:43 -05:00
Unknwon
0d90a16d9f conf/locale: update Russian and Spanish 2015-02-28 06:45:08 -05:00
Gogs
fab038b175 Attempt #3 of ldap fixes 2015-02-27 13:18:29 +00:00
Unknwon
e3dece1371 modules/setting: simple behave change in startup 2015-02-26 19:45:38 -05:00
无闻
d5de48df89 Merge pull request #982 from nicolai86/bugfix/label-num_issues-2nd
Properly calculate the number of open issues per label
2015-02-24 12:33:18 -05:00
Unknwon
8896c82d34 models: fix issue with transfer repository
README: fix typo
2015-02-24 00:27:22 -05:00
Raphael Randschau
1f61340fa3 Properly calculate the number of open issues per label 2015-02-23 21:26:24 +01:00
无闻
f92bfabf86 Merge pull request #960 from phsmit/access_action
Fix that owners also see actions on their repositories
2015-02-23 13:51:02 -05:00
无闻
cd8b43d984 Merge pull request #915 from Lafriks/dev
Get username, name, surname and e-mail from LDAP server
2015-02-23 13:41:29 -05:00
Peter Smit
556881964f Merge branch 'access' into access_rewriteserv 2015-02-23 12:34:41 +02:00
Unknwon
ee68a826a5 v4 migration, merge 'dev', clean code and mirror fix 2015-02-23 02:15:53 -05:00
Unknwon
e90f014e4a Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 23:34:05 -05:00
无闻
125fe92a19 Merge pull request #961 from phsmit/access_removecoll
Remove collaborators when removing and transferring repository
2015-02-22 23:33:13 -05:00
Unknwon
10e4b5b6c6 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 22:55:35 -05:00
Unknwon
7ccab9cd09 Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
2015-02-22 22:51:25 -05:00
Unknwon
2369881808 Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-22 18:24:52 -05:00
Unknwon
04164eada3 models: able to rename user with diff letter cases #981
- templates/org: mirror fix on name output
- routers: add missing error check
2015-02-22 18:24:49 -05:00
无闻
e97a6ff911 Merge pull request #978 from albang/dev
[docker] openssh-client provide ssh-keygen.
2015-02-22 17:59:12 -05:00
Alban Garrigue
7d109573cb openssh-client provide ssh-keygen. GOGS needs that binary to add a ssh key to a user 2015-02-22 16:42:59 +01:00
Unknwon
74a8bb93d8 Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-22 09:49:28 -05:00
Unknwon
059338139c routers: able to migrate repo from local path
- modules/middleware/context.go: add HandleAPI method
2015-02-22 09:49:25 -05:00
无闻
aa670ce660 Merge pull request #977 from albang/dev
$DIRECTORY variable is never set
2015-02-22 07:13:06 -05:00
Alban Garrigue
81fcc0db0c $DIRECTORY variable is never set 2015-02-22 13:06:46 +01:00
Unknwon
c753fdceaf templates/org/home.tmpl: fix org member can't see public repo 2015-02-22 03:07:04 -05:00
Unknwon
a6a99d49cf reword 2015-02-22 00:12:55 -05:00
Unknwon
9dfa17faf2 modules/git: able to parse RFC1123Z date format #663 2015-02-21 23:37:32 -05:00
Unknwon
3fcc39c26b Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-21 22:13:50 -05:00
Unknwon
1654e9ecab templates/user/settings/emial.tmpl: little fix on UI
- routers/user: little code format
- conf/locale: update French locale
2015-02-21 22:13:47 -05:00
无闻
bbee7b7196 Merge pull request #975 from nicolai86/bugfix/label-num_issues
Bugfix for wrong label count
2015-02-21 03:42:24 -05:00
Raphael Randschau
4f567edc6e Fix #933
Not sure why, but xorm ignores the num_issues and num_closed_issues
columns when updating, even though the values changed.

Listing them explicitly fixes the issue with the wrong issue counts
2015-02-21 09:37:48 +01:00
无闻
fc4dff1b17 Merge pull request #959 from phsmit/access_update
Updating context and fixing permission issues
2015-02-21 02:55:30 -05:00
无闻
065f8d1f56 Merge pull request #973 from uchti/dev
Fix: 504 5.5.2 <localhost>: Helo command rejected
2015-02-20 18:25:18 -05:00
Gogs
2f1369c614 add error for hello func 2015-02-20 10:12:27 +03:00
无闻
8f1d2d9f24 Merge pull request #972 from makhov/the-new-new-highlighting
fix typo mistake in highlighting
2015-02-19 19:33:25 -05:00
Alexey Makhov
3efe3f42e8 js fix R1-L1 highlight 2015-02-19 11:08:47 +03:00
Gogs
5293ae1221 Fix: 504 5.5.2 <localhost>: Helo command rejected 2015-02-19 10:47:05 +03:00
Alexey Makhov
d2f439a241 fix typo mistake 2015-02-19 10:19:10 +03:00
无闻
77ac1e6ff6 Merge pull request #970 from makhov/the-new-new-highlighting
The new new highlighting
2015-02-18 21:55:57 -05:00
Alexey Makhov
c0ad512398 remove not using vars 2015-02-19 00:55:17 +03:00
Alexey Makhov
563e8b4ea9 gitlab-like hash naming 2015-02-19 00:52:22 +03:00
无闻
be19fe48d7 Merge pull request #968 from Stefan-Code/dev
Changed repo-clone url behavior on bare repo page, added LESS compile script
2015-02-18 05:33:58 -05:00
Stefan-Code
b508fb041f Merge branch 'dev' of https://github.com/gogits/gogs into dev 2015-02-18 11:12:41 +01:00
Stefan-Code
1628ef4ba5 changed repo-clone-url behaviour for bare repo 2015-02-18 08:22:13 +01:00
Peter Smit
0fa209d07b Update/simplify fix that owners also see actions on their repositories 2015-02-18 08:59:22 +02:00