summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add label-edit and label-delete logicfuxiaohei2014-12-225-43/+141
|
* Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2014-12-223-8/+17
|\
| * Merge pull request #771 from phsmit/multiple_email_cleanup无闻2014-12-222-7/+16
| |\ | | | | | | Create English locale keys for multiple e-mails feature
| | * Forgot to i18n "Primary"Peter Smit2014-12-222-1/+2
| | |
| | * Create English locale keys for multiple e-mails featurePeter Smit2014-12-222-7/+15
| |/ | | | | | | | | Also, change all current 'emails' to 'e-mails'. Still todo: some CSS for the user/settings/email page, but that is not my specialty
| * Merge pull request #767 from phsmit/fix_email_query无闻2014-12-211-1/+1
| |\ | | | | | | Fix for wrong email query
| | * Fix for wrong email queryPeter Smit2014-12-211-1/+1
| |/ | | | | | | Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
* / fix invite bug(shouldn't include full name to search box)Unknwon2014-12-224-6/+7
|/
* Merge pull request #766 from phsmit/correct_from无闻2014-12-213-11/+12
|\ | | | | Correct usage of FROM in email creation
| * Parse the from string to extract the email addressPeter2014-12-192-2/+7
| |
| * Remove unused "User" member of Message Struct and fix bounce addressPeter2014-12-192-9/+6
| | | | | | | | | | | | 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
| * Change from header in email, fixes #765Peter2014-12-192-3/+2
| |
* | mirror fix and updateUnknwon2014-12-204-6/+8
| |
* | Merge pull request #755 from phsmit/multiple_emails无闻2014-12-2010-9/+437
|\ \ | | | | | | Multiple emails
| * | Small fixes to multiple_emails featurePeter2014-12-202-13/+13
| | |
| * | Finish method for having multiple emails/user.Peter2014-12-175-0/+178
| | | | | | | | | | | | | | | All basics are implemented. Missing are the right (localized) strings and the page markup could have a look at by a frontend guy.
| * | Template for email activation emailPeter2014-12-171-0/+30
| | |
| * | Method for activating email addresses through verification emailPeter2014-12-172-0/+54
| | |
| * | Add function to the model for email address management (add/delete/activate)Peter2014-12-171-0/+133
| | |
| * | Add alternative email addresses to the modelPeter Smit2014-12-172-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #764 from phsmit/fix_mailer无闻2014-12-191-4/+0
|\ \ \ | |_|/ |/| | Remove standard mailer port lines
| * | Remove standard mailer port linesPeter2014-12-191-4/+0
|/ / | | | | | | This lines got committed by accident. They do actually nothing, as SplitHostPort will give an error if port is not given.
* | update locale and mirror code formatUnknwon2014-12-193-34/+34
| |
* | Merge pull request #762 from phsmit/crammd5无闻2014-12-181-6/+13
|\ \ | | | | | | Crammd5
| * | Prefer CRAM-MD5 over PLAIN authenticationPeter2014-12-181-3/+3
| | |
| * | Add option to use CRAM-MD5 as authentication method in the mailerPeter2014-12-181-6/+13
| | |
* | | Merge pull request #761 from phsmit/mailer_rewritten无闻2014-12-183-19/+49
|\| | | | | | | | Rewrite of SendMail function
| * | Rewrite of SendMail functionPeter2014-12-183-19/+49
|/ / | | | | | | | | | | 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.
* | work on #754Unknwon2014-12-181-0/+3
| |
* | work on #754Unknwon2014-12-182-1/+4
| |
* | work on #756Unknwon2014-12-173-2/+4
|/
* fix #751Unknwon2014-12-161-0/+9
|
* fix #741Unknwon2014-12-165-9/+22
|
* fix binding api brokenUnknwon2014-12-155-26/+32
|
* update localeUnknwon2014-12-143-25/+25
|
* prepare for 0.5.9Unknwon2014-12-132-2/+2
|
* update gopmfileUnknwon2014-12-131-4/+4
|
* update localesUnknwon2014-12-134-3/+99
|
* modes/repo: incorrect SSH clone URL for #742Unknwon2014-12-136-37/+52
|
* api: able to create repo and fix #726Unknwon2014-12-1214-81/+162
| | | | | - POST /user/repos - POST /org/:org/repos
* fix #735Unknwon2014-12-125-2/+28
|
* mirror code cleanUnknwon2014-12-113-4/+3
|
* Merge pull request #731 from cryptix/dev无闻2014-12-111-1/+4
|\ | | | | increase minimum version for HTTPS to TLS 1.0 (POODLE, fixes #730)
| * increase minimum version vor HTTPS to TLS 1.0 (POODLE, fixes #730)Henry2014-12-111-1/+4
|/
* fix git clone error when repo has upper case namecodeskyblue2014-12-111-0/+1
|
* mirror fix on release JSUnknwon2014-12-102-5/+10
|
* Finish new UI for release pageUnknwon2014-12-1016-239/+520
|
* fix #703Unknwon2014-12-102-46/+48
|
* fix compile errorUnknwon2014-12-103-8/+6
|
* Merge pull request #727 from Mageti/master无闻2014-12-101-7/+2
|\ | | | | Correction for #723