Commit graph

2329 commits

Author SHA1 Message Date
无闻
ccf17a6ecb Merge pull request #1355 from pkgr/pkgr
Fix build on packager.io, enable Debian 8 and CentOS / RHEL 7
2015-07-15 12:59:14 +08:00
无闻
41ce633920 Merge pull request #1364 from m4rcs/patch-1
Update TRANSLATORS
2015-07-15 12:57:30 +08:00
crohr
cbce2ec9cf Merge remote-tracking branch 'origin/master' into pkgr 2015-07-14 15:09:08 +00:00
Unknwon
ec774d48c5 Merge branch 'master' of github.com:gogits/gogs into develop 2015-07-14 22:56:27 +08:00
Unknwon
663c28beb6 #1279: Removing user from collaboration removes repositiory 2015-07-14 22:56:02 +08:00
Marc Schiller
f62ffeb481 Update TRANSLATORS 2015-07-14 15:51:12 +02:00
Unknwon
92783bf6ef fix .travis.yml 2015-07-14 19:55:28 +08:00
Unknwon
09def4a0b5 fix file 2015-07-14 19:51:30 +08:00
Unknwon
81adbe17ca use pam and update TRANSLATORS 2015-07-14 19:47:20 +08:00
Unknwon
2724dbd450 update locale 2015-07-14 18:35:38 +08:00
Unknwon
ced212f8fa fix hidden bug on tpl rendering 2015-07-10 17:26:50 +08:00
Unknwon
35be8741c4 fix #1112 2015-07-10 16:51:25 +08:00
Cyril Rohr
b8e9c60040 Add debian-8 and centos-7 2015-07-09 11:47:54 +00:00
Cyril Rohr
02bc16d392 Add libpam0g as dependency for packaging 2015-07-09 11:47:54 +00:00
Unknwon
eb0f0710f0 add more gitignores 2015-07-09 19:46:42 +08:00
Unknwon
a2a9e151f8 install - add mail from setting 2015-07-09 16:10:31 +08:00
Unknwon
b9dc2147b4 UI: install - done 2015-07-09 13:17:48 +08:00
Unknwon
b60fd3aaad Merge branch 'master' of github.com:gogits/gogs 2015-07-09 11:15:08 +08:00
Unknwon
3be3b8faa7 fix tmpl error 2015-07-09 11:14:48 +08:00
Unknwon
5cf3732339 UI: install - new version 2015-07-08 19:47:56 +08:00
Unknwon
5dd3dd71a0 UI: install - database settings 2015-07-08 01:09:03 +08:00
Unknwon
ffd17924fd update UI framework 2015-07-07 13:51:28 +08:00
Unknwon
9af8a6c6a3 update locale 2015-07-06 23:20:07 +08:00
Unknwon
1269ce0538 update locle 2015-07-06 17:47:30 +08:00
Unknwon
c6531c4882 check master as default branch when migrate 2015-07-05 18:34:16 +08:00
Unknwon
1564b77cf5 update locale 2015-07-05 13:16:28 +08:00
Unknwon
1492c905bb update locale 2015-07-04 18:31:16 +08:00
Unknwon
4fca548ed1 update locale 2015-07-03 14:39:36 +08:00
Unknwon
c47afdff58 add config options for HELO 2015-07-03 14:08:18 +08:00
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
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