Commit Graph
50 Commits
Author SHA1 Message Date
Peter Smit 556881964f Merge branch 'access' into access_rewriteserv 2015-02-23 12:34:41 +02: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 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
Peter Smit aa68e86206 Rewrite/simplify gogs serve 2015-02-16 16:38:01 +02:00
Peter Smit 7759b9ee6e Remove the "PHP" style formatting function
The "PHP" formatting function doesn't add anything, except an undocumented date format.

All usages in the templates have been replaced with DateFmtShort and DateFmtLong for convenience.
2015-02-16 14:44:27 +02:00
Peter Smit b6519f78c7 Remove collaborators when removing and transferring repository 2015-02-16 13:34:42 +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
Peter Smit ed89b39984 Updating context and fixing permission issues
The boolean flags in the repo context have been replaced with mode and two methods

Also, the permissions have been brought more in line with https://help.github.com/articles/permission-levels-for-an-organization-repository/ , Admin Team members are able to change settings of their repositories.
2015-02-16 12:51:56 +02:00
Peter Smit f9454cc32c Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Peter Smit 0009a1d2b1 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Peter Smit 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
Peter Smit 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
Peter Smit 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
Peter Smit 2804784df9 Some comments and improvements for migrations 2015-02-12 13:59:42 +02:00
Peter Smit 0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit 5cd887dba5 Fixes #921
Fixes #921 and makes the Mention regexp be in line with the others
2015-02-09 12:56:46 +02:00
Peter Smit b7e26aa5e3 Improve argument parsing for serve command 2015-02-09 12:32:42 +02:00
Peter Smit aa35be975f Fix #922 2015-02-09 12:27:15 +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 1ab09e4f1b Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Peter Smit 03af37554e Merge branch 'dev' into newcollaboration 2015-02-05 11:08:10 +02:00
Peter Smit fd1df86c44 Fix dashboard issue after collaboration migration 2015-02-04 16:08:55 +02:00
Peter Smit bef38d9d3f Fix collaboration migration code 2015-02-04 16:03:39 +02:00
Peter Smit 76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +02:00
Peter Smit 4ef3245413 Migration code: errors are not to be forgotten 2015-01-22 15:01:45 +02:00
Peter Smit 2a70d6b723 Clean up migrations code 2015-01-22 14:56:50 +02:00
Peter Smit bb103e8723 Create db migrations framework 2015-01-22 14:52:58 +02:00
Peter Smit e6f97c78ff Change chardet to gogits 2015-01-15 12:40: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
Peter Smit fd70f9ec1b Fix #799 by adding a tooltip for all dates in all settings/panels 2015-01-02 12:41:05 +02:00
Peter Smit d016eaaa09 Fix #807 parse the userinfo with the golang tools
Note, this is now only fixed with Go version >= 1.4.2, see this bug in Go: https://github.com/golang/go/commit/07d86b1f2db73c6a0716aec4d4cd62dfacb04a21
2015-01-02 12:14:11 +02:00
Peter Smit 44fa9147b7 Fix #819 by fetching the repository from db before updating 2015-01-02 11:15:42 +02:00
Peter Smit fff8109567 Removing redundant mahonia 2014-12-22 11:29:02 +02:00
Peter Smit 3af757ed77 Replace mahonia with the standard functions in the Golang Sub-repositories 2014-12-22 11:01:52 +02:00
Peter Smit 8b31be43c6 Forgot to i18n "Primary" 2014-12-22 09:41:29 +02:00
Peter Smit 21dbcb7c77 Create English locale keys for multiple e-mails feature
Also, change all current 'emails' to 'e-mails'.
Still todo: some CSS for the user/settings/email page, but that is not my specialty
2014-12-22 09:11:30 +02:00
Peter Smit 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
Peter 20b5c23a19 Small fixes to multiple_emails feature 2014-12-20 09:26:51 +02:00
Peter c884ecfea1 Parse the from string to extract the email address 2014-12-19 23:06:03 +02:00
Peter edbe1de026 Remove unused "User" member of Message Struct and fix bounce address
The User member of a message is not needed anymore.

The from that is send to the server, should always be the "system" from. This is also called the Bounce address http://en.wikipedia.org/wiki/Bounce_address
2014-12-19 22:48:21 +02:00
Peter 2321b4b272 Change from header in email, fixes #765 2014-12-19 22:33:17 +02:00
Peter 007cf33e88 Remove standard mailer port lines
This lines got committed by accident. They do actually nothing, as SplitHostPort will give an error if port is not given.
2014-12-19 22:00:11 +02:00
Peter eca42bcb44 Prefer CRAM-MD5 over PLAIN authentication 2014-12-18 14:15:13 +02:00
Peter 5ffeca35e7 Add option to use CRAM-MD5 as authentication method in the mailer 2014-12-18 13:58:48 +02:00
Peter 87be137b88 Rewrite of SendMail function
The SendMail function is rewritten and has the following new functionality:
 - It is optional to skip verification of keys. The config option SKIP_VERIFY is added
 - If the port is 465, or ending on 465, the TLS(/SSL) connection is started first.
2014-12-18 13:34:30 +02: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 f34b04cfc0 Template for email activation email 2014-12-17 17:42:31 +02:00
Peter ec71d538fc Method for activating email addresses through verification email 2014-12-17 17:41:49 +02:00
Peter 6919c80f0b Add function to the model for email address management (add/delete/activate) 2014-12-17 17:40:10 +02:00
Peter Smit 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