Commit graph

2613 commits

Author SHA1 Message Date
Unknwon
c76ee1cf83 Merge branch 'master' of github.com:gogits/gogs into develop
# Conflicts:
#	conf/locale/locale_de-DE.ini
#	conf/locale/locale_en-US.ini
#	conf/locale/locale_fr-FR.ini
#	conf/locale/locale_ja-JP.ini
#	conf/locale/locale_pl-PL.ini
#	conf/locale/locale_pt-BR.ini
#	conf/locale/locale_ru-RU.ini
#	conf/locale/locale_zh-CN.ini
#	conf/locale/locale_zh-HK.ini
2015-07-03 13:41:48 +08:00
Linquize
08f7547acf Update build.sh for Windows 2015-06-29 22:33:42 +08:00
Matt Butcher
d82d9bc153 Fix minor spelling issues. 2015-06-18 05:01:05 -06:00
William Friesen
bfef8f0edd Fix command used by FreeBSD init script 2015-06-09 21:40:43 +10:00
stephen mcquay
73698d292a fix .keys route
This change fixes the output from /{{ username }}.keys so that it can work in
a ~/.ssh/authorized_keys file
2015-06-08 00:40:38 -07:00
Björn
6eecbf17cd fix debian init script
- use start-stop-daemon's chuid feature insted of su
  - using `su -c` breaks if the git user has no usable shell
  - this fixes #1025
- put --test before --exec, instead it gets passed to gogs
- set cwd via --chdir
2015-06-04 13:15:00 +02:00
Christian Dietrich
b36134194c settings/password: no minimal required characters for OldPassword
If users are added to gogs due a reverse proxy automatically, their password is
set to their initial username. If their username is shorter than 6 characters,
they can never set a password. But since this password is required for some
operations (e.g. repository deletion), they could not use all features of gogs
until now.
2015-06-03 15:46:37 +02:00
Thomas Keppler
27fe9cfcba Fix: "Port is blocked" issue
Fixed an issue where the post intall file for Debian enforced port 6000
which should have been port 3000 because it renders the software virtually unusable
because it's a blocked port in Firefox, Chrome and alikes.

For further reference see:
http://www-archive.mozilla.org/projects/netlib/PortBanning.html
2015-05-15 01:29:44 +02:00
Martin van Beurden
66d7adc3a8 fix systemd "Trailing garbage, ignoring." warning.
Environment should be a space-separated list instead of comma-separated.
No need for double quoting when the values don't contain spaces.
2015-05-09 20:24:33 +02:00
mrburns
5c63e1015d Add app sub url for color picker js lib inclusion
Currently, the js file doesn't take into account the possibility of a sub url being used (wich is my case :) wich prevents its inclusion.
2015-05-08 10:20:27 +02:00
James
f3aab5dbe3 Add full name field to admin's user edit page (fixes #1130) 2015-04-28 11:59:05 -04:00
Unknwon
c08baee085 Merge branch 'develop' of github.com:gogits/gogs into develop 2015-04-24 05:21:10 -04:00
Unknwon
7a7c096fd0 update typo in locale files 2015-04-24 05:21:00 -04:00
Lunny Xiao
f92bdf875b Merge pull request #1226 from nice-software/wip/pam
Add PAM authentication
2015-04-24 16:43:58 +08:00
Paolo Borelli
182003aa41 Add PAM authentication 2015-04-24 10:13:01 +02:00
Lunny Xiao
5de0b0c5ce Merge pull request #1183 from lukad/feature/remove-plenk
Remove extra space from ssh authentication message
2015-04-24 15:08:45 +08:00
Lunny Xiao
0647645948 Merge pull request #1187 from xaionaro/master
Fixed a typo: .ssh/autorized_key -> .ssh/authorized_key
2015-04-24 15:06:36 +08:00
Lunny Xiao
e378b3152c Merge pull request #1210 from acusti/patch-1
Wrap remember me text and checkbox in a label
2015-04-24 15:03:49 +08:00
Lunny Xiao
673a76d638 Merge pull request #1211 from mephux/hotfix/type-fix-ValidatePassword
Hotfix/type fix validate password
2015-04-24 15:03:21 +08:00
Lunny Xiao
67983e57f2 Merge pull request #1223 from Scarsz/patch-1
Fix typo
2015-04-24 15:01:21 +08:00
Scarsz
5300a63d0f Fix typo 2015-04-22 05:50:27 -07:00
Lunny Xiao
2c4fb6e646 Merge pull request #1218 from StrangeWill/blank-name-fix
Fixes issue with LDAP inserting users with blank names.
2015-04-20 14:06:48 +08:00
William Roush
8363c9dd0f Fixes issue with LDAP inserting users with blank names. 2015-04-20 01:51:43 -04:00
Lunny Xiao
3db0e7553e Merge pull request #1186 from dhuan/author-name-on-explore-page
Display author's name on explore page
2015-04-19 00:39:21 +08:00
Dhuan
80e640f082 Fix HTML indentation 2015-04-18 16:22:27 +00:00
Dhuan
51aef347ee Display author's name on explore page 2015-04-18 16:19:01 +00:00
Lunny Xiao
65a06731db Merge pull request #1216 from tony/ssh-config-options
SSH config options
2015-04-18 20:23:24 +08:00
Tony Narlock
6a0fec77ea Allow an SSHDomain configuration option. Defaults to Domain, preserves legacy behavior 2015-04-18 05:21:07 -05:00
Dustin Willis Webber
5a4f314cf7 fix calls that go rename missed 2015-04-16 14:42:24 -04:00
Dustin Willis Webber
e57594dc31 typo fix for comment 2015-04-16 14:40:39 -04:00
Dustin Willis Webber
f78046fc3b typo fix 2015-04-16 14:36:32 -04:00
Andrew Patton
3a3e1b90e7 Match naming convention on page (checkbox→chk) 2015-04-15 21:53:27 -04:00
Andrew Patton
b579800e50 💄 Style checkbox label in sign in form 2015-04-15 21:49:10 -04:00
Andrew Patton
072c67e457 Wrap remember text+checkbox in label; close #1209 2015-04-15 21:39:13 -04:00
Don Bowman
81e6173356 remove blackfriday.EXTENSION_HARD_LINE_BREAK from options. 2015-04-08 22:25:47 +00:00
Don Bowman
423b1c69be don't set mime type to text/plain. This will break serving e.g. raw images,
html, etc

According to http://golang.org/pkg/net/http/#DetectContentType
"If the Header does not contain a Content-Type line, Write adds
a Content-Type set to the result of passing the initial 512 bytes
of written data to DetectContentType."
2015-04-08 00:44:38 +00:00
Dmitry Yu Okunev
7b59d40f08 Fixed a typo: .ssh/autorized_key -> .ssh/authorized_key
Signed-off-by: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
2015-04-05 11:48:32 +03:00
Luka Dornhecker
1988c0993d remove extra space in ssh authentication message 2015-04-02 22:22:58 +02:00
无闻
639e34e362 Merge pull request #1177 from rauchrob/patch-1
fix typo in centos init script
2015-03-31 19:41:30 -04:00
Robert Rauch
7e5063a93d fix typo in centos init script
We should be *sourcing* `/etc/sysconfig/gogs`, not *executing* it, don't we?
2015-04-01 00:45:00 +02:00
无闻
9512eec034 Merge pull request #1167 from linquize/http401
Set Content-Type to text/plain for http status 401
2015-03-31 16:50:39 -04:00
Linquize
f26f8d5afa Set Content-Type to text/plain for http status 401
This is because git command line shows the failure reason only if Content-Type is text/plain.
2015-03-28 22:30:05 +08:00
Unknwon
9fb2d49b93 #1073 #1162 issue ID constraint failed 2015-03-27 06:47:02 -04:00
无闻
e0036ebb0c Merge pull request #1159 from davmrtl/develop
Fix "Plus" icon size in dashboard
2015-03-26 19:50:00 -04:00
David Martel
93ff2e31e8 Fix "Plus" icon size in dashboard (part 2) 2015-03-26 19:32:08 -04:00
Unknwon
698b9e2acc #1070 Clearer error message for illegal characters 2015-03-26 17:11:47 -04:00
Unknwon
d76f11c6f1 fix #1156 2015-03-26 11:00:22 -04:00
Unknwon
27dbb60965 update README and gopmfile 2015-03-26 09:39:47 -04:00
David Martel
44ea3d9065 Fix "Plus" icon size in dashboard 2015-03-25 22:21:21 -04:00
Unknwon
99b774e741 auto fix locale file name change 2015-03-25 19:51:22 -04:00