Commit graph

261 commits

Author SHA1 Message Date
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
Unknwon 04164eada3 models: able to rename user with diff letter cases #981
- templates/org: mirror fix on name output
- routers: add missing error check
2015-02-22 18:24:49 -05:00
Unknwon 1654e9ecab templates/user/settings/emial.tmpl: little fix on UI
- routers/user: little code format
- conf/locale: update French locale
2015-02-21 22:13:47 -05:00
Peter Smit 0fa209d07b Update/simplify fix that owners also see actions on their repositories 2015-02-18 08:59:22 +02:00
Peter Smit 455fad0fbd Fix that owners also see actions on their repositories
This is a balance between speed and nice code, where speed has won. To prevent a repository query for each action the ownername is match with the current user.

It would be "cleaner" or "better" if we fetch the repository each time. Another option is to add the RepoOwnerID to action
2015-02-16 13:16:24 +02:00
Unknwon 6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Peter Smit 0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit 4e79adf6b5 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-06 13:18:11 +02:00
Peter Smit 76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +02:00
Peter Smit 6251626de4 Implement #798 Flexible ssh-key input
It is now possible to input ssh keys in a number of formats: openssh, SSH2 or just the base64 encoded key.
2015-01-02 15:38:11 +02:00
无闻 a18decf4cc Merge pull request #755 from phsmit/multiple_emails
Multiple emails
2014-12-20 22:47:05 -05:00
Peter 20b5c23a19 Small fixes to multiple_emails feature 2014-12-20 09:26:51 +02:00
Unknwon 0a697517ac work on #754 2014-12-18 03:37:31 -05:00
Unknwon c4820f119d work on #754 2014-12-18 03:26:09 -05:00
Unknwon 57b3be4016 work on #756 2014-12-17 23:04:05 -05:00
Peter b033f2f535 Finish method for having multiple emails/user.
All basics are implemented. Missing are the right (localized) strings
and the page markup could have a look at by a frontend guy.
2014-12-17 17:42:54 +02:00
Peter ec71d538fc Method for activating email addresses through verification email 2014-12-17 17:41:49 +02:00
Unknwon d01f2f3c22 fix #751 2014-12-16 20:47:10 -05:00
Unknwon b6437b5a4c safe check 2014-11-28 21:54:49 -05:00
Unknwon db4951bc61 mirror fix on oauth2 2014-11-28 21:38:35 -05:00
Unknwon d6132aaa88 fix oauth2 2014-11-28 21:20:13 -05:00
Unknwon 1b66600bd0 Fix #652 2014-11-23 02:33:47 -05:00
Unknwon dc53270da9 Fix 653 2014-11-22 10:22:53 -05:00
Unknwon ef275ebf62 more on change avatar 2014-11-21 12:51:36 -05:00
Unknwon 22ab4fa1b0 fix #139 2014-11-21 11:08:24 -05:00
Unknwon 55dfe2c978 custom avatar upload 2014-11-21 10:58:08 -05:00
Unknwon 9e22840483 fix #622 2014-11-13 05:27:01 -05:00
Unknwon 8c9338a537 add personal access token panel #12 2014-11-12 06:48:50 -05:00
Unknwon 146c8efee3 Fix API broken 2014-10-18 23:42:43 -04:00
Unknwon 3abc41ccca Fix API broken 2014-10-18 23:26:55 -04:00
Unknwon 452ccff81c Mirror fix on add ssh key 2014-10-11 21:04:42 -04:00
Martin van Beurden 976f1486e0 Set cookiepath to AppSubUrl 2014-09-21 14:25:22 +02:00
Unknwon 7ba9257a7f Add suburl support 2014-09-19 20:11:34 -04:00
Martin van Beurden 0055cbd365 Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
2014-09-18 20:50:48 +02:00
tobyzxj ad041167f7 fix user's actions on domain/org/name-of-organization/dashboard 2014-09-16 16:20:32 +08:00
Unknwon 632b1b694d Fix #465 2014-09-15 09:56:12 -04:00
Unknwon 81287ba022 Mirror issue fix 2014-08-27 22:40:45 +08:00
Marios Andreopoulos 510d5a5d74 import strings 2014-08-25 21:07:08 +03:00
Marios Andreopoulos cd0ddcfa01 fix typo 2014-08-25 20:35:23 +03:00
Marios Andreopoulos 3d79f59671 fix wrong variable name 2014-08-25 20:20:44 +03:00
Marios Andreopoulos b40922f4d4 remove extra comma 2014-08-25 20:07:47 +03:00
Marios Andreopoulos 12639c577f Remove newline characters from ssh key before processing it.
Fixes issue #370: https://github.com/gogits/gogs/issues/370
2014-08-25 18:54:50 +03:00
Unknwon bba707de36 Finish team list, create new team, join/leave team page 2014-08-16 16:21:17 +08:00
Unknwon 5acc948562 Page: /org/:orgname/settings 2014-08-14 14:12:21 +08:00
Unknwon 5fbf8531e6 Finish new home page of organization 2014-08-10 20:11:18 -07:00
Unknwon 7af7584d25 Finish new reset password, etc. 2014-08-09 21:02:00 -07:00
Unknwon 5605af973b Feature: Social sign in 2014-08-09 18:01:29 -07:00
Unknwon 78defd238c Page: Manage social accounts 2014-08-09 17:25:02 -07:00
Unknwon e8c9bb2c66 Finish new collaboration page 2014-08-07 06:40:05 -04:00
Unknwon a8e05fdf1b Use toolbox 2014-08-06 17:21:24 -04:00
Unknwon 7bbf644dd5 Convert captcha, cache, csrf as middlewares 2014-07-31 17:25:34 -04:00
Unknwon 9813161411 Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page 2014-07-26 23:53:16 -04:00
Unknwon 5e81383413 Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module 2014-07-26 18:37:18 -04:00
Unknwon 5c4bc3c848 Huge updates!!!!! Be careful to merge!!!! 2014-07-26 02:28:04 -04:00
Unknwon 8dd07c0ddd New UI merge in progress 2014-07-26 00:24:27 -04:00
无闻 536f65b8ad Merge pull request #293 from wmark/master
Enable users to upload other key types than RSA (+ ED25519, ECDSA, NTRU, McE)
2014-07-20 21:05:27 -04:00
W-Mark Kubacki 887ad1ec8b Utilize ssh-keygen for checking of keys.
Removes the limitation to RSA and enables us to use all key types
SSH recognizes.
2014-07-20 18:56:07 +02:00
Unknown 0f907301b7 Fix #285 2014-07-12 00:55:19 -04:00
Unknown 5dbfe3c26c Finish organization homepage 2014-06-28 15:43:25 -04:00
Unknown 6e448b0714 Finish delete organization 2014-06-28 00:40:07 -04:00
Unknown ee9b7f322f Clean code 2014-06-27 23:14:33 -04:00
Unknown e0f9c628c5 Add create organization 2014-06-25 00:44:48 -04:00
Unknown 98f614a58e Work on #249 issue1 2014-06-23 19:16:09 -04:00
Unknown 314193029a Use constants to name template file 2014-06-22 23:11:12 -04:00
Unknown 4f2f3c2857 Code convention 2014-06-05 22:07:35 -04:00
Unknown 2657f88d9a Fix #222 2014-05-31 17:15:04 -04:00
Unknown 688ec6ecbd Fixed #209 2014-05-25 20:11:25 -04:00
Unknown 80055bde86 Code convention 2014-05-24 15:28:31 -04:00
Sebastian Jackel 02fb088b80 Remove password from log message on failed login 2014-05-19 09:16:56 +02:00
Unknown 9100786beb Fix #185 2014-05-14 08:51:04 -04:00
Unknown 33ec0632ff Fix #183 2014-05-13 19:26:13 -04:00
Michael Litvak cca2a53d6f Fix issue link in issues page
The link assumes that the issue belongs to the signed in
user, which is not necessarily the case
I changed it to use repository owner name instead
2014-05-13 23:37:09 +03:00
Unknown a913aff1d0 Show collaborative repositories in dashboard 2014-05-12 15:14:22 -04:00
Lunny Xiao 55019bfbc5 merge all login methods 2014-05-11 14:12:45 +08:00
Unknown 25713ab209 Fix #167 2014-05-08 20:00:07 -04:00
Unknown 914ffa496f Show private repository activities in dashboard if has access 2014-05-08 19:17:43 -04:00
Unknown 33d32585b1 Add mention, read/unread support of issue tracker 2014-05-07 16:51:14 -04:00
Unknown 7407f9caf3 Finish issue design 2014-05-07 12:09:30 -04:00
Unknown 8ca14e2109 Improve delete SSH key 2014-05-06 16:28:52 -04:00
Unknown 6e3dba2cc5 Clean repo code 2014-05-05 19:58:13 -04:00
Unknown bbdfe25769 User code clean and ui improve 2014-05-05 16:21:43 -04:00
Unknown 89c99167b2 Fix #149 2014-05-01 08:26:41 -04:00
Unknown 41b0a7b97c Mirror fix on public key 2014-04-27 17:01:39 -04:00
Unknown 62240b6bc1 Add login by email 2014-04-27 01:54:08 -06:00
Unknown 59d0e73c35 Batch mirror fix 2014-04-26 22:34:48 -06:00
无闻 37cbfc032a Merge pull request #112 from juju2013/master
basic support for LDAP/Microsoft Active Directory authentication
2014-04-24 14:25:56 -06:00
James Anderson e5af34a078 fixed some broken forms that were introduced in james-anderson@521c5f0e10 2014-04-24 14:50:24 -04:00
juju2013 efc05ea1de initial support for LDAP authentication/MSAD 2014-04-23 23:07:54 +02:00
Bryan Johnson 34d18a19a3 Minor grammatical fix for Disable Registration feature 2014-04-21 18:03:04 -04:00
Unknown b32e223db5 Mirror fix 2014-04-18 21:17:43 -04:00
Unknown 8719c1b8c5 Mirror bug fix 2014-04-18 12:12:10 -04:00
Unknown d2b53dd43b Add weibo oauth 2014-04-13 21:00:12 -04:00
Unknown 4b9b8024ba Clean oauth code 2014-04-13 18:12:07 -04:00
Unknown 5c2da610a2 Move binding as subrepo 2014-04-13 01:57:42 -04:00
Unknown 90f6aa8cd1 Add repo mirror and import 2014-04-12 20:35:35 -04:00
skyblue 75d2affcbf add oauth2 qq support 2014-04-13 01:15:19 +08:00
skyblue 2ce0c3befe add google oauth2 support 2014-04-12 23:19:17 +08:00
skyblue 5c1312f38e clean oauth2 code 2014-04-12 09:42:09 +08:00
skyblue 4c6e0e9499 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-12 01:01:40 +08:00
skyblue dd815ae7b5 finish github oauth2 support 2014-04-12 01:01:30 +08:00