Commit Graph

795 Commits

Author SHA1 Message Date
Unknwon 820be19cf5 Merge pull request #2796 from saboya/custom_app_data_path
Making AppDataPath customizable.
2016-03-12 13:53:37 -05:00
Unknwon 73e98c91c3 Update locales 2016-03-11 15:47:49 -05:00
Unknwon 2bf8494332 #13 finish user and repository search
Both are possible on explore and admin panel
2016-03-11 15:33:12 -05:00
Rodrigo Saboya 2c626371b0 Adding APP_DATA_PATH entry to the default app.ini. 2016-03-09 23:16:43 -03:00
Unknwon ad513a20e9 #2302 Replace time.Time with Unix Timestamp (int64) 2016-03-09 19:53:30 -05:00
Unknwon 0ea0c5ec4f Prepare release 2016-03-06 19:55:38 -05:00
Unknwon 58f0c68151 Some minor changes 2016-03-06 16:40:04 -05:00
Unknwon c18f67ac6a Add Finnish support 2016-03-05 21:13:04 -05:00
Unknwon a5b0400be7 #1146 finish new access rights for collaborators 2016-03-05 20:45:23 -05:00
Unknwon 045f14fbd0 #1146 finsih UI work for access mode of collaborators
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
2016-03-05 18:08:42 -05:00
Unknwon 414eb22ef9 #1597 fix activitity feeds for pull requests 2016-03-05 12:58:51 -05:00
Unknwon a2f13eae55 #1157 some avatar setting changes
- Allow to delete current avatar
2016-03-05 00:51:51 -05:00
Unknwon 2a931937a8 Update locales 2016-03-04 18:51:18 -05:00
Unknwon 9df6ce48c5 Minor fixes for #2746 2016-03-04 13:32:17 -05:00
Unknwon 4d5911dbcf Merge pull request #2746 from joshfng/feature-delete-wiki-pages
Add ability to delete single wiki pages.
2016-03-04 13:14:37 -05:00
Unknwon d57a2b908a #2743 and #2751 fix bad SQL generated by XORM
Use hand-written SQL to do complex query
2016-03-04 13:08:47 -05:00
Josh Frye 1ca171dbe9 Add ability to delete single wiki pages. 2016-03-04 09:26:52 -05:00
Unknwon 260723e2cc Minor fixes for #2745 2016-03-03 23:24:22 -05:00
Josh Frye f3358f5927 Repo setting to delete and disable wiki 2016-03-03 16:12:48 -05:00
Unknwon f946040fa9 #1891 attempt to fix expected invalid CSRF token
- Remove unused config settings `[picture] service`
2016-03-03 15:09:43 -05:00
Unknwon c9901bbba5 #2743 workaround to fix XORM problem 2016-03-03 10:57:27 -05:00
Unknwon 37ac743da7 Update TRANSLATORS and remove tip for CI 2016-03-02 16:43:32 -05:00
Unknwon 9e89584cb4 Allow setting git operations timeouts
- Migrate: #2704 #2653
- Clone: #2701
- Mirror, Pull
2016-02-29 19:29:49 -05:00
Unknwon ea80274229 #2700 fix sqlite3 can't create issue with more than one label 2016-02-29 18:45:12 -05:00
Unknwon 8055a0bdac Post work for #2637
Improve test cases, config settings, also show SSH config settings on admin config panel.
2016-02-27 20:48:39 -05:00
Unknwon 83c74878df Merge pull request #2637 from Gibheer/ssh-publickeys
allow native and ssh-keygen public key check
2016-02-27 18:55:14 -05:00
Unknwon 4438b7793b Add new config option for builtin SSH server
Config option [server] SSH_LISTEN_PORT to the port the builtin SSH server will be listen.
It can be different from SSH_PORT which is supposed to be exposed in the clone URL.
This should solve the problem when user runs Gogs inside Docker container
and still want to use builtin SSH server.
2016-02-25 00:21:48 -05:00
Unknwon baaf6046a1 Minor fix for #2660 2016-02-24 23:59:17 -05:00
Josh Frye c27038e392 Test mailer button. Addresses #1531 2016-02-24 09:48:05 -05:00
Unknwon d324500959 Prepare to release 2016-02-24 01:14:43 -05:00
Unknwon 912f7b51e9 #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
Unknwon 7140dbac95 Fix #857 2016-02-20 15:10:34 -05:00
Adam Strzelecki 834d92a47b LDAP: Fetch attributes in Bind DN context option
This is feature is workaround for #2628 (JumpCloud) and some other services
that allow LDAP search only under BindDN user account, but not allow any LDAP
search query in logged user DN context.

Such approach is an alternative to minimal permissions security pattern for
BindDN user.
2016-02-20 14:12:32 +01:00
Florian Kaiser eb009923f4 Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00:00
Gibheer 12403bdfb0 allow native and ssh-keygen public key check
This commit adds the possibibility to use either the native golang
libraries or ssh-keygen to check public keys. The check is adjusted
depending on the settings, so that only supported keys are let through.

This commit also brings back the blacklist feature, which was removed in
7ef9a05588. This allows to blacklist
algorythms or keys based on the key length. This works with the native
and the ssh-keygen way.

Because of #2179 it also includes a way to adjust the path to
ssh-keygen and the working directory for ssh-keygen. With this,
sysadmins should be able to adjust the settings in a way, that SELinux
is okay with it. In the worst case, they can switch to the native
implementation and only loose support for ed25519 keys at the moment.
There are some other places which need adjustment to utilize the
parameters and the native implementation, but this sets the ground work.
2016-02-16 23:01:56 +01:00
Unknwon 3af1d3c581 #2633 fix removed config option 2016-02-16 13:27:02 -05:00
Unknwon 632c27802c Minor fix for #2624 2016-02-15 14:57:15 -05:00
Unknwon dc89c51f3e Merge pull request #2624 from mhartkorn/convert-mirror-to-repo
Convert mirrors to regular repositories
2016-02-15 14:26:21 -05:00
Unknwon 58e004f7da Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon aa5e837c65 fix #2454 2016-02-14 20:26:49 -05:00
Martin Hartkorn 15d37b7a95 Refactored according to suggestions 2016-02-14 22:40:39 +01:00
Martin Hartkorn 3650bd8528 Convert mirrors to regular repositories. 2016-02-14 21:12:00 +01:00
Josh Frye 1feecd6beb Add helper text for log path. 2016-02-12 09:24:09 -05:00
Josh Frye a3e8c32a30 Add install option for log path 2016-02-12 09:19:45 -05:00
Unknwon 5258ee3740 Update locales and update sponsor 2016-02-11 13:34:21 -05:00
Andrey Nering e40d94bb4f Implementing the "theme-color" meta tag.
Used by Android >= 5.0 to make the top bar colored.

Reference: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
2016-02-08 17:03:18 -02:00
Unknwon ee53204e02 Improve db path prompt when install 2016-02-07 11:51:53 -05:00
Unknwon 4e96a4a62b Merge pull request #2406 from bkcsoft/feature/markdown-custom-url-scheme
Feature/markdown custom url scheme
2016-02-05 13:11:45 -05:00
techwolf12 4a0d2edc3d
Fixes small typo 2016-02-05 15:11:25 +01:00
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
Patrik 9d67528c82 Change en-us localization "mirror from" to "mirror of" 2016-02-01 21:59:48 +01:00
Unknwon 112a7cab31 #2497 incorrect error handle for team name 2016-01-29 17:06:14 -05:00
Unknwon b900150b1d Update locales 2016-01-28 06:15:49 -05:00
Saren Currie 646e90d833 Fix grammar in deploy key section 2016-01-27 15:32:47 +13:00
Kim "BKC" Carlbäcker d943429672 Added example to conf/app.ini 2016-01-27 02:05:53 +01:00
Unknwon 38efa72146 Update locales 2016-01-25 02:33:52 -05:00
Unknwon 7ef9a05588 #2179 use Go sub-repo ssh to verify public key content 2016-01-15 18:39:51 +08:00
Unknwon ab89be33a9 fix #2385 2016-01-14 14:28:07 +08:00
Unknwon a2ef9a2b64 update locale 2016-01-11 18:30:44 +08:00
Unknwon 91bab801aa #2349 try to handle []int8 case 2016-01-11 14:34:32 +08:00
Unknwon ca35ddd078 fix #2350 2016-01-07 09:24:19 +08: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 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 53eb37d529 fix #1436 2015-12-19 21:43:32 -05:00
Unknwon 09c981846b update locales 2015-12-18 07:54:44 -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 6673dcb038 #2103 #2181 improvments of highlight class name 2015-12-16 22:13:12 -05:00
Toni d7b924f17d Minor typo in en-US locale
metadata*
2015-12-16 22:52:38 +01:00
Unknwon 7786cb76f3 fix #2205 2015-12-15 21:32:17 -05:00
Unknwon 8ecbf0f16d fix #2204 2015-12-15 19:42:20 -05:00
Toni fd79fad2ec Fix typo
take*
2015-12-16 00:31:28 +01:00
Unknwon 19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon e444a67d59 update locales 2015-12-12 14:47:11 -05:00
Unknwon 0cce4439ce #2154 minor fix 2015-12-11 21:23:19 -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
Julien Pivotto 5b2afd8ec8 Minor typo in en-US locale: gloabl -> global 2015-12-11 09:31:02 +01: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 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 3ffbb54337 minor fix for #2113 and other locales 2015-12-07 00:10:08 -05:00
OhDaeto b7508b06fa Update locale_ru-RU.ini 2015-12-07 08:02:16 +03:00
OhDaeto 2a0db47935 Update Russian translation 2015-12-07 07:27:17 +03:00
Unknwon b5f6206a65 prepare release 2015-12-06 15:34:17 -05:00
Unknwon ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -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
Adam Strzelecki a9a386a1e5 Translation: Add missing entry for new "code" tab
We have new tab, but we had no entry. That's why it was showing "code"
(lowercase) as this is text id, where we were expecting properly title cased
"Code" to be shown in English version.

Also add Polish translation "code=Kod".
2015-12-02 23:00:23 +01:00
Unknwon 4a64ae4abf fix #2083 2015-12-02 13:47:22 -05:00
Unknwon 91ae2ad28b Merge pull request #2081 from angus-g/en-trans
Update English translations
2015-12-01 23:46:05 -05:00
Angus Gibson db30ea03d8 Fix casing in English translation 2015-12-02 15:43:56 +11:00
Unknwon 0be8b1b1a1 #2052 Ability to batch delete system notices 2015-12-01 23:33:08 -05:00
Angus Gibson d45302a6ba Update English translations
Just some phrasing changes to make the English translations sound more natural.
2015-12-02 15:27:08 +11: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 830d000667 finish wiki 2015-11-30 20:45:55 -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 2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Unknwon 253513cedd prepare for release 2015-11-25 09:36:26 -05:00
Unknwon 144663a3cf allow admin to migrate for any user/org 2015-11-25 00:55:37 -05:00
Unknwon 52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon cefc50b278 update locales 2015-11-21 14:08:23 -05:00
Unknwon 987dcc5372 fix #1383 2015-11-20 02:38:41 -05:00
Unknwon 6a66e5fc98 better error message 2015-11-19 13:45:07 -05:00
Unknwon 481be9b5c9 update locale #1965 2015-11-19 00:08:31 -05: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
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 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 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 523dc8b613 prepare release 2015-11-12 12:42:39 -05:00
Unknwon 18c841050b fix 1540 and experimental SSH server support 2015-11-08 16:59:56 -05:00
Unknwon 676d774d88 fix #1902 2015-11-07 00:39:45 -05:00
Unknwon 6f0a41b8b2 #1511 Allow local import only for admin users 2015-11-03 18:40:52 -05:00
Unknwon 8e262f3ec4 update locales 2015-11-03 14:34:21 -05:00
Unknwon 92535c9df0 update some libs 2015-11-02 02:00:12 -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 cb100c7781 work #1705 2015-10-31 23:18:58 -04: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
Matt Arnold c7eaf96b37 Translation for invalid milestone due date format ISO 8601 fix. 2015-10-30 14:44:03 +00: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
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 4f0e31e96d update README 2015-10-29 03:21:59 -04:00
Unknwon f5689ee3a5 update locale 2015-10-28 02:30:24 -04:00
Unknwon 87c3c8172a #1711 try to indicate sqlite session issue when merge 2015-10-25 18:35:27 -04:00
Unknwon 022820103d #1657 allow forcing all private repos 2015-10-25 04:26:26 -04:00
Unknwon c3ba5590c9 Reopen PR need retest patch 2015-10-25 03:10:22 -04:00
Unknwon 63e6e31271 add config and update locale 2015-10-24 15:35:26 -04:00
Unknwon 71d8ff247d update some locales 2015-10-24 03:40:47 -04:00
Unknwon 0fbb8c8826 New push to head repo of head branch: regenerate patch and retest apply 2015-10-24 03:36:47 -04:00
Unknwon f17b746a01 update locale 2015-10-21 06:40:44 -04:00
Unknwon fc7959d3bc New/reopen PR checks if there is any unmerged and open PR 2015-10-18 19:30:39 -04:00
Kunal Mehta 9573f9afe9 Simplify disable Gravatar preference wording
"Enable this to disable..." is needlessly confusing, simplify it by being
upfront that this setting disables the Gravatar fetching.
2015-10-17 20:46:52 -07:00
Unknwon b5e6af9587 update locale 2015-10-08 22:49:08 -04:00
Unknwon 4465c58f4b new quick start page 2015-10-02 19:58:36 -04:00
Unknwon c60d8bc069 update locales 2015-10-02 02:55:52 -04:00
Unknwon d5ad4e1141 prepare release 2015-09-26 14:09:09 -04:00
Unknwon 6dfee30bf0 #1602 Wrong commit order on issue page when pushing multiple commits 2015-09-25 20:35:56 -04:00
Unknwon 21e13cb51e #1525 Triggere mailer for admin created accounts 2015-09-25 19:45:44 -04:00
无闻 84c727ae66 Merge pull request #1693 from sapk/fix-admin-repo-new-ui
Fix admin repos new ui
2015-09-25 19:05:27 -04:00
无闻 ee1256cf74 Merge pull request #1691 from sapk/fix-admin-organization-new-ui
Fix admin organization new ui
2015-09-25 19:03:53 -04:00
Antoine GIRARD dfc16d0879 Fix admin repos new ui 2015-09-26 00:38:43 +02:00
Antoine GIRARD c98dad1cf3 New admin organization UI 2015-09-25 19:54:52 +02:00
Unknwon 0d5e57e4ae #1689 minor fixes and update locale 2015-09-25 12:58:39 -04:00
Antoine GIRARD 14a1101139 New admin notice UI based on user list example 2015-09-25 18:13:38 +02:00
Unknwon 69b1d65c9b remove unused file and update locale 2015-09-20 23:29:59 -04:00
Unknwon 2340bb1ed2 update locales 2015-09-18 10:02:17 -04:00
Unknwon 86d3c5cbb3 update Docker info 2015-09-17 19:18:49 -04:00
Unknwon 3fb1b6a608 drop oauth2 feature support 2015-09-17 16:11:44 -04:00
Unknwon 9d36fc6986 finish new auth e-mails 2015-09-17 14:57:24 -04:00
Unknwon 373731f5e8 user gomail and new activate account email tpl
- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header
2015-09-17 01:54:12 -04:00
Unknwon e75fd2f783 simplify names 2015-09-16 23:08:46 -04:00
Unknwon 2729eb998c #1646 and other minor fixes 2015-09-16 15:34:46 -04:00
Unknwon 2d1bb0cf49 #1633 admin delete user 2015-09-13 13:26:20 -04:00
Unknwon 5f1183cecf #697 add install option 2015-09-13 12:14:32 -04:00
Unknwon 98108e379d #697 update locale and admin panel 2015-09-13 11:16:29 -04:00
Unknwon 83e747bfda #697 and #1606 and new admin edit user UI 2015-09-13 11:07:21 -04:00
Unknwon 8e0a69f86a #697 disable captcha and new admin create user UI 2015-09-13 09:51:51 -04:00
Unknwon cd37fccdfb #1625 remove auto_register and makes it default 2015-09-12 20:58:51 -04:00
Unknwon aff773f1b9 add tidb support 2015-09-12 15:31:36 -04:00
Unknwon be89802bd8 new admin user list UI 2015-09-11 20:42:26 -04:00
Unknwon 362d64df04 #1620 add allowed domains for SMTP auth 2015-09-11 13:32:33 -04:00
Unknwon 121a81a2c5 finish new edit auth UI 2015-09-11 12:03:08 -04:00
Unknwon 0617448282 finish new add auth UI 2015-09-10 17:11:41 -04:00
Unknwon fa728d8dff more minor fix on 1581 2015-09-10 15:45:03 -04:00
Unknwon 26ac016b9f minor fix on #1581 2015-09-10 15:03:14 -04:00
Unknwon cbd6276200 Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop
# Conflicts:
#	modules/bindata/bindata.go
2015-09-10 14:55:29 -04:00
Unknwon 52ec80fa18 finish all new user settings UI 2015-09-10 11:40:34 -04:00
Sergio Benitez 964d0262ff Merged conflicts. 2015-09-09 13:44:51 -07:00
Unknwon 56eb252098 #1593 fix repo name router bug 2015-09-07 11:51:53 -04:00
Unknwon c38754d432 #1191 allow upload avatar for org
Signed-off-by: Unknwon <u@gogs.io>
2015-09-06 17:12:02 -04:00
Unknwon 85f34ba538 new user profile settings UI
Signed-off-by: Unknwon <u@gogs.io>
2015-09-06 16:31:22 -04:00
Unknwon edc99bc8a4 new org options UI 2015-09-06 10:56:31 -04:00
Unknwon 80701d45bb #1193 Make organization emails non-mandatory 2015-09-06 10:08:14 -04:00