Commit Graph

1182 Commits

Author SHA1 Message Date
Unknwon 04be8c0de5 #2554 reinitialize all repos from the db
- Update locales
2016-02-04 12:51:00 -05:00
Unknwon 1c74612b3c Minor fix for #2444 2016-02-01 20:55:12 -05:00
Unknwon 3abad75a1b Fix one user may block entire listen loop for builtin SSH 2016-02-01 12:10:49 -05:00
Unknwon 4848620594 #2229 adjust URL verbose depth for reverse proxy sub-path 2016-01-31 15:38:20 -05:00
Florian Kaiser 9cf95e4e37 Organization owners see all repositories & teams 2016-01-31 16:14:24 +00:00
Florian Kaiser 8c4588c4c9 Refactor .IsAdminTeam to .IsTeamAdmin and requireAdminTeam to requireTeamAdmin 2016-01-31 15:30:07 +00:00
Florian Kaiser e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Florian Kaiser abc5abce30 Allow modification of a release if Content is empty (fix #2516) 2016-01-30 13:39:02 +00:00
Unknwon 112a7cab31 #2497 incorrect error handle for team name 2016-01-29 17:06:14 -05:00
Unknwon a4a23c0268 Merge pull request #2508 from MilesPong/develop
Fixed gravatar url
2016-01-29 05:44:00 -05:00
miles@Oscar beefc53e59 Using https for gravatar 2016-01-29 13:06:17 +08:00
miles@Oscar 1becf01cfa Fixed gravatar url 2016-01-29 11:05:41 +08:00
Unknwon b900150b1d Update locales 2016-01-28 06:15:49 -05:00
Kim "BKC" Carlbäcker 1ab8a60d73 Not working, but slightly better... 2016-01-27 21:48:57 +01:00
Kim "BKC" Carlbäcker 3a9fd81f59 Custom URL-Schemas for Markdown 2016-01-27 02:02:03 +01:00
Unknwon e33ddac9bf Minor fix for #2396 2016-01-25 14:04:46 -05:00
Unknwon 71b9537393 Merge pull request #2396 from bkcsoft/feature/markdown-checklist
[Feature] Markdown Checklist-rendering
2016-01-25 13:56:13 -05:00
Unknwon b33abc6280 Merge pull request #2432 from nd/develop
Fix #2431 - handle requests waiting for reply
2016-01-25 13:16:32 -05:00
Unknwon 38efa72146 Update locales 2016-01-25 02:33:52 -05:00
Pourya Daneshvar 863ff19e1f Fixed forgotten err variable assignment 2016-01-24 10:24:21 +03:30
Dmitry Neverov fb99d50fa1 Fix #2431 - handle requests waiting for reply
According to the docs [1], the Reply method must be called for all
requests where WantReply is true. This fixes a hanging java ssh
implementation (jsch) which sets WantReply flag and waits for reply from
the server.

[1] https://godoc.org/golang.org/x/crypto/ssh#Request.Reply
2016-01-18 16:54:10 +01:00
Unknwon 7ef9a05588 #2179 use Go sub-repo ssh to verify public key content 2016-01-15 18:39:51 +08:00
Kim "BKC" Carlbäcker a1a4f1103c Made Sanitizer-setup cleaner 2016-01-14 03:00:05 +01:00
Kim "BKC" Carlbäcker 8e09e03127 Checklist-rendering implemented 2016-01-13 13:25:52 +01:00
Unknwon f43cc90841 #2287 Truncate repository name if too long 2016-01-11 20:41:43 +08:00
Unknwon a2ef9a2b64 update locale 2016-01-11 18:30:44 +08:00
Unknwon db719abff2 stop compile bindata for TRANSLATORS
- update required version of git-module for #2373
2016-01-11 15:01:38 +08:00
Unknwon cc8c67ff29 fix markdown autolink error 2016-01-09 10:59:04 +08:00
Unknwon ca35ddd078 fix #2350 2016-01-07 09:24:19 +08:00
zhuharev 0d5dc8a064 typo fix 2016-01-06 22:41:42 +03:00
Unknwon 0cb7396840 update locale 2016-01-06 18:44:57 +08:00
Kim "BKC" Carlbäcker 8fe5d887ae Changed name from inline to unified 2016-01-05 19:21:50 +01:00
Kim "BKC" Carlbäcker 4e6d048ba1 i18n-fix for split-view 2016-01-05 19:21:49 +01:00
Unknwon 7392b6a755 fix #2327 2016-01-05 12:43:19 +08:00
Unknwon 4993ab1a76 #2185 fall back to use custom chardet lib 2015-12-31 22:13:47 -05:00
Unknwon 44637f03cc #2282 fast detection of utf-8 2015-12-27 17:02:36 -05:00
Unknwon 93f03707a7 #2283 set text/plain for non-binary files in raw mode 2015-12-25 05:45:07 -05:00
Unknwon 85af36332b #2282 fix utf-8 recognized as windows-1252 2015-12-25 05:25:47 -05:00
Unknwon 13fe733037 #2264 use monospaced font for commit IDs in news feeds 2015-12-24 20:43:45 -05:00
Unknwon a49af93faf #1692 APIs: Users Followers
- User profile un/follow
- List user's followers/following
2015-12-21 04:24:11 -08:00
Unknwon c62a6b7a12 #2014 allow switch branches between two orgs in compose PR 2015-12-20 01:06:54 -05:00
Unknwon 53eb37d529 fix #1436 2015-12-19 21:43:32 -05:00
Unknwon 2d3ecbe5b2 make mailer log more verbose 2015-12-19 02:44:34 -05:00
Unknwon 09c981846b update locales 2015-12-18 07:54:44 -05:00
Unknwon 037a01c4e4 fix #2189 2015-12-18 05:49:28 -05:00
Unknwon 1d95844d55 prepare release 2015-12-18 00:54:27 -05:00
Unknwon 1e7e092992 #2103 Ability to map extensions for syntax highlighting in config 2015-12-17 22:31:34 -05:00
Unknwon 9cd16c5b12 #1692 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon 6673dcb038 #2103 #2181 improvments of highlight class name 2015-12-16 22:13:12 -05:00
Unknwon b117befc2b #1692 add user email APIs 2015-12-15 22:57:18 -05:00
Unknwon 8ecbf0f16d fix #2204 2015-12-15 19:42:20 -05:00
Unknwon 19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon ea375c0dcc new template func 2015-12-13 23:16:58 -05:00
Unknwon acdb4d8bdd Drop Go 1.3 support 2015-12-13 20:20:52 -05:00
Unknwon 95f9c85bcc #2185 use Go sub-repo to detect encoding 2015-12-13 19:56:33 -05:00
Bruno 9a27e5ccdc ignore invalid env 2015-12-13 20:17:47 +08:00
Unknwon 7e88420bc6 #2161 fix wrong regexp 2015-12-12 16:13:18 -05:00
Unknwon 5911fc3512 #2161 No issue linking in commits when issue number in brackets 2015-12-12 16:01:54 -05:00
Unknwon e444a67d59 update locales 2015-12-12 14:47:11 -05:00
Unknwon 59c965a5ec #2156 admin able to edit organization max repo creation 2015-12-11 19:24:57 -05:00
Unknwon 477b4d3b50 #2154 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon d0b0d24f22 #2154 disable change user for non-local users
- #2153 remove require for gravatar
2015-12-11 15:31:02 -05:00
Unknwon 98da7241a0 fix sqlite3 cannot create repo 2015-12-11 10:13:19 -05:00
Unknwon 40f3142264 #2114 External URL for wiki 2015-12-11 04:55:08 -05:00
Unknwon 3d5d61778a #1938 #1374 disable password change for non-local users 2015-12-10 19:02:57 -05:00
Unknwon df5ed64cca #1301 "read-only" users 2015-12-10 12:46:05 -05:00
Unknwon 2a0bb1fa90 #1575 Limit repo creation 2015-12-10 12:37:53 -05:00
Unknwon c6083c335e #1612 Ability to send mail when a new pull request is submitted 2015-12-10 11:18:56 -05:00
Unknwon 9a2e43bff2 move out git module and #1573 send push hook 2015-12-09 20:46:05 -05:00
Unknwon bd5dc626e8 Merge pull request #2139 from angus-g/fixes/pr-messages
Reword messages for PR auto merging (#2117)
2015-12-09 17:31:46 -05:00
Angus Gibson 626dc1f0bd Reword messages for PR auto merging (#2117) 2015-12-10 09:28:49 +11:00
Adam Strzelecki b886fb4bf0 LOCAL_ROOT_URL for workers accessing web service
Local (DMZ) URL for gogs workers (such as ssh update) accessing web service. In
most cases you do not need to change default http://localhost:HTTP_PORT/. You
may need to alter it only if your ssh server node is not the same as http node,
eg. running behind proxy on different node than web server.

                     --- 80 public port -> 8080 -- web server node
                    /
    public proxy --<
                    \
                     --- 22 public port -> 10022 -- ssh server node

This option is not intended to be accessible via web GUI settings, since it is
unlikely someone needs to change it to somethings else than default
http://localhost:HTTP_PORT/ which should work for most of the cases.

But this should land into the documentation somewhere.

fixup
2015-12-09 23:11:07 +01:00
Unknwon 718d3ae258 #1943 Able to config fsck timeout 2015-12-09 11:38:12 -05:00
Unknwon b8d48bdb62 #2037 Add "New Mirror" button on Dashboard 2015-12-09 11:24:56 -05:00
Unknwon a576224d0e unified name: IsViewBranch, IsViewCommit and IsViewTag 2015-12-09 00:32:53 -05:00
Angus Gibson 06d293a84e Only show comparison link for >2 commits #1110
We can look at the PushCommits object to see how many commits were
included in a commit, and add some template logic to only show the
comparison link when there are at least 2 commits in a push. We also
correct the link to display the number of commits.
2015-12-09 14:36:39 +11:00
Unknwon 120cd4e471 #1984 Better mirror repo management 2015-12-08 20:06:12 -05:00
Unknwon 1cbd4c01fb #2115 more precise error message 2015-12-08 01:11:40 -05:00
Adam Strzelecki 3df5dcc1dc Allow pre-receive hook customization
This hook can be used for example to reject too large commits and it is
executed before "update" hook, used exclusively by Gogs to update its state.

https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
2015-12-08 01:28:32 +01:00
Unknwon 4e0c697aaf force new INI version 2015-12-07 11:33:04 -05:00
Unknwon 3ffbb54337 minor fix for #2113 and other locales 2015-12-07 00:10:08 -05:00
Adam Strzelecki e2ca53029e Render commit msg as header + verbatim description
Most commit in Git are expected to follow standard of single header line,
followed by description paragraphs, separated by empty line from previous block.

Previously Gogs were treating everything as single header. Now we are trying to
render only first line as header, but following lines (description chunks) as a
verbatim.
2015-12-07 01:50:45 +01:00
Unknwon b5f6206a65 prepare release 2015-12-06 15:34:17 -05:00
Alex Myasoedov ae54d878c0 Fix misspelled words 2015-12-06 16:42:23 +02:00
Unknwon ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -05:00
Unknwon 978dc00305 APIs: admin users 2015-12-05 17:13:13 -05:00
Unknwon 404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
Unknwon f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon e538ff2770 fix #1829 and fix #890 2015-12-04 21:30:33 -05:00
Unknwon 942fd6be53 fix panic for #2045 2015-12-04 17:20:23 -05:00
Unknwon 56dd430a10 refactor API routes and some work for #976 2015-12-04 17:16:42 -05:00
Unknwon b83cb36049 minor fix for #2086 2015-12-02 19:45:43 -05:00
Unknwon e350d74c8a fix #2085 2015-12-02 18:58:13 -05:00
Unknwon 4a64ae4abf fix #2083 2015-12-02 13:47:22 -05:00
Unknwon 926e91820a #2071 Diff is not showing full content when has super long one line 2015-12-02 01:10:13 -05:00
Unknwon 0be8b1b1a1 #2052 Ability to batch delete system notices 2015-12-01 23:33:08 -05:00
Unknwon 3460ec1039 update REMADE and locale 2015-12-01 19:53:19 -05:00
Adam Strzelecki 573305f3d3 LDAP: Optional user name attribute specification
Consider following LDAP search query example:

    (&(objectClass=Person)(|(uid=%s)(mail=%s)))

Right now on first login attempt Gogs will use the text supplied on login form
as the newly created user name. In example query above the text matches against
both e-mail or user name. So if user puts the e-mail then the new Gogs user
name will be e-mail which may be undesired.

Using optional user name attribute setting we can explicitly say we want Gogs
user name to be certain LDAP attribute eg. `uid`, so even user will use e-mail
to login 1st time, the new account will receive correct user name.
2015-12-02 00:20:14 +01:00
Unknwon 117afe7620 Merge pull request #2069 from nanoant/patch/admin-see-all-organizations
Admin should be able to see all organizations
2015-11-30 21:18:33 -05:00
Unknwon dcb391d341 Merge branch 'feature/wiki' into develop 2015-11-30 20:46:19 -05:00
Unknwon 830d000667 finish wiki 2015-11-30 20:45:55 -05:00
Adam Strzelecki e57b2dffa4 Admin should be able to see all organizations
This is follow-up for 56c66ee486 allowing admin
to see private repositories, even when not being member of them.
2015-11-30 21:46:01 +01:00
Unknwon ca96e04e5f #1681 carry --config flag for builtin SSH 2015-11-30 15:40:05 -05:00
Unknwon 5d1f5f32d0 wiki: finish pages 2015-11-27 02:16:12 -05:00
Unknwon e42fcb033d wiki: finish edit 2015-11-27 01:50:38 -05:00
Unknwon 392f3ee210 wiki: finish new 2015-11-27 00:24:24 -05:00
Unknwon c50a3503e6 introduce git-shell 2015-11-26 17:33:45 -05:00
Unknwon aaa3f1b2b9 Use better LDAP lib and should fix #1139 2015-11-26 14:04:58 -05:00
Unknwon 2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Unknwon 144663a3cf allow admin to migrate for any user/org 2015-11-25 00:55:37 -05:00
Unknwon ba92f4687e minor fix markdown post process 2015-11-24 19:29:35 -05:00
Unknwon 968edb3e44 more link fix 2015-11-24 19:28:24 -05:00
Unknwon 3ca544912f #1944 Drop /org/ URL path prefix in organization home page 2015-11-24 19:14:00 -05:00
Unknwon 7f9598141b fix #2020 2015-11-24 18:49:34 -05:00
Unknwon 56c66ee486 #2008 more supported git hooks 2015-11-24 16:30:47 -05:00
Unknwon b2fb7e3fd2 more HTTP clone word fix 2015-11-22 13:01:42 -05:00
Unknwon efaf60ba5a fix #2013 2015-11-22 02:42:39 -05:00
Unknwon 52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon f12832c61e fix possible panic 2015-11-21 21:06:11 -05:00
Unknwon 3623b0927e remove tags redis and memcache 2015-11-21 17:21:22 -05:00
Unknwon cefc50b278 update locales 2015-11-21 14:08:23 -05:00
Unknwon 126228d146 HTML render fix 2015-11-20 05:37:51 -05:00
Unknwon 987dcc5372 fix #1383 2015-11-20 02:38:41 -05:00
Unknwon 9b6c835715 fix #1873 2015-11-20 01:52:11 -05:00
Unknwon 902b578465 better escape char handle 2015-11-20 01:18:50 -05:00
Unknwon 3d14e73fd8 fix #1119 and data race in timming tasks 2015-11-20 00:47:35 -05:00
Unknwon 6a66e5fc98 better error message 2015-11-19 13:45:07 -05:00
Unknwon 2158e6fc43 fix #1997 2015-11-19 11:40:00 -05:00
Unknwon ee686f6231 minor fix on auto sign in 2015-11-19 00:22:16 -05:00
Unknwon 481be9b5c9 update locale #1965 2015-11-19 00:08:31 -05:00
Unknwon 9330c943cd work on #1891 2015-11-18 23:52:09 -05:00
Unknwon 915bf1d2e3 Merge pull request #1994 from arthuroy/develop
Fix #1965 - the hyperlink and the display name of the branch
2015-11-18 23:01:06 -05:00
Unknwon df339ad8b0 #1401 #493 Admin should be able to see private repositories 2015-11-18 19:49:11 -05:00
Unknwon 2c653141a8 #1742 Update default branch in git repository while change in web view 2015-11-18 19:32:23 -05:00
Arthur Ouyang fc56f42dc3 Use refStr[len("refs/heads/"):] instead of refStr[11:] and fix error
Fix #1965
2015-11-19 08:10:44 +08:00
Arthur Ouyang 0bd4d15e47 Use refStr[11:] instead of TrimPrefix
Fix #1965
2015-11-19 08:05:27 +08:00
Arthur Ouyang e04c97b9fa Fix #1965 - the hyperlink and the display name of the branch
The hyperlink and the display name of the branch if the branch is in a folder or the branch name has '#'
2015-11-19 07:31:55 +08:00
Unknwon f04d773f4f UI: long organization name in create repository owner list 2015-11-18 17:42:20 -05:00
Unknwon 4325b01a58 minor fix for #1992 2015-11-18 17:19:36 -05:00
Gibheer e347736c9e fix old naming
This is the old naming of the variable and I forgot to fix it. It now
works and is tested.
2015-11-18 23:12:42 +01:00
Gibheer 56006da34b fix #1957 - disable version display
This allows the admin to disable the version information about gogs and
go in use in the footer.
2015-11-18 22:32:31 +01:00
Unknwon efea642d6c add admin op: delete missing repos 2015-11-18 15:37:48 -05:00
Unknwon 9a0902523b fix #1987 2015-11-18 15:01:11 -05:00
Unknwon 62533560ce fix #1988 2015-11-18 13:14:46 -05:00
Unknwon ff5f14431e fix #1448 2015-11-17 02:18:05 -05:00
Unknwon 9ab96172fc new watchers, stars and forks UI 2015-11-16 23:28:46 -05:00
Unknwon e06558e208 #1922 Pull request fail to merge with BIN 2015-11-16 21:18:04 -05:00
Unknwon bb1fbe4e70 octicon fix in feeds 2015-11-16 11:39:48 -05:00
Unknwon 5dc3dd1704 fix #1960 2015-11-16 11:11:59 -05:00
Unknwon 134d8e7681 work on #1961 2015-11-16 10:14:12 -05:00
Unknwon 18de67380c fix #1958 2015-11-15 23:52:46 -05:00
Unknwon 1a901433e2 minor fix for #1949 2015-11-15 17:37:26 -05:00
Unknwon e030109b5a fix api broken 2015-11-15 17:07:44 -05:00
Unknwon 35d49d3b34 Merge pull request #1949 from TheHowl/develop
Fix bad issue links in non-readme markdown files
2015-11-15 16:23:55 -05:00
Howl ca5678da32 Safely detect urlPrefix in the format /:owner/:repo 2015-11-15 22:22:25 +01:00
Unknwon 4f03b81ec7 #1931 Test patch does not checkout correct base branch 2015-11-15 14:41:36 -05:00
Unknwon b4970b3cc3 fix #1948 2015-11-15 14:05:51 -05:00
Howl 85c58eba90 Fix bad issue links in non-readme markdown files 2015-11-15 12:04:43 +01:00
Unknwon 7c80eba77f minor UI fix and fix ssh race 2015-11-14 13:21:31 -05:00
Unknwon 9c12ed3b6e clean up 2015-11-14 04:54:27 -05:00
Unknwon 7b1c10ea7e new repo ui
- copy link button: #1396, #1168, #1668,
- synxtax highlight: #1712, #1549, #1315, #670
- z-index: #1942
2015-11-14 04:34:01 -05:00
Unknwon 679af4ddea clean up 2015-11-13 22:45:33 -05:00
Unknwon 1d57f0d64f Show custom avatars in commits 2015-11-13 17:10:25 -05:00
Unknwon 1559bd58e7 save custom avatar as PNG 2015-11-13 16:43:43 -05:00
Unknwon 523dc8b613 prepare release 2015-11-12 12:42:39 -05:00
Unknwon 3b62a0fe0e fix #1572 fix file histrory paging issue 2015-11-10 16:46:17 -05:00
Unknwon 18c841050b fix 1540 and experimental SSH server support 2015-11-08 16:59:56 -05:00
Unknwon b55499d039 go vet and fix #1890 2015-11-08 14:31:49 -05:00
Unknwon 676d774d88 fix #1902 2015-11-07 00:39:45 -05:00
Unknwon 54ca0b2f09 #1433 images with links in Markdown
- #1904 minor fix on image link
2015-11-06 11:10:27 -05:00
Unknwon f255b1e86d #1896 fatal when no needed update task 2015-11-04 21:57:10 -05:00
Unknwon 3a81fdf092 rename fields 2015-11-03 22:49:06 -05:00
Unknwon 6f0a41b8b2 #1511 Allow local import only for admin users 2015-11-03 18:40:52 -05:00
Unknwon 25ec20d525 #1838 update merge base before generate new patch 2015-11-03 17:25:39 -05:00
Unknwon 8e262f3ec4 update locales 2015-11-03 14:34:21 -05:00
Unknwon a374751eb8 add Makefile 2015-11-03 12:16:43 -05:00
Unknwon 0af035c37e #1078 not show bin when rename a file 2015-11-03 09:52:17 -05:00
Unknwon 75aab86a8d fix problem with #1879 2015-11-02 14:01:19 -05:00
无闻 50058b3c6d Merge pull request #1871 from Gibheer/config_minimum_key_sizes
move minimum key sizes to config
2015-11-01 12:39:12 -05:00
Unknwon b0226a1d05 fix #1831 2015-11-01 12:30:27 -05:00
Unknwon 5cad124704 fix #1697 2015-10-31 19:10:44 -04:00
Unknwon 940898a3ff minor fix for #1865 2015-10-31 12:35:26 -04:00
Unknwon 16feb5b655 minor fix on #1863 2015-10-31 12:04:04 -04:00
无闻 659bd29bc5 Merge pull request #1863 from nathan7/go-source-meta
Add go-source directive to repo pages
2015-10-31 11:45:40 -04:00
无闻 91c9069c4d Merge pull request #1862 from nathan7/fix-private
Fix the JSON field names for MigrateRepoForm
2015-10-31 11:14:38 -04:00
Nathan Zadoks 4323a89c03 Add go-source directive to repo pages
This makes Gogs repos work with godoc.org: https://github.com/golang/gddo/wiki/Source-Code-Links
2015-10-30 14:00:09 +01:00
Gibheer b90b0c1191 move minimum key sizes to config
This moves the minimum key sizes into the config file, so that anyone
can modify the restrictions.
2015-10-30 13:53:06 +01:00
Nathan Zadoks f1aa4c0524 Fix the JSON field names for MigrateRepoForm
For some reason, the field names for Private and Mirror got swapped.
2015-10-30 02:44:45 +01:00
Unknwon 073da3c49d #470 fix max length of email 2015-10-29 21:12:41 -04:00
Unknwon 7d72c8333e work on #470 and fix miror JS issue when choose targets on compare and pull 2015-10-29 21:09:48 -04:00
Unknwon 706b0f72e2 fix issue comment mention and autofix count when start 2015-10-29 20:40:57 -04:00
Unknwon 4f0e31e96d update README 2015-10-29 03:21:59 -04:00
Unknwon f5689ee3a5 update locale 2015-10-28 02:30:24 -04:00
Sergio Benitez 630ebbe6c2 Sanitizing input to LDAP authentication module. 2015-10-26 18:08:59 -07:00
Unknwon b9f5def5dc fix insecure tls when trigger task 2015-10-26 09:16:24 -04:00
Unknwon 022820103d #1657 allow forcing all private repos 2015-10-25 04:26:26 -04:00
无闻 379629d28a Merge pull request #1836 from likeit92/develop
workaround for reverse proxy, ssh, submodule
2015-10-24 16:51:59 -04:00
Matthias Pioch 8b92f9cca6 fix workaround for reverse proxy, ssh, submodule 2015-10-24 22:46:13 +02:00
Matthias Pioch 78a4e71245 workaround for reverse proxy, ssh, submodule 2015-10-24 22:03:08 +02:00
Unknwon 63e6e31271 add config and update locale 2015-10-24 15:35:26 -04:00