aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | fix gopmfileUnknwon2014-12-31
| | |
* | | fix #801Unknwon2014-12-31
| | |
* | | Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2014-12-31
|\ \ \
| * \ \ Merge pull request #797 from Mikayex/dev无闻2014-12-29
| |\ \ \ | | | | | | | | | | Fix #795
| | * | | Fix #795Thomas Laroche2014-12-29
| | | | |
| * | | | Merge pull request #782 from estetsenko/dev无闻2014-12-29
| |\ \ \ \ | | | | | | | | | | | | fix for #747
| | * | | | bugfix: Unable to assign any issue myselfestetsenko2014-12-24
| | | | | |
| * | | | | Merge pull request #787 from andre-hub/dev无闻2014-12-29
| |\ \ \ \ \ | | | | | | | | | | | | | | flexible the build scripts and add a freebsd build script
| | * \ \ \ \ merge flexible the build scripts and add a freebsd build scriptAndré Grötschel2014-12-27
| | |\ \ \ \ \
| | | * | | | | flexiable the build scripts and add a freebsd build scriptAndré Grötschel2014-12-27
| | | | | | | |
| * | | | | | | Merge pull request #790 from euank/master无闻2014-12-29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Initialize unset git user.email / user.name correctly; fix Dockerfile
| | * | | | | | | Set user.name & user.email in Dockerfileeuank2014-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | Default values for both user.name and user.emaileuank2014-12-27
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | / | | | | | fix cache dep API brokenUnknwon2014-12-31
|/ / / / / / /
* | | | / / / fix 500: E-mail already used in user settings pageUnknwon2014-12-29
| |_|_|/ / / |/| | | | |
* | | | | | fix API changesUnknwon2014-12-28
| |/ / / / |/| | | |
* | | | | Merge branch 'master' of github.com:gogits/gogs into devUnknwon2014-12-27
|\| | | | | |/ / / |/| | |
| * | | Merge pull request #785 from joshk/patch-1无闻2014-12-27
| |\ \ \ | | | | | | | | | | Use the new build env on Travis
| | * | | Use the new build env on TravisJosh Kalderimis2014-12-27
| | | | | | | | | | | | | | | http://docs.travis-ci.com/user/workers/container-based-infrastructure
| * | | | Merge pull request #780 from morpheyesh/master无闻2014-12-27
| |\ \ \ \ | | |/ / / | |/| | | spellcheck
| | * | | spellcheckmorpheyesh2014-12-24
| |/ / /
| * | | Merge pull request #769 from gitter-badger/gitter-badge无闻2014-12-21
| |\ \ \ | | | | | | | | | | Add a Gitter chat badge to README.md
| | * | | Added Gitter badgeThe Gitter Badger2014-12-21
| |/ / /
* | / / add label-edit and label-delete logicfuxiaohei2014-12-22
| |/ / |/| |
* | | Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2014-12-22
|\ \ \ | | |/ | |/|
| * | Merge pull request #771 from phsmit/multiple_email_cleanup无闻2014-12-22
| |\ \ | | | | | | | | Create English locale keys for multiple e-mails feature
| | * | Forgot to i18n "Primary"Peter Smit2014-12-22
| | | |
| | * | Create English locale keys for multiple e-mails featurePeter Smit2014-12-22
| |/ / | | | | | | | | | | | | 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-21
| |\ \ | | | | | | | | Fix for wrong email query
| | * | Fix for wrong email queryPeter Smit2014-12-21
| |/ / | | | | | | | | | Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
* / / fix invite bug(shouldn't include full name to search box)Unknwon2014-12-22
|/ /
* | Merge pull request #766 from phsmit/correct_from无闻2014-12-21
|\ \ | | | | | | Correct usage of FROM in email creation
| * | Parse the from string to extract the email addressPeter2014-12-19
| | |
| * | Remove unused "User" member of Message Struct and fix bounce addressPeter2014-12-19
| | | | | | | | | | | | | | | | | | 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-19
| | |
* | | mirror fix and updateUnknwon2014-12-20
| | |
* | | Merge pull request #755 from phsmit/multiple_emails无闻2014-12-20
|\ \ \ | | | | | | | | Multiple emails
| * | | Small fixes to multiple_emails featurePeter2014-12-20
| | | |
| * | | Finish method for having multiple emails/user.Peter2014-12-17
| | | | | | | | | | | | | | | | | | | | 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-17
| | | |
| * | | Method for activating email addresses through verification emailPeter2014-12-17
| | | |
| * | | Add function to the model for email address management (add/delete/activate)Peter2014-12-17
| | | |
| * | | Add alternative email addresses to the modelPeter Smit2014-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-19
|\ \ \ \ | |_|/ / |/| | | Remove standard mailer port lines
| * | | Remove standard mailer port linesPeter2014-12-19
|/ / / | | | | | | | | | 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-19
| | |
* | | Merge pull request #762 from phsmit/crammd5无闻2014-12-18
|\ \ \ | | | | | | | | Crammd5
| * | | Prefer CRAM-MD5 over PLAIN authenticationPeter2014-12-18
| | | |
| * | | Add option to use CRAM-MD5 as authentication method in the mailerPeter2014-12-18
| | | |
* | | | Merge pull request #761 from phsmit/mailer_rewritten无闻2014-12-18
|\| | | | |_|/ |/| | Rewrite of SendMail function