Shiloh/githaven
Shiloh/githaven
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,150 Commits 1 Branch 0 Tags
Commit Graph

3150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stefan-Code
6e341e26b3 added less compile script 2015-02-18 07:20:06 +01:00
无闻
a307574fbc Merge pull request #962 from phsmit/dont_mention_php 
Remove the "PHP" style formatting function
 2015-02-17 23:19:25 -05:00
无闻
58e28e5d9d Merge pull request #958 from phsmit/fix_mirror_access 
Make sure that a mirror can't be written to by http or ssh
 2015-02-17 23:09:53 -05:00
无闻
4e18bbf1cf Merge pull request #963 from phsmit/goget 
Remove GoGet option from repository and handle it with ?go-get=1 instead
 2015-02-17 16:18:26 -05:00
Peter Smit
e6fc58a744 Remove GoGet option from repository and handle it with ?go-get=1 instead 
The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
 2015-02-17 10:36:17 +02:00
Peter Smit
aa68e86206 Rewrite/simplify gogs serve 2015-02-16 16:38:01 +02:00
Peter Smit
7759b9ee6e Remove the "PHP" style formatting function 
The "PHP" formatting function doesn't add anything, except an undocumented date format.

All usages in the templates have been replaced with DateFmtShort and DateFmtLong for convenience.
 2015-02-16 14:44:27 +02:00
Peter Smit
b6519f78c7 Remove collaborators when removing and transferring repository 2015-02-16 13:34:42 +02:00
Peter Smit
455fad0fbd Fix that owners also see actions on their repositories 
This is a balance between speed and nice code, where speed has won. To prevent a repository query for each action the ownername is match with the current user.

It would be "cleaner" or "better" if we fetch the repository each time. Another option is to add the RepoOwnerID to action
 2015-02-16 13:16:24 +02:00
Peter Smit
ed89b39984 Updating context and fixing permission issues 
The boolean flags in the repo context have been replaced with mode and two methods

Also, the permissions have been brought more in line with https://help.github.com/articles/permission-levels-for-an-organization-repository/ , Admin Team members are able to change settings of their repositories.
 2015-02-16 12:51:56 +02:00
Peter Smit
f9454cc32c Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Unknwon
d85366930c update travis.yml 2015-02-16 02:51:39 -05:00
Unknwon
f625665d8d modules/setting: add abs path check before add workdir prefix 2015-02-14 17:49:33 -05:00
无闻
d047811c1a Merge pull request #956 from bpollack/docfix 
Fix a bunch of small typos and formatting quirks
 2015-02-14 17:07:38 -05:00
Unknwon
685ed1f807 models: fix XORM API break 
cmd/web.go: check version after load config
 2015-02-14 17:01:33 -05:00
Benjamin Pollack
8c1986181d Fix a bunch of small typos and formatting quirks 2015-02-14 15:32:56 -05:00
Unknwon
a38e4a0b02 routers/install.go: able to keep previous custom settings for 2nd time install 
- .gopmfile: update all commits
 2015-02-13 16:48:23 -05:00
无闻
cd6a2b78a7 Merge pull request #951 from phsmit/fix_team_update 
Fix access for team mode update
 2015-02-13 16:25:18 -05:00
Peter Smit
0009a1d2b1 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Unknwon
def39d191b conf/locale: update all locales 2015-02-13 15:48:10 -05:00