2
0
Commit Graph

2146 Commits

Author SHA1 Message Date
Unknwon
8aec9956c1 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 23:34:05 -05:00
无闻
dfc134d827 Merge pull request #961 from phsmit/access_removecoll
Remove collaborators when removing and transferring repository
2015-02-22 23:33:13 -05:00
Unknwon
df64dcfdfd Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 22:55:35 -05:00
Unknwon
5a7bca797c 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
a8b07e6688 Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-22 18:24:52 -05:00
Unknwon
f6e65b5e06 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
无闻
b72708ad0b Merge pull request #978 from albang/dev
[docker] openssh-client provide ssh-keygen.
2015-02-22 17:59:12 -05:00
Alban Garrigue
c4c87d6f6b 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
3b9771c4c0 Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-22 09:49:28 -05:00
Unknwon
51da9e41f0 routers: able to migrate repo from local path
- modules/middleware/context.go: add HandleAPI method
2015-02-22 09:49:25 -05:00
无闻
f6ca7e29ee Merge pull request #977 from albang/dev
$DIRECTORY variable is never set
2015-02-22 07:13:06 -05:00
Alban Garrigue
608af76d6a $DIRECTORY variable is never set 2015-02-22 13:06:46 +01:00
Unknwon
82766e2c19 templates/org/home.tmpl: fix org member can't see public repo 2015-02-22 03:07:04 -05:00
Unknwon
9885739046 reword 2015-02-22 00:12:55 -05:00
Unknwon
c16693e217 modules/git: able to parse RFC1123Z date format #663 2015-02-21 23:37:32 -05:00
Unknwon
9356bd502c Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-21 22:13:50 -05:00
Unknwon
700626f527 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
无闻
1d533bde7a 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
a868ff0436 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
无闻
3a2df08119 Merge pull request #959 from phsmit/access_update
Updating context and fixing permission issues
2015-02-21 02:55:30 -05:00
无闻
38ab4a9e07 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
95b1c32f95 add error for hello func 2015-02-20 10:12:27 +03:00
无闻
9dd77e98c6 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
842aafe4cc js fix R1-L1 highlight 2015-02-19 11:08:47 +03:00
Gogs
187c114e53 Fix: 504 5.5.2 <localhost>: Helo command rejected 2015-02-19 10:47:05 +03:00
Alexey Makhov
0d33a62765 fix typo mistake 2015-02-19 10:19:10 +03:00
无闻
26ee8998e3 Merge pull request #970 from makhov/the-new-new-highlighting
The new new highlighting
2015-02-18 21:55:57 -05:00
Alexey Makhov
642b2e74a8 remove not using vars 2015-02-19 00:55:17 +03:00
Alexey Makhov
dabc9f4991 gitlab-like hash naming 2015-02-19 00:52:22 +03:00
无闻
cf8ab3b701 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
ce7e96765e Merge branch 'dev' of https://github.com/gogits/gogs into dev 2015-02-18 11:12:41 +01:00
Stefan-Code
83a8ad573b changed repo-clone-url behaviour for bare repo 2015-02-18 08:22:13 +01:00
Stefan-Code
208c1c0255 added less compile script 2015-02-18 07:20:06 +01:00
无闻
e507ef770f Merge pull request #962 from phsmit/dont_mention_php
Remove the "PHP" style formatting function
2015-02-17 23:19:25 -05:00
无闻
5159867f76 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
无闻
3c75627663 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
2bb8323ab5 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
327d3cd26f 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
0d601634fb Remove collaborators when removing and transferring repository 2015-02-16 13:34:42 +02:00
Peter Smit
16bfbe24e7 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
21da931939 Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Unknwon
063eb88384 update travis.yml 2015-02-16 02:51:39 -05:00
Unknwon
32ff782d64 modules/setting: add abs path check before add workdir prefix 2015-02-14 17:49:33 -05:00
无闻
8eb5243aee 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
8414dd270e models: fix XORM API break
cmd/web.go: check version after load config
2015-02-14 17:01:33 -05:00
Benjamin Pollack
dbe4cd4b93 Fix a bunch of small typos and formatting quirks 2015-02-14 15:32:56 -05:00
Unknwon
b1281b34af 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
无闻
f4dcadb5f1 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
234fba2c09 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Unknwon
9d3aebbf52 conf/locale: update all locales 2015-02-13 15:48:10 -05:00