mirror of
1
Fork 0
Commit Graph

1906 Commits

Author SHA1 Message Date
Unknwon ebbe6177a9 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-12-22 03:44:52 -05:00
Unknwon 97b39ae2e4 fix invite bug(shouldn't include full name to search box) 2014-12-22 03:44:49 -05:00
无闻 0f77ad219c Merge pull request #771 from phsmit/multiple_email_cleanup
Create English locale keys for multiple e-mails feature
2014-12-22 02:43:20 -05: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
无闻 350e0080e6 Merge pull request #767 from phsmit/fix_email_query
Fix for wrong email query
2014-12-21 02:23:36 -05: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
无闻 030b3d751e Merge pull request #766 from phsmit/correct_from
Correct usage of FROM in email creation
2014-12-21 01:55:28 -05:00
Unknwon 79537467da mirror fix and update 2014-12-20 22:51:16 -05: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
无闻 e6e2cf7855 Merge pull request #764 from phsmit/fix_mailer
Remove standard mailer port lines
2014-12-19 17:20:13 -05: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
Unknwon b231b8c927 update locale and mirror code format 2014-12-19 00:24:17 -05:00
无闻 d01e7b0173 Merge pull request #762 from phsmit/crammd5
Crammd5
2014-12-18 16:49:11 -05:00
无闻 bb267e30b6 Merge pull request #761 from phsmit/mailer_rewritten
Rewrite of SendMail function
2014-12-18 16:37:24 -05: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
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 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
Unknwon d01f2f3c22 fix #751 2014-12-16 20:47:10 -05:00
Unknwon 1a5aa5e0c0 fix #741 2014-12-16 02:28:57 -05:00
Unknwon 9803c421f5 fix binding api broken 2014-12-15 01:49:59 -05:00
Unknwon 792ec63c8a update locale 2014-12-14 22:47:09 -05:00
Unknwon c9e0b3b987 prepare for 0.5.9 2014-12-13 20:32:30 -05:00
Unknwon 28766479a7 update gopmfile 2014-12-13 20:26:04 -05:00
Unknwon 9ac940d31d update locales 2014-12-13 20:06:50 -05:00
Unknwon b553ea45ee modes/repo: incorrect SSH clone URL for #742 2014-12-13 16:46:00 -05:00
Unknwon ac4a10456e api: able to create repo and fix #726
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
Unknwon 2f3a7e53cb fix #735 2014-12-12 01:29:36 -05:00
Unknwon 42c7bb7529 mirror code clean 2014-12-11 18:55:09 -05:00
无闻 35140f1cc7 Merge pull request #731 from cryptix/dev
increase minimum version for HTTPS to TLS 1.0 (POODLE, fixes #730)
2014-12-11 18:32:49 -05:00
Henry 4f4392b83e increase minimum version vor HTTPS to TLS 1.0 (POODLE, fixes #730) 2014-12-11 11:14:41 +01:00
codeskyblue db6c0ebf76 fix git clone error when repo has upper case name 2014-12-11 15:57:32 +08:00
Unknwon cf7ebfbdc8 mirror fix on release JS 2014-12-10 16:41:49 -05:00
Unknwon bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon 01ba771783 fix #703 2014-12-10 07:00:11 -05:00
Unknwon 9ee80e3e54 fix compile error 2014-12-10 05:10:26 -05:00
无闻 b2c6a6920f Merge pull request #727 from Mageti/master
Correction for #723
2014-12-10 05:03:50 -05:00
Mageti e321469884 remove unused code in BasicAuthDecode 2014-12-10 11:01:17 +01:00