Commit graph

1954 commits

Author SHA1 Message Date
Unknwon
452cca35e0 Merge branch 'encoding' of github.com:gogits/gogs into dev
Conflicts:
	.gopmfile
2015-01-17 15:29:45 +08:00
Unknwon
7170011f4d update with deps 2015-01-17 15:17:53 +08:00
无闻
f99690a545 Merge pull request #861 from phsmit/change_chardet
Change chardet to gogits
2015-01-17 14:45:48 +08:00
无闻
bdd6aef746 Merge pull request #849 from gittex/translate
Translation update
2015-01-17 14:43:27 +08:00
Peter Smit
e6f97c78ff Change chardet to gogits 2015-01-15 12:40:16 +02:00
Dominik Schulz
50d91f3b6a Make help text for email listing a little more helpful. 2015-01-09 17:55:09 +01:00
Dominik Schulz
7d4cef6008 Add missing translations for email settings page to de_DE. 2015-01-09 17:54:44 +01:00
Unknwon
bb26285a12 fix #827 2015-01-06 17:14:49 +08:00
无闻
9e61ec316e Merge pull request #830 from TonyTsangHK/dev
Add max-width to commit message of repo-files-table
2015-01-05 20:45:06 +08:00
Unknwon
13e35398aa prepare for mirror update release 2015-01-05 20:37:22 +08:00
Tony Tsang
9f4e584122 Add max-width to commit message of repo-files-table 2015-01-05 12:22:20 +08:00
Unknwon
d5c6b53571 use new Redis client 2015-01-03 02:54:22 +08:00
Unknwon
f0ca16d78f add cache version require 2015-01-02 23:59:06 +08:00
无闻
9b0858b1ad Merge pull request #823 from phsmit/fix_799
Fix #799 by adding a tooltip for all dates in all settings/panels
2015-01-02 20:25:48 +08:00
Unknwon
c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Peter Smit
fd70f9ec1b Fix #799 by adding a tooltip for all dates in all settings/panels 2015-01-02 12:41:05 +02:00
Unknwon
0b56272c13 fix #805 2015-01-02 13:30:45 +08:00
Unknwon
677b1ec627 fix #808 2015-01-02 12:56:08 +08:00
Unknwon
3ea1443885 work on #784 2015-01-02 12:47:33 +08:00
Unknwon
b6272d1803 fix gopmfile 2014-12-31 21:54:25 +08:00
Unknwon
40de2f78c4 fix gopmfile 2014-12-31 18:41:34 +08:00
Unknwon
aa2148a7a9 fix gopmfile 2014-12-31 18:39:47 +08:00
Unknwon
bd555551ce fix #801 2014-12-31 18:37:29 +08:00
Unknwon
e1c5008238 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-12-31 17:09:07 +08:00
Unknwon
0f1ff9b1ad fix cache dep API broken 2014-12-31 17:08:57 +08:00
无闻
52cc58fd9d Merge pull request #797 from Mikayex/dev
Fix #795
2014-12-29 20:09:50 +08:00
无闻
477bea574a Merge pull request #782 from estetsenko/dev
fix for  #747
2014-12-29 20:08:39 +08:00
无闻
37566f71a9 Merge pull request #787 from andre-hub/dev
flexible the build scripts and add a freebsd build script
2014-12-29 20:07:10 +08:00
无闻
afdb0c7f9d Merge pull request #790 from euank/master
Initialize unset git user.email / user.name correctly; fix Dockerfile
2014-12-29 20:06:27 +08:00
Unknwon
63c1f9a23f fix 500: E-mail already used in user settings page 2014-12-29 20:00:07 +08:00
Thomas Laroche
e948c7c262 Fix #795 2014-12-29 11:55:46 +01:00
Unknwon
81a44e4cd0 fix API changes 2014-12-28 20:40:35 +08:00
euank
f059866a21 Set user.name & user.email in Dockerfile
The previous setting would cause all repo creations to fail, as
described in issue #328.
The previous commit also resolves this issue, but it seems saner to
create the user in the Dockerfile than at runtime.
2014-12-27 19:10:33 -08:00
euank
234a7c19a4 Default values for both user.name and user.email
The previous behavior was to set default values only if user.name was
not set, but to always set it for both. This only sets a value if there
wasn't one; this fixes cases where someone has a user.name but no
user.email (see included Dockerfile) or someone has a user.email but no
user.name (before the email would have been over-written).
2014-12-27 19:07:54 -08:00
André Grötschel
35dd41c3a2 merge flexible the build scripts and add a freebsd build script 2014-12-27 15:28:45 +01:00
André Grötschel
afc659442d flexiable the build scripts and add a freebsd build script 2014-12-27 15:16:05 +01:00
Unknwon
6a6636d451 Merge branch 'master' of github.com:gogits/gogs into dev 2014-12-27 12:38:18 +08:00
无闻
46742a79ca Merge pull request #785 from joshk/patch-1
Use the new build env on Travis
2014-12-27 12:25:08 +08:00
无闻
d61def86e1 Merge pull request #780 from morpheyesh/master
spellcheck
2014-12-27 12:24:21 +08:00
Josh Kalderimis
30c750a5df Use the new build env on Travis
http://docs.travis-ci.com/user/workers/container-based-infrastructure
2014-12-27 01:23:10 +01:00
estetsenko
bae1d65564 bugfix: Unable to assign any issue myself 2014-12-24 20:47:45 +03:00
morpheyesh
995a805a31 spellcheck 2014-12-24 13:20:10 +05:30
fuxiaohei
c0cfd62b90 add label-edit and label-delete logic 2014-12-22 21:26:05 +08:00
无闻
e193005c66 Merge pull request #773 from phsmit/golang_x_text_encoding
Golang x text encoding
2014-12-22 05:30:49 -05:00
Peter Smit
fff8109567 Removing redundant mahonia 2014-12-22 11:29:02 +02:00
Peter Smit
3af757ed77 Replace mahonia with the standard functions in the Golang Sub-repositories 2014-12-22 11:01:52 +02:00
Unknwon
ebbe6177a9 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-12-22 03:44:52 -05:00
Unknwon
97b39ae2e4 fix invite bug(shouldn't include full name to search box) 2014-12-22 03:44:49 -05:00
无闻
0f77ad219c Merge pull request #771 from phsmit/multiple_email_cleanup
Create English locale keys for multiple e-mails feature
2014-12-22 02:43:20 -05:00
Peter Smit
8b31be43c6 Forgot to i18n "Primary" 2014-12-22 09:41:29 +02:00