Commit graph

460 commits

Author SHA1 Message Date
Sandro Santilli 9182a35f18 Show user OpenID URIs in their profile () 2017-03-20 09:31:08 +01:00
Sandro Santilli 97ee88975a Add captcha support to OpenID based signup 2017-03-20 08:58:00 +01:00
Sandro Santilli 71d16f69ff Login via OpenID-2.0 () 2017-03-17 15:16:08 +01:00
Sandro Santilli 7d8f9d1c46 Rename /forget_password url to /forgot_password
Also renames `forgot_password` translation key to
`forgot_password_title` and `forget_password` to
`forgot_password`

Includes entry in CHANGELOG about the breaking change
(and some markdown fixes in there)
2017-03-14 22:54:07 +01:00
Sandro Santilli 8a98a25d8e Show a link to password reset from password change and delete account ()
It's helpful when you forgot your password thus cannot change it
(can happen if you log in via OAuth2 or OpenID)

Also make sure that both the delete-account and password-change
links to forgot-password will have the primary email pre-filled
2017-03-11 17:11:54 +08:00
Willem van Dreumel 8947b711aa Link OAuth2 account to 2FA enabled account (fix ) ()
* fixes  where linking an account to a 2fa enabled account failed because we forgot to really link the account when 2fa is completed

* handle errors
2017-02-27 18:10:26 +08:00
Lunny Xiao 19b3c45ca7 fix 500 when use a duplicat email instead of giving an error tip () 2017-02-25 22:57:06 +08:00
Lunny Xiao e8e56da9ac fix () 2017-02-25 22:53:57 +08:00
Lunny Xiao 8894f856de fix 500 when change user setting email to an exist email () 2017-02-25 21:39:52 +08:00
Willem van Dreumel 01d957677f Oauth2 consumer ()
* initial stuff for oauth2 login, fails on:
* login button on the signIn page to start the OAuth2 flow and a callback for each provider
Only GitHub is implemented for now
* show login button only when the OAuth2 consumer is configured (and activated)
* create macaron group for oauth2 urls
* prevent net/http in modules (other then oauth2)
* use a new data sessions oauth2 folder for storing the oauth2 session data
* add missing 2FA when this is enabled on the user
* add password option for OAuth2 user , for use with git over http and login to the GUI
* add tip for registering a GitHub OAuth application
* at startup of Gitea register all configured providers and also on adding/deleting of new providers
* custom handling of errors in oauth2 request init + show better tip
* add ExternalLoginUser model and migration script to add it to database
* link a external account to an existing account (still need to handle wrong login and signup) and remove if user is removed
* remove the linked external account from the user his settings
* if user is unknown we allow him to register a new account or link it to some existing account
* sign up with button on signin page (als change OAuth2Provider structure so we can store basic stuff about providers)

* from gorilla/sessions docs:
"Important Note: If you aren't using gorilla/mux, you need to wrap your handlers with context.ClearHandler as or else you will leak memory!"
(we're using gorilla/sessions for storing oauth2 sessions)

* use updated goth lib that now supports getting the OAuth2 user if the AccessToken is still valid instead of re-authenticating (prevent flooding the OAuth2 provider)
2017-02-22 08:14:37 +01:00
Lunny Xiao 847527fd6d Fix all the bugs in issues and pulls on dashboard ()
* fix all the bugs in issues and pulls on dashboard

* small fix and refactor

* add method getRepoIDs for IssueList
2017-02-17 08:58:19 +08:00
Bo-Yi Wu a31f64d639 fix: 500 error on /explore/repos page. () 2017-02-15 22:28:11 +08:00
Lunny Xiao 9c645b54dc bug fixed on issues and pulls 2017-02-15 01:17:07 +01:00
Lunny Xiao 7a9a5c8a69 Fix assigned issues dashboard ()
* Fix assigned/created issues in dashboard. ()

* Fix assigned/created issues in dashboard.

* Use GetUserIssueStats for getting all Dashboard stats.

* Use gofmt to format the file properly.

* Replace &Issue{} with new(Issue).

* Check if user has access to given repository.

* Remove unnecessary filtering of issues.

* Return 404 error if invalid repository is given.

* Use correct number of issues in paginater.

* fix issues on dashboard
2017-02-14 22:15:18 +08:00
Bo-Yi Wu 23aba523b5 feat: support search bar on star tab of user profile. ()
* feat: support search bar on star tab of user profile.

* fix: update testing.

* fix: Using loadAttributes

* fix: remove empty line.

* remove LOWER

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-02-14 15:28:22 +08:00
Bo-Yi Wu 3576e1ee73 fix: trim the whitespaces for the search keyword () 2017-02-11 12:00:01 +08:00
Bo-Yi Wu a195c3fabe fix: Admin can also search private user repository. () 2017-02-08 17:35:59 +08:00
Bo-Yi Wu b13232f524 feat: support paginater on star tab of user profile. () 2017-02-07 19:54:16 +08:00
Bo-Yi Wu 71d35dae8c fix: wrong pages number which includes private repository count. () 2017-02-06 23:18:36 +08:00
Lunny Xiao 8a421b1fd7 Add units concept for modulable functions of a repository ()
* Add units concept for modulable functions of a repository

* remove unused comment codes & fix lints and tests

* remove unused comment codes

* use struct config instead of map

* fix lint

* rm wrong files

* fix tests
2017-02-04 23:53:46 +08:00
Bo-Yi Wu a90a215662 feat: Add search bar on user profile page. () 2017-02-04 20:20:20 +08:00
Ethan Koenig 400b6fd61c Cache ctxUser in retrieveFeeds(..) () 2017-02-03 13:27:10 +08:00
Bo-Yi Wu 2db0ffe69e fix: User can see the private activity on public activity history. () 2017-02-02 20:32:40 +08:00
Ethan Koenig 2eb15f4a61 Unit tests and remove unused functions in models/notification ()
* Unit tests and remove unused functions in models/notification

* Read -> Unread
2017-01-30 22:21:49 +08:00
Ethan Koenig da1b6164fe Fix FIXME and remove superfluous queries in models/org () 2017-01-25 23:41:38 +08:00
Ethan Koenig 833f8b94c2 Search bar for issues/pulls () 2017-01-25 10:43:02 +08:00
Andrey Nering d2bb8ef503 Notifications: trying to get a better layout ()
* i18n button titles

* Improvements on notification page layout

* Notification count badge fixes

* Make table <tr> clickable

* Fix octicon aligment

* Fix use of AppSubUrl
2017-01-18 09:18:55 +08:00
Andrew 6dd096b7f0 Two factor authentication support ()
* Initial commit for 2FA support

Signed-off-by: Andrew <write@imaginarycode.com>

* Add vendored files

* Add missing depends

* A few clean ups

* Added improvements, proper encryption

* Better encryption key

* Simplify "key" generation

* Make 2FA enrollment page more robust

* Fix typo

* Rename twofa/2FA to TwoFactor

* UNIQUE INDEX -> UNIQUE
2017-01-16 10:14:29 +08:00
xgitea 64b167138f docs: update translation on notification page for zh-CN ()
* docs: update translation on notification page for zh-CN

* use international resources
2017-01-13 17:31:48 +08:00
Andrey Nering 769e0a3ea6 Notifications: mark as read/unread and pin ()
* Use relative URLs

* Notifications - Mark as read/unread

* Feature of pinning a notification

* On view issue, do not mark as read a pinned notification
2017-01-12 12:27:09 +08:00
derSuessmann 51d578ff33 Add Keep email private (see issue ). ()
- Add site-wide option DEFAULT_KEEP_EMAIL_PRIVATE.
- Add the new option to the install and admin/config pages.
- Add the new option to app.ini in the service section.
- Add the new option to the settings struct.
- Add English text strings to i18n.
- Add field KeepEmailPrivate to user struct.
- Add field KeepEmailPrivate to user form.
- Add option to UI.
- Add using noreply email address if user has "Keep Email Private".
An email address <LowerName>@<NO_REPLY_ADDRESS> is now used in commit
messages (and hopefully all other git log relevant places). The
change relies on the fact that git commands should use
user.NetGitSig().
- Add hiding of email address in UI, if user has set "Keep Email Private".
- Add condition to show email address only on explore/users and user
pages, if user has not set "Keep Email Private".
- Add noreply email in API if set "Keep Email Private".
- Add a new service setting NO_REPLY_ADDRESS. The value of this
setting is used as the domain part for the user's email address in
git log, iff he decides to keep his email address private.
If the user decides to keep his email address private and this
option is not set 'noreply.example.org' is used, which no MTA
should send email to.

Add NO_REPLY_ADDRESS to conf/app.ini.
2017-01-08 11:12:03 +08:00
Andrey Nering b354cf362e Add pagination for notifications 2017-01-03 17:09:36 -02:00
Andrey Nering 341a3b571b Do not get count on /api routers 2017-01-02 16:31:50 -02:00
Andrey Nering 6069abe5fd Notifications - Step 2 2016-12-30 16:51:24 -02:00
Andrey Nering b992858883 Tab on user profile to show starred repos ()
* Tab on user profile to show starred repos

* Make golint happy and use transactions on StarRepo function

* x -> sess

* Use sess.Close() instead of sess.Rollback()

* Add copyright

* Fix lint
2016-12-29 22:58:24 +08:00
Bwko f27d87d93b Added minimum password length to app.ini () 2016-12-24 21:40:44 +08:00
Ethan Koenig d0932ef147 Bug fixes for Issues filters ()
Correctly handle simultaneous assignee/poster filters, and conflicting assignee filters
2016-12-24 18:33:21 +08:00
Lunny Xiao a12da66dfb resolved () 2016-12-23 01:26:01 +01:00
Denis Denisov 380e32e129 Fix random string generator ()
* Remove unused custom-alphabet feature of random string generator

Fix random string generator

Random string generator should return error if it fails to read random data via crypto/rand

* Fixes variable (un)initialization mixed assign
Update test GetRandomString
2016-12-20 13:32:02 +01:00
Lunny Xiao b4c794058a fixed vulnerabilities () 2016-12-15 16:49:06 +08:00
Bwko a4ece1f223 Fixes typos 2016-11-27 12:59:12 +01:00
Lunny Xiao 94da472717 Golint fixed for modules/setting ()
* golint fixed for modules/setting

* typo fixed and renamed UNIXSOCKET to UnixSocket
2016-11-27 18:14:25 +08:00
Lunny Xiao cf045b029c golint fixed for parts of routers root, dev, user and org dirs ()
* golint fixed for parts of routers root, dev and org dirs

* add user/auth.go golint fixed

* rename unnecessary exported to unexported and user dir golint fixed
2016-11-18 11:03:03 +08:00
Thibault Meyer ddee4c8b58
Normalize files with gofmt 2016-11-11 13:11:45 +01:00
Sandro Santilli 4247304f5a Update import paths from github.com/go-gitea to code.gitea.io ()
- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis

See https://docs.travis-ci.com/user/languages/go#Go-Import-Path
2016-11-10 17:24:48 +01:00
Joubert RedRat f91cbf0fed Support to last login feature 2016-11-09 08:53:45 -02:00
Sandro Santilli b7bf9dfd28 more 2016-11-07 17:55:31 +01:00
Sandro Santilli f6a11e0de1 More MixedCase consts 2016-11-07 17:24:59 +01:00
Rémy Boulanouar 2d68bd1ef9 Change import reference to match gitea instead of gogs () 2016-11-03 10:29:56 -02:00
LefsFlare 2cb5ec5983 Prevented user enumeration of valid users through HTTP status codes of login () () 2016-10-16 22:08:40 -04:00
Unknwon 780cc2d110 router/repo: code refactoring 2016-08-30 02:08:38 -07:00
Unknwon f0b5c3b90a redirect if any after sign in 2016-08-27 15:07:02 -07:00
lstahlman 2c82fc3edb Fix for overall issues for organisations is limited to num_repos from the user () 2016-08-09 10:00:42 -07:00
Sandro Santilli 90dd0657b5 Add support for federated avatars ()
* Add support for federated avatars

Fixes 

Removes avatar fetching duplication code
Adds an "Enable Federated Avatar" checkbox in user settings
(defaults to unchecked)

Moves avatar settings all in the same form, making
local and remote avatars mutually exclusive

Renames UploadAvatarForm to AvatarForm
as it's not anymore only for uploading

* Run gofmt on all modified files

* Move Avatar form in its own page

* Add go-libravatar dependency to vendor/ dir

Hopefully helps with accepting the contribution.
See also 

* Revert "Add go-libravatar dependency to vendor/ dir"

This reverts commit a8cb93ae640bbb90f7d25012fc257bda9fae9b82.

* Make federated avatar setting a global configuration

Removes the per-user setting

* Move avatar handling back to base tool, disable federated avatar in offline mode

* Format, handle error

* Properly set fallback host

* Use unsupported github.com mirror for importing go-libravatar

* Remove comment showing life exists outside of github.com

... pity, but contribution would not be accepted otherwise

* Use Combo for Get and Post methods over /avatar

* FEDERATED_AVATAR -> ENABLE_FEDERATED_AVATAR

* Fix persistance of federated avatar lookup checkbox at install time

* Federated Avatars -> Enable Federated Avatars

* Use len(string) == 0 instead of string == ""

* Move import line where it belong

See
https://github.com/Unknwon/go-code-convention/blob/master/en-US/import_packages.md

Pity the import url is still the unofficial one, but oh well...

* Save a line (and waste much more expensive time)

* Remove redundant parens

* Remove an empty line

* Remove empty lines

* Reorder lines to make diff smaller

* Remove another newline

Unknwon review got me start a fight against newlines

* Move DISABLE_GRAVATAR and ENABLE_FEDERATED_AVATAR after OFFLINE_MODE

On re-reading the diff I figured what Unknwon meant here:
https://github.com/gogits/gogs/pull/3320/files#r73741106

* Remove newlines that weren't there before my intervention
2016-08-07 10:27:38 -07:00
Unknwon cf6d321991 Ignore repository with issue disabled or use external tracker in dashboard issues 2016-08-05 12:46:26 -07:00
Unknwon 50422f1fc2 always use relative avatar link in the template 2016-08-05 12:12:54 -07:00
Unknwon e74630ae3b add pagination for repositories 2016-07-24 14:32:46 +08:00
Unknwon 1f2e173a74 Refactor User.Id to User.ID 2016-07-24 01:08:22 +08:00
Unknwon 46e96c008c Use struct for UI settings 2016-07-24 00:23:54 +08:00
Unknwon f1b8d52eb3 fix no mail notification when issue is closed/reopened 2016-07-16 00:36:39 +08:00
Unknwon 762ab056a2 Fix XORM IN condition table name parse 2016-03-27 18:21:37 -04:00
Unknwon 8966f5635d Merge pull request from zacheryph/feature/local-only-password-reset
Prevent `Forgot Password` for non local users
2016-03-14 16:44:05 -04:00
Zachery Hostens 63e21c146a ensure we don’t try changing LDAP passswords 2016-03-14 09:40:16 -05:00
Unknwon 9bd9ad4205 add CRUD issue APIs
- Fix go-gogs-client#10
- Related to 
2016-03-13 23:20:22 -04:00
Unknwon b4f47a7623 attempt to fix invalid csrf token 2016-03-12 20:56:03 -05:00
Unknwon 514382e2eb Rename module: middleware -> context 2016-03-11 11:56:52 -05:00
Alec S 792c13cf0a readd 'dashboard' to title 2016-03-10 12:10:03 -06:00
Alec S af847ef94e Merge branch 'develop' of github.com:gogits/gogs into develop 2016-03-09 22:56:52 -06:00
Alec S bfed3ea7d3 fix indentation 2016-03-09 22:56:03 -06:00
Alec S affa3c2dbf Remove dashboard keyword from title 2016-03-09 21:01:43 -06:00
Alec S 6775ac7334 change page titles for user and org dashes 2016-03-09 20:46:36 -06:00
Jan Christophersen 72a8fa3bc8 Allowing site admins to view private repositories in org/home 2016-03-08 18:20:00 +01:00
Tamás Molnár 9c91e27933 Added: Ability to delete org avatar. 2016-03-06 17:36:30 +01:00
Unknwon a2f13eae55 some avatar setting changes
- Allow to delete current avatar
2016-03-05 00:51:51 -05:00
Unknwon aa12135b97 Fix panic when view profile without signin
Also fix that no matter who, still able to see organizations with private membership.
2016-02-19 18:10:03 -05:00
Unknwon d8631b616e Merge pull request from exmex/develop
Admins and user itself sees private org relations on profile
2016-02-14 20:34:53 -05:00
Unknwon a1d97e8f5c Minor fix for 2016-02-14 20:07:42 -05:00
ExMex 2cfe6f8c60 Admins and user itself sees private org relations on profile 2016-02-07 10:20:58 +01:00
Florian Kaiser 45db167f7a Only show activities for repositories on dashboard, that the user has access to 2016-02-06 07:52:21 +00:00
Florian Kaiser 90e9e3c89d Only show repositories on organization dashboard, that the user has access to 2016-02-05 15:49:01 +00:00
Unknwon 739d5aa1d3 Merge pull request from fnkr/hide-other-teams-repos-from-org-page
Hide other teams & repos from organization page
2016-02-04 12:52:11 -05:00
Florian Kaiser c3ff476ed6 Remove unnecessary else-block 2016-02-04 17:13:56 +00:00
Florian Kaiser bead46363b Evaulate org/team permissions when using the issue/PR view 2016-01-31 20:12:03 +00:00
Florian Kaiser fdad234445 Remove unnecessary comments 2016-01-31 19:08:20 +00:00
Florian Kaiser bba1847a8e Everyone can see public repos 2016-01-31 18:37:50 +00:00
Unknwon a9d68a6884 fix 2016-01-31 13:33:36 -05:00
Florian Kaiser e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Florian Kaiser 5eafe2b17e Only show repositories the user has access to, on the organization home 2016-01-31 15:29:45 +00:00
Florian Kaiser 295de51b99 Show all orgs on user profile, except the private one's 2016-01-30 21:53:58 +00:00
ExMex f610bfa8a2 Added organization display on profile
Fixed "Follower" Icon too big
2016-01-12 03:09:59 +01:00
Unknwon 62edc5c59a fix cannot show user public ssh keys 2016-01-09 13:28:05 +08:00
Unknwon 85af36332b fix utf-8 recognized as windows-1252 2015-12-25 05:25:47 -05:00
Unknwon a49af93faf APIs: Users Followers
- User profile un/follow
- List user's followers/following
2015-12-21 04:24:11 -08:00
Unknwon 33a99d587a fix 2015-12-17 21:57:34 -05:00
Unknwon 9cd16c5b12 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon b117befc2b add user email APIs 2015-12-15 22:57:18 -05:00
Unknwon 0cce4439ce minor fix 2015-12-11 21:23:19 -05:00
Unknwon 477b4d3b50 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon d0b0d24f22 disable change user for non-local users
-  remove require for gravatar
2015-12-11 15:31:02 -05:00
Unknwon cc8f5add6e fix 2015-12-03 00:24:37 -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 3ca544912f Drop /org/ URL path prefix in organization home page 2015-11-24 19:14:00 -05:00
Unknwon 7f9598141b fix 2015-11-24 18:49:34 -05:00
Unknwon 52c8f69163 fix 2015-11-22 01:32:09 -05:00
Unknwon 3d14e73fd8 fix and data race in timming tasks 2015-11-20 00:47:35 -05:00
Unknwon dc0c0dc06b fix typo for 2015-11-19 11:52:39 -05:00
Unknwon 9330c943cd work on 2015-11-18 23:52:09 -05:00
Unknwon f455125d4d fix 2015-11-18 21:21:47 -05:00
Unknwon 917d334ebd only show user's activities in profile 2015-11-16 11:43:23 -05:00
Unknwon f8ae161c74 fix 2015-11-13 17:37:02 -05:00
Unknwon 1559bd58e7 save custom avatar as PNG 2015-11-13 16:43:43 -05:00
Unknwon 603c7389b8 Dashboard issues lacks sorting 2015-11-04 12:50:02 -05:00
Unknwon 932dbccb67 fix import path, fix 2015-10-15 21:28:12 -04:00
Unknwon acf428863c fix 2015-09-17 17:21:27 -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
- : fallback plain text
- : add date header
- : fix encoding of header
2015-09-17 01:54:12 -04:00
Unknwon 83e747bfda and and new admin edit user UI 2015-09-13 11:07:21 -04:00
Unknwon 8e0a69f86a disable captcha and new admin create user UI 2015-09-13 09:51:51 -04:00
Unknwon 52ec80fa18 finish all new user settings UI 2015-09-10 11:40:34 -04:00
Unknwon c38754d432 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 83dc2468f5 finish initial version of pull request 2015-09-02 16:18:09 -04:00
Unknwon 8d73832bdf fix sql 2015-08-29 23:49:17 +08:00
Unknwon a329bbc215 new org dashboard issues 2015-08-25 23:22:05 +08:00
Unknwon f808df5a7b new user dahsboard issues 2015-08-25 22:58:34 +08:00
Unknwon 062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +08:00
Unknwon 47ac579f09 only assign auto-admin when sign up by web 2015-08-19 04:58:45 +08:00
Unknwon 4c7b6414eb new access token UI 2015-08-19 03:36:16 +08:00
Unknwon 2493454587 new delete account UI and password confirmation 2015-08-19 02:49:44 +08:00
Unknwon 407385db7e work on 2015-08-17 17:05:37 +08:00
Unknwon 817b48ed1e Show owner/poster tags of comments and fix 2015-08-14 02:43:40 +08:00
Unknwon b4c0b7b98b finish view issue without comments and ops 2015-08-12 17:04:23 +08:00
Unknwon 75aff60c90 finish create issue with milestone and assignee 2015-08-10 21:47:23 +08:00
Unknwon dea3a8c6a4 WIP: create PR - choose branch 2015-08-08 22:43:14 +08:00
Unknwon 39a3b768bc : Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon 2c507667bf Merge branch 'develop' of github.com:gogits/gogs into feature/milestone
# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
2015-08-05 20:26:00 +08:00
Unknwon 0705f55ce0 finish new milestone page 2015-08-05 20:23:08 +08:00
Unknwon e50982f5ec allow anonymous SSH clone 2015-08-05 11:14:17 +08:00
Unknwon eea9302d8f fix 2015-07-31 13:53:14 +08:00
无闻 333ab1b2b4 Merge pull request from smcquay/keys
fix .keys route
2015-07-25 00:46:39 +08: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
Unknwon 698b9e2acc Clearer error message for illegal characters 2015-03-26 17:11:47 -04:00
无闻 e312634286 Merge pull request from sapk/fix-ng-issue-pages
Apply ng to issue dashboard
2015-03-19 17:03:03 -04:00
Unknwon 1cb57b1a44 : fix locale 2015-03-19 15:26:04 -04:00
Antoine GIRARD 96a71aaed8 Apply ng to issue dashboard 2015-03-19 00:35:17 +01:00
Unknwon 466facc009 : Deleting users should remove them from collaborator lists
- fix delete user but repository watches are not decreased
2015-03-17 21:51:39 -04:00
Unknwon 588f3215c6 : dashboard no longer accessible when repo is missing 2015-03-16 04:04:27 -04:00
无闻 f92bfabf86 Merge pull request from phsmit/access_action
Fix that owners also see actions on their repositories
2015-02-23 13:51:02 -05:00
Unknwon 7ccab9cd09 Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
2015-02-22 22:51:25 -05:00