tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
5354 commits 11 branches 231 tags 581 MiB
Commit graph

375 commits

Author SHA1 Message Date
Unknwon
39a3b768bc #334: 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 #1204 2015-07-31 13:53:14 +08:00
无闻
333ab1b2b4 Merge pull request #1317 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 #1070 Clearer error message for illegal characters 2015-03-26 17:11:47 -04:00
无闻
e312634286 Merge pull request #1091 from sapk/fix-ng-issue-pages 
Apply ng to issue dashboard
 2015-03-19 17:03:03 -04:00
Unknwon
1cb57b1a44 #1094: 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 #1067: 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 #1040: dashboard no longer accessible when repo is missing 2015-03-16 04:04:27 -04:00
无闻
f92bfabf86 Merge pull request #960 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
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
Unknown
11f54b1426 Mirror bug fix 2014-04-11 12:14:11 -04:00
Unknown
8980675a9f Fix #69 2014-04-10 18:09:57 -04:00
Unknown
45462662e9 Add flash 2014-04-10 16:36:50 -04:00
Unknown
5d4025cb5a Add go get meta support 2014-04-09 21:42:25 -04:00
skyblue
8683d2f857 remove martini oauth2 depend 2014-04-10 00:07:57 +08:00
Unknown
a991ebf5d0 Fix #54 2014-04-08 15:27:35 -04:00
skyblue
24d0ca4aa0 clean tail 2014-04-09 00:31:09 +08:00
skyblue
d4565483e6 add id for oauth2 2014-04-09 00:26:12 +08:00
Unknown
9ea9818d32 Fix issue with log in with GitHub but need more error handle after 2014-04-07 12:56:40 -04:00
skyblue
05fb34eacd first works oauth2(github). need to login with /user/login/github 2014-04-07 18:01:25 +08:00
Unknown
e7c8a3cb8d Add salt for every single user 2014-04-06 16:10:57 -04:00
Unknown
b7c3b0cc73 Add reset password, fix #58 2014-04-05 12:32:34 -04:00
Unknown
e9c4156c87 Add: rename user 2014-04-03 16:33:27 -04:00
skyblue
adf42a5b54 change oauth2 to modules 2014-04-02 22:27:54 +08:00
skyblue
93f6e98047 change oauth2 path 2014-04-02 22:23:45 +08:00
skyblue
5180506678 split into social.go 2014-04-02 10:39:04 +08:00
skyblue
272c27c8f2 add github social login, first step 2014-04-02 08:14:56 +08:00
Unknown
d0e6a4c25a Change new martini impot path 2014-03-30 12:11:28 -04:00
Unknown
107a1eadac Finish close and reopen issue, install page, ready going to test stage of v0.2.0 2014-03-29 17:50:51 -04:00
Unknown
8282828820 Fix action email bug 2014-03-29 07:50:25 -04:00
Unknown
eb6021f73f Fix issue pages URL params 2014-03-27 19:42:10 -04:00
Unknown
34f4af9ebf Working on issue and install page 2014-03-27 16:31:32 -04:00
FuXiaoHei
23d103c721 issue list in user 2014-03-25 23:00:26 +08:00
FuXiaoHei
47493a0191 use ctx.Handle to handle 404 page 2014-03-23 13:12:55 +08:00
Unknown
7356153ba3 Batch updates 2014-03-22 17:59:22 -04:00
Unknown
cb52f6d07d Add auto-login 2014-03-22 16:40:09 -04:00
slene
f9c07c4186 update session 2014-03-22 20:49:53 +08:00
Unknown
d40499e7fa Finsih mail resend limit 2014-03-21 10:09:57 -04:00
Unknown
30618b271a Add admin edit user 2014-03-21 06:15:58 -04:00
Unknown
369ddf76a8 Batch fix 2014-03-21 01:09:22 -04:00
Unknown
3b387336bf Add Repository/user name filter 2014-03-20 11:41:24 -04:00
Unknown
4cf6cc63b0 Work on admin 2014-03-20 08:02:14 -04:00
Unknown
9f9cd6bfc6 Work on admin 2014-03-20 07:50:26 -04:00
Unknown
5cb2d3d2e2 Bug fix 2014-03-20 03:24:17 -04:00
Unknown
a922c3ff6a Watch backend 2014-03-19 23:20:55 -04:00
Unknown
6f68620860 Pools limit concurrent nums 2014-03-19 21:05:48 -04:00
Unknown
35d473f04a Finish verify email 2014-03-19 12:50:44 -04:00
Unknown
a22c4ba71d Merge branch 'master' of github.com:gogits/gogs 2014-03-19 10:46:53 -04:00
Unknown
ddbd2ce152 Add register mail tpl 2014-03-19 10:46:48 -04:00
FuXiaoHei
a63b5982b5 top nav arrow update 2014-03-19 22:25:27 +08:00
slene
199fdd0336 fork render 2014-03-19 22:21:03 +08:00
slene
483cc31369 Revert "fork render" 
This reverts commit 56af7e99a8.
 2014-03-19 22:11:28 +08:00
Gogs
56af7e99a8 fork render 2014-03-19 21:58:51 +08:00
Unknown
a2fbb24615 Add active page 2014-03-19 09:24:02 -04:00
Unknown
de087c7b4a Add send register confirm mail 2014-03-19 08:27:27 -04:00
Unknown
fbbae2b721 Working on register mail confirmation 2014-03-19 07:21:23 -04:00
Unknown
bd9d90d8c4 Add some log 2014-03-19 04:48:45 -04:00
Unknown
fbd252c1cf Mirror fix 2014-03-18 18:31:54 -04:00
shengxiang[skyblue]
ccd43b09b2 add some comment 2014-03-18 21:58:58 +08:00
Unknown
ec65be79f0 Fix commit feed ui 2014-03-16 12:07:35 -04:00
Unknown
425a58afd6 Bug fix 2014-03-16 10:35:25 -04:00
slene
f6e32b1b08 finish delete ssh key and delete account. all with confirm. 2014-03-16 21:07:50 +08:00
Unknown
0754dd2f95 Add delete all feeds when delete account 2014-03-16 06:38:39 -04:00
Unknown
fb960db6af Add check if public key name has been used 2014-03-16 06:25:16 -04:00
Unknown
8de9517862 Mirror fix 2014-03-16 03:41:22 -04:00
Unknown
dfcae2a97a Add repo list data, need front-end fix 2014-03-15 12:13:45 -04:00
Unknown
b43cfc5b39 Clean code 2014-03-15 10:52:14 -04:00
slene
b9e57e41ce clean code 2014-03-15 22:34:33 +08:00
Unknown
f174633b36 Clean code 2014-03-15 09:17:16 -04:00
slene
a33d03f008 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	routers/user/user.go
	web.go
 2014-03-15 20:39:56 +08:00
slene
fa5ad1e465 move templateFuncs to one file, add middleware context. 2014-03-15 19:01:50 +08:00
Unknown
4b8e888437 Finish feeds 2014-03-15 05:30:59 -04:00
slene
06deed820d Add HomeLink and AvatarLink to User model. Please use .SignedUser in template. 2014-03-15 15:28:06 +08:00
Unknown
adb17791bd Add basic render of public act 2014-03-15 00:50:51 -04:00
FuXiaoHei
d18237850c add draft page for empty link 2014-03-14 17:12:28 +08:00
Unknown
1ce17cce76 Add log.handle 2014-03-14 01:59:07 -04:00
Unknown
47edf7f4f9 Finish update password and profile 2014-03-14 01:12:07 -04:00
FuXiaoHei
9c0672e0dd user update-password page ui 2014-03-14 11:24:08 +08:00
Unknown
c01f593daa Add updatePasswd 2014-03-13 04:06:35 -04:00
Unknown
76dae5bf68 Bug fix 2014-03-13 03:44:56 -04:00
Unknown
57bc2d1ca0 Add update user profile back end, add new gitignore and license, add template data to public profile page 2014-03-13 03:39:18 -04:00
Unknown
ea765d25e2 Update action struct 2014-03-13 02:09:36 -04:00
FuXiaoHei
37fae304d3 single repository page ui, add spec handler to get repo 2014-03-13 13:14:43 +08:00
Unknown
12f81de349 Finish delete user 2014-03-11 11:40:47 -04:00
Lunny Xiao
b5cc4078a9 add repo list of dashboard 2014-03-11 14:17:05 +08:00
FuXiaoHei
7f92579905 finish user delete page ui 2014-03-11 11:41:38 +08:00
Unknown
52837e3d36 Clean code 2014-03-10 20:53:30 -04:00
Unknown
897329a644 Add add and delete SSH key 2014-03-10 20:48:58 -04:00
FuXiaoHei
efa039a0f7 finish ssh key pages ui 2014-03-10 21:12:49 +08:00
Lunny Xiao
3ca7a33907 add del publickey 2014-03-10 17:15:02 +08:00
FuXiaoHei
46687f391c ssh keys operation page ui 2014-03-10 16:54:52 +08:00
Unknown
76ce6f9848 Update repo.Create 2014-03-08 21:25:38 -05:00
Unknown
5a05d6633d Merge utils to modules 2014-03-07 17:22:15 -05:00
Unknown
a2a59f8ad1 Change /user/profile URL to /user/:username 2014-03-07 17:08:21 -05:00
Unknown
ba5c7ea771 Add SignInRequire and SignOutRequire middleware 2014-03-07 16:05:18 -05:00
Lunny Xiao
8e821c75d7 add publickey list 2014-03-07 11:34:41 +08:00