summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix gopmfileUnknwon2014-12-311-1/+1
* fix gopmfileUnknwon2014-12-311-2/+2
* fix gopmfileUnknwon2014-12-311-1/+1
* fix #801Unknwon2014-12-316-144/+151
* Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2014-12-318-58/+93
|\
| * Merge pull request #797 from Mikayex/dev无闻2014-12-291-1/+2
| |\
| | * Fix #795Thomas Laroche2014-12-291-1/+2
| * | Merge pull request #782 from estetsenko/dev无闻2014-12-291-2/+2
| |\ \
| | * | bugfix: Unable to assign any issue myselfestetsenko2014-12-241-2/+2
| * | | Merge pull request #787 from andre-hub/dev无闻2014-12-293-39/+76
| |\ \ \
| | * \ \ merge flexible the build scripts and add a freebsd build scriptAndré Grötschel2014-12-273-39/+76
| | |\ \ \
| | | * | | flexiable the build scripts and add a freebsd build scriptAndré Grötschel2014-12-273-39/+76
| * | | | | Merge pull request #790 from euank/master无闻2014-12-293-16/+13
| |\ \ \ \ \
| | * | | | | Set user.name & user.email in Dockerfileeuank2014-12-272-2/+2
| | * | | | | Default values for both user.name and user.emaileuank2014-12-271-14/+11
| | | |/ / / | | |/| | |
* | / | | | fix cache dep API brokenUnknwon2014-12-311-3/+3
|/ / / / /
* | | | / fix 500: E-mail already used in user settings pageUnknwon2014-12-294-6/+6
| |_|_|/ |/| | |
* | | | fix API changesUnknwon2014-12-285-22/+7
| |/ / |/| |
* | | Merge branch 'master' of github.com:gogits/gogs into devUnknwon2014-12-273-4/+8
|\| | | |/ |/|
| * Merge pull request #785 from joshk/patch-1无闻2014-12-271-1/+3
| |\
| | * Use the new build env on TravisJosh Kalderimis2014-12-271-1/+3
| * | Merge pull request #780 from morpheyesh/master无闻2014-12-271-3/+3
| |\ \ | | |/ | |/|
| | * spellcheckmorpheyesh2014-12-241-3/+3
| |/
| * Merge pull request #769 from gitter-badger/gitter-badge无闻2014-12-211-0/+2
| |\
| | * Added Gitter badgeThe Gitter Badger2014-12-211-0/+2
| |/
* | 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
| |\ \
| | * | Forgot to i18n "Primary"Peter Smit2014-12-222-1/+2
| | * | Create English locale keys for multiple e-mails featurePeter Smit2014-12-222-7/+15
| |/ /
| * | Merge pull request #767 from phsmit/fix_email_query无闻2014-12-211-1/+1
| |\ \
| | * | Fix for wrong email queryPeter Smit2014-12-211-1/+1
| |/ /
* / / 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
|\ \
| * | 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
| * | 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
|\ \ \
| * | | Small fixes to multiple_emails featurePeter2014-12-202-13/+13
| * | | Finish method for having multiple emails/user.Peter2014-12-175-0/+178
| * | | 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
* | | | Merge pull request #764 from phsmit/fix_mailer无闻2014-12-191-4/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove standard mailer port linesPeter2014-12-191-4/+0
|/ / /
* | | update locale and mirror code formatUnknwon2014-12-193-34/+34
* | | Merge pull request #762 from phsmit/crammd5无闻2014-12-181-6/+13
|\ \ \
| * | | Prefer CRAM-MD5 over PLAIN authenticationPeter2014-12-181-3/+3