无闻
37566f71a9
Merge pull request #787 from andre-hub/dev
...
flexible the build scripts and add a freebsd build script
2014-12-29 20:07:10 +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
Unknwon
63c1f9a23f
fix 500: E-mail already used in user settings page
2014-12-29 20:00:07 +08:00
Unknwon
81a44e4cd0
fix API changes
2014-12-28 20:40:35 +08:00
euank
f059866a21
Set user.name & user.email in Dockerfile
...
The previous setting would cause all repo creations to fail, as
described in issue #328 .
The previous commit also resolves this issue, but it seems saner to
create the user in the Dockerfile than at runtime.
2014-12-27 19:10:33 -08:00
euank
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
André Grötschel
35dd41c3a2
merge flexible the build scripts and add a freebsd build script
2014-12-27 15:28:45 +01:00
André Grötschel
afc659442d
flexiable the build scripts and add a freebsd build script
2014-12-27 15:16:05 +01:00
Unknwon
6a6636d451
Merge branch 'master' of github.com:gogits/gogs into dev
2014-12-27 12:38:18 +08:00
无闻
46742a79ca
Merge pull request #785 from joshk/patch-1
...
Use the new build env on Travis
2014-12-27 12:25:08 +08:00
无闻
d61def86e1
Merge pull request #780 from morpheyesh/master
...
spellcheck
2014-12-27 12:24:21 +08:00
Josh Kalderimis
30c750a5df
Use the new build env on Travis
...
http://docs.travis-ci.com/user/workers/container-based-infrastructure
2014-12-27 01:23:10 +01:00
morpheyesh
995a805a31
spellcheck
2014-12-24 13:20:10 +05:30
fuxiaohei
c0cfd62b90
add label-edit and label-delete logic
2014-12-22 21:26:05 +08:00
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
无闻
0d7bb9af46
Merge pull request #769 from gitter-badger/gitter-badge
...
Add a Gitter chat badge to README.md
2014-12-21 02:58:38 -05:00
The Gitter Badger
86e9ebdcc9
Added Gitter badge
2014-12-21 07:53:06 +00: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
