cd8b43d984
Merge pull request #915 from Lafriks/dev
...
Get username, name, surname and e-mail from LDAP server
2015-02-23 13:41:29 -05:00
556881964f
Merge branch 'access' into access_rewriteserv
2015-02-23 12:34:41 +02:00
ee68a826a5
v4 migration, merge 'dev', clean code and mirror fix
2015-02-23 02:15:53 -05:00
e90f014e4a
Merge branch 'access' of github.com:gogits/gogs into access
2015-02-22 23:34:05 -05:00
10e4b5b6c6
Merge branch 'access' of github.com:gogits/gogs into access
2015-02-22 22:55:35 -05:00
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
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
3fcc39c26b
Merge branch 'dev' of github.com:gogits/gogs into dev
2015-02-21 22:13:50 -05:00
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
4f567edc6e
Fix #933
...
Not sure why, but xorm ignores the num_issues and num_closed_issues
columns when updating, even though the values changed.
Listing them explicitly fixes the issue with the wrong issue counts
2015-02-21 09:37:48 +01:00
e6fc58a744
Remove GoGet option from repository and handle it with ?go-get=1 instead
...
The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
2015-02-17 10:36:17 +02:00
aa68e86206
Rewrite/simplify gogs serve
2015-02-16 16:38:01 +02:00
b6519f78c7
Remove collaborators when removing and transferring repository
2015-02-16 13:34:42 +02:00
685ed1f807
models: fix XORM API break
...
cmd/web.go: check version after load config
2015-02-14 17:01:33 -05:00
0009a1d2b1
Fix access for team mode update
2015-02-13 23:12:33 +02:00
ddf7014b9b
Rewrite of access migration
...
The old migration had a few issues:
- It left old column names around
- It did not give the right access levels for owners and admins
Also, this includes a migration that fixes the authorization of owner teams, which was previously ORG_ADMIN (instead of ORG_OWNER)
2015-02-13 13:58:19 +02:00
25f5a8d798
some fixes, but not done yet!
2015-02-13 02:56:42 -05:00
6b7d35eade
fix mirror issues uncaught #941
2015-02-13 02:14:57 -05:00
6d0f3a07d4
code fix #941 caution: undertest
2015-02-13 00:58:46 -05:00
b99c4baab2
models/migrations: finish accessRefactor
2015-02-12 22:43:32 -05:00
7fda0cdb93
Merge pull request #941 from phsmit/access_refactor
...
Access refactor
2015-02-12 21:34:27 -05:00
0b3722c359
models/migrations: fix little logic error
2015-02-12 12:46:21 -05:00
67a9416ae5
templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled #884
2015-02-12 12:38:44 -05:00
6c1ee384f1
Merge remote-tracking branch 'mine/access_refactor' into access_refactor
...
Conflicts:
cmd/serve.go
models/access.go
models/migrations/migrations.go
models/org.go
models/repo.go
models/user.go
modules/middleware/org.go
modules/middleware/repo.go
routers/api/v1/repo.go
routers/org/teams.go
routers/repo/http.go
routers/user/home.go
2015-02-12 14:25:07 +02:00
0a4cda0dd4
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-12 14:14:45 +02:00
2804784df9
Some comments and improvements for migrations
2015-02-12 13:59:42 +02:00
876a856759
models/migartions: make Migration as interface and use session
2015-02-11 23:10:30 -05:00
7e7160eefd
first pass work on migration #925
2015-02-11 21:58:37 -05:00
c5c467a9cd
Merge branch 'dev' of github.com:gogits/gogs into access
2015-02-11 19:25:59 -05:00
c7a042ef36
Merge branch 'access' of github.com:gogits/gogs into access
2015-02-11 12:43:43 -05:00
e805fdb29c
Merge pull request #925 from phsmit/newcollaboration
...
Collaboration
2015-02-11 12:43:13 -05:00
d02e45f985
better naming on #891
2015-02-11 12:04:01 -05:00
485ea6f14f
models: make code change for session issue with SQLite3 #739
2015-02-10 23:44:16 -05:00
6a23252edc
able to allow insecure certification of webhook for #891
2015-02-10 21:06:59 -05:00
bad533a219
models/repo.go: add update hook when migrate for #789
2015-02-09 12:42:53 -05:00
0d158e569b
Change constants to UPPERCASE_WITH_UNDERSCORE style
2015-02-09 13:36:33 +02:00
aa35be975f
Fix #922
2015-02-09 12:27:15 +02:00
6ed96b7a20
Merge pull request #911 from TonyTsangHK/dev
...
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-09 00:31:16 -05:00
f15fa9167a
cmd: code fix for #905
...
- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)
2015-02-08 21:26:14 -05:00
cd0ee35b3f
Merge pull request #905 from phsmit/conf_on_cli
...
Add option to provide configuration file on command line
2015-02-08 20:22:02 -05:00
00653e52ee
Get username, name, surname and e-mail from LDAP server
2015-02-08 01:49:51 +02:00
ba77a3b0b4
routers/repo/http.go: allow HTTP push/pull by token for #845
2015-02-07 15:47:23 -05:00
19525abfc4
Merge pull request #845 from compressed/token_http
...
allow http push by token - #842
2015-02-07 15:27:59 -05:00
2a2596fe61
able to disable SSH for #883
2015-02-07 10:46:57 -05:00
5a99e9a37b
models/action.go: add action reopen for #462
...
- models/issue.go: format comment type names
2015-02-06 20:47:21 -05:00
afccd0a3ee
models/action.go: mirror fix on #892
...
- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code
2015-02-06 20:34:49 -05:00
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
fc6d80d619
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-06 17:02:32 +08:00
1ab09e4f1b
Add option to provide configuration file on command line
2015-02-05 12:17:35 +02:00
03af37554e
Merge branch 'dev' into newcollaboration
2015-02-05 11:08:10 +02:00
02c5bade0f
Merge pull request #892 from EtienneBruines/commit_reference
...
Referencing issues from commit messages is now possible.
2015-02-04 23:21:20 -05:00
f706102890
models: sanitize user full name when update settings
2015-02-04 20:04:01 -05:00
fd1df86c44
Fix dashboard issue after collaboration migration
2015-02-04 16:08:55 +02:00
bef38d9d3f
Fix collaboration migration code
2015-02-04 16:03:39 +02:00
4de0b19cec
models: mirro code fix for #821
2015-02-02 23:42:53 -05:00
902f19f70b
Merge pull request #821 from phsmit/fix_819
...
Fix #819 by fetching the repository from db before updating
2015-02-02 23:38:04 -05:00
5c4b85c029
Referencing issues from commit messages is now possible.
...
Code-wise: the fixing-part of the code now doesn't reference the issue any more, because this is done by the referencing-part of the code, which is called just before.
Fixes #462 , #668 , #732 .
2015-02-02 16:34:07 +01:00
0a2068d7fb
models: code fix on #818
2015-02-01 17:21:56 -05:00
cd6376f093
Merge pull request #818 from fzerorubigd/master
...
add a function to rewrite all public keys on admin request
2015-02-01 16:56:34 -05:00
b293b6eaa6
cmd: CMD option for port number of `gogs web` to prevent first time run conflict
...
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
2015-02-01 12:41:03 -05:00
ee6786216a
modules/base: clean code with #838
2015-01-30 18:12:30 -05:00
76f8904718
Introducing Collaboration Struct
2015-01-23 09:54:16 +02:00
4ef3245413
Migration code: errors are not to be forgotten
2015-01-22 15:01:45 +02:00
2a70d6b723
Clean up migrations code
2015-01-22 14:56:50 +02:00
bb103e8723
Create db migrations framework
2015-01-22 14:52:58 +02:00
161774d4fb
Merge pull request #825 from phsmit/ssh2_keys
...
Implement #798 Flexible ssh-key input
2015-01-22 19:39:35 +08:00
452cca35e0
Merge branch 'encoding' of github.com:gogits/gogs into dev
...
Conflicts:
.gopmfile
2015-01-17 15:29:45 +08:00
d0827e5d5e
allow http push by token - #842
2015-01-08 09:30:22 -05:00
bb26285a12
fix #827
2015-01-06 17:14:49 +08:00
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
c73e9057ae
Optmize git-fsck options and fix #820
2015-01-02 20:14:43 +08:00
44fa9147b7
Fix #819 by fetching the repository from db before updating
2015-01-02 11:15:42 +02:00
0b56272c13
fix #805
2015-01-02 13:30:45 +08:00
3ea1443885
work on #784
2015-01-02 12:47:33 +08:00
6643647687
add afunction to rewrite all public keys on admin request
...
refs #763
2015-01-01 02:15:52 +03:30
bd555551ce
fix #801
2014-12-31 18:37:29 +08:00
477bea574a
Merge pull request #782 from estetsenko/dev
...
fix for #747
2014-12-29 20:08:39 +08:00
afdb0c7f9d
Merge pull request #790 from euank/master
...
Initialize unset git user.email / user.name correctly; fix Dockerfile
2014-12-29 20:06:27 +08:00
63c1f9a23f
fix 500: E-mail already used in user settings page
2014-12-29 20:00:07 +08:00
234a7c19a4
Default values for both user.name and user.email
...
The previous behavior was to set default values only if user.name was
not set, but to always set it for both. This only sets a value if there
wasn't one; this fixes cases where someone has a user.name but no
user.email (see included Dockerfile) or someone has a user.email but no
user.name (before the email would have been over-written).
2014-12-27 19:07:54 -08:00
bae1d65564
bugfix: Unable to assign any issue myself
2014-12-24 20:47:45 +03:00
3af757ed77
Replace mahonia with the standard functions in the Golang Sub-repositories
2014-12-22 11:01:52 +02:00
66e2016eeb
Fix for wrong email query
...
Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
2014-12-21 09:16:56 +02:00
a18decf4cc
Merge pull request #755 from phsmit/multiple_emails
...
Multiple emails
2014-12-20 22:47:05 -05:00
20b5c23a19
Small fixes to multiple_emails feature
2014-12-20 09:26:51 +02:00
c4820f119d
work on #754
2014-12-18 03:26:09 -05:00
6919c80f0b
Add function to the model for email address management (add/delete/activate)
2014-12-17 17:40:10 +02:00
99599c099f
Add alternative email addresses to the model
...
A new struct is created named EmailAddress that contains alternative
email addresses for users. Also the email related methods; IsEmailUsed
and GetUserByEmail are updated.
DeleteUser deletes the extra email addresses and DeleteInactivateUsers
also deletes inactive accounts. This could be factored out, but should
do it for now.
2014-12-17 10:26:19 +02:00
b553ea45ee
modes/repo: incorrect SSH clone URL for #742
2014-12-13 16:46:00 -05:00
ac4a10456e
api: able to create repo and fix #726
...
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
2f3a7e53cb
fix #735
2014-12-12 01:29:36 -05:00
9a1fe801e5
fix #711
2014-12-09 02:18:25 -05:00
39c068400e
Fix spelling errors in comments.
2014-12-06 20:22:48 -05:00
0b785ad967
work on #672
2014-12-05 18:08:09 -05:00
e577f2fff3
fix #706 and other mirror improve
2014-12-04 23:07:51 -05:00
00cf3e4dab
Use the avatar.HashEmail function instead of hashing email directly. Fixes #700
2014-12-03 16:19:35 -07:00
5338808600
fix #676
2014-11-30 18:29:16 -05:00
d75013a0e8
fix #580
2014-11-30 02:26:29 -05:00
1b66600bd0
Fix #652
2014-11-23 02:33:47 -05:00
dc53270da9
Fix 653
2014-11-22 10:22:53 -05:00
8ea7ba3afa
fix #644
2014-11-21 13:10:00 -05:00
ef275ebf62
more on change avatar
2014-11-21 12:51:36 -05:00
55dfe2c978
custom avatar upload
2014-11-21 10:58:08 -05:00
2d8c414f8c
Fix #635
2014-11-18 19:05:33 -05:00
ce8d4cc80b
#634
2014-11-18 15:13:08 -05:00
1e47e2df85
quick fix
2014-11-17 16:29:23 -05:00
5d9ef2bb12
lock gopmfile
2014-11-17 16:25:39 -05:00
d21d7171b0
Merge pull request #587 from eryx/dev
...
Fix #266
2014-11-17 16:17:52 -05:00
32dcaefafa
fox #620
2014-11-17 14:53:41 -05:00
340a4595dd
support duoshuo mirror of gravatar
2014-11-16 20:27:04 -05:00
52d66ba6c8
#12 , use go-gogs-client
2014-11-14 17:11:30 -05:00
9dc3c93a6a
#12 , add/edit hook
2014-11-13 12:57:00 -05:00
9e22840483
fix #622
2014-11-13 05:27:01 -05:00
8eb5120fbd
#12 , API: list user repos, list repo hooks
2014-11-13 02:32:18 -05:00
8c9338a537
add personal access token panel #12
2014-11-12 06:48:50 -05:00
4e7eb5be9d
Work on #5 fork and fix #608
2014-11-05 23:30:04 -05:00
0c5ba4573a
fix session API broken and SQL pretection
2014-11-04 11:37:15 -05:00
bff1e157d5
force the use of InnoDB as db engine for all tables, fixes #59
2014-10-28 16:40:09 +01:00
e84e0ab904
Fix #266
2014-10-28 10:36:47 +08:00
83283bca4c
Safe work
2014-10-25 07:50:19 -04:00
f1d8746264
Fix fork repo and macaron API broken
2014-10-24 18:43:17 -04:00
3794111460
update slack hook to use new format
2014-10-24 08:56:12 -04:00
a342d58d7e
Able to fork repo to individuals
2014-10-19 01:35:24 -04:00
d7d167ac63
Merge pull request #560 from evolvedlight/master
...
First cut of fork repo
2014-10-18 23:59:36 -04:00
e0f945959e
Replace white spaces with tab for format consistency
2014-10-14 17:31:35 +08:00
91127d9016
Fixes #562
2014-10-14 16:46:25 +08:00
8d2a6fc484
Merge remote-tracking branch 'upstream/dev'
...
Conflicts:
models/repo.go
2014-10-13 20:30:31 +01:00
29ac3980ff
More changes
2014-10-13 20:23:30 +01:00
c04aea8d9d
Fix #540
2014-10-12 02:39:00 -04:00
0d7b9065c6
Fix #540
2014-10-12 02:06:46 -04:00
452ccff81c
Mirror fix on add ssh key
2014-10-11 21:04:42 -04:00
fb839ca0fb
More debug info
2014-10-11 20:34:48 -04:00
b7b7863364
Work on ssh key issue
2014-10-11 20:06:35 -04:00
963354c5d7
Add raw, history file button, and other mirror fixes
2014-10-11 18:02:48 -04:00
e848b17fab
bug fixed for #540
2014-10-11 13:24:36 +08:00
b2632dec09
Page: Compare 2 commits
2014-10-10 21:40:51 -04:00
211dc74816
Got the fork count working
2014-10-10 00:21:36 +01:00
79262173a6
Webhook delivery locking & Hide repo for org members if they don't have access
2014-10-09 19:01:22 -04:00
1aa76bd279
Fix #532 , add system notice
2014-10-08 18:29:18 -04:00
263d409326
Basic xss prevention
2014-10-04 17:15:22 -04:00
c9e5e38fcf
Initial cut of git fork
2014-10-04 18:19:14 +01:00
405ee14711
Fix SMTP auth logic
2014-10-03 13:12:54 -04:00
86eac0842b
Fix feeds display issue
2014-09-29 18:58:04 -04:00
3cfa4a581c
Bug: 500 when transfer repository to collaborator
2014-09-29 04:04:48 -04:00
eb1e6f8e3e
support dsa key format
2014-09-29 12:37:34 +08:00
c1d047d16e
Merge pull request #508 from chadoe/homelink
...
Fix user HomeLink when using a suburl
2014-09-28 18:05:58 -04:00
38f71af363
Merge pull request #509 from chadoe/avatarlink
...
Fix AvatarLink when using a suburl
2014-09-28 18:05:35 -04:00
b7b0ee7df9
Fix minor typo
2014-09-28 22:01:05 +01:00
bb05ef907b
Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached
2014-09-28 14:27:13 +02:00
204952439a
Fix user HomeLink when using a suburl
2014-09-28 13:55:58 +02:00
无闻
Peter Smit
Raphael Randschau
Unknwon
Lauris BH
Tony Tsang
Etienne Bruines
Christopher Brickley
fzerorubigd
euank
estetsenko
Joseph Crail
Andrew Burns
luto
Eryx
evolvedlight
lunnyxiao
fundon
Martin van Beurden