aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\
| * Merge pull request #3127 from omniError/ticket/13323Joas Schilling2014-11-211-1/+1
| |\
| | * [ticket/13323] empty auth option in posting.phpomniError2014-11-101-1/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-213-3/+3
|\ \ \ | |/ /
| * | Merge pull request #3108 from Elsensee/ticket/13284Joas Schilling2014-11-214-5/+5
| |\ \
| | * | [ticket/13284] Set message body in topic form too, so it will be sentOliver Schramm2014-11-041-1/+1
| | * | [ticket/13284] Fix request name so users can cc themselvesOliver Schramm2014-11-043-4/+4
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3068 from marc1706/ticket/13204Joas Schilling2014-11-211-1/+1
| |\ \ \
| | * | | [ticket/13204] Tell user that password was incorrect when exceeding attemptsMarc Alexander2014-11-021-1/+1
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-213-19/+105
|\ \ \ \ | |/ / /
| * | | Merge pull request #3064 from marc1706/ticket/13197Joas Schilling2014-11-213-19/+105
| |\ \ \
| | * | | [ticket/13197] Fix tabbingMarc Alexander2014-11-091-4/+4
| | * | | [ticket/13197] Correctly format sql queryMarc Alexander2014-11-091-2/+2
| | * | | [ticket/13197] Test that user's group avatar is deleted by group avatar deleteMarc Alexander2014-10-262-11/+73
| | * | | [ticket/13197] Also delete group avatar from users that have it setMarc Alexander2014-10-251-7/+31
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3156 from prototech/ticket/13316Joas Schilling2014-11-211-2/+4
| |\ \ \ \
| | * | | | [ticket/13316] Ensure Recaptcha image uses https when necessary.Cesar G2014-11-211-2/+4
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3144 from marc1706/ticket/13337Joas Schilling2014-11-211-1/+1
| |\ \ \ \
| | * | | | [ticket/13337] Allow empty array passed to sql_in_set()Marc Alexander2014-11-141-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-2/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3044 from Elsensee/ticket/13100Joas Schilling2014-11-213-2/+18
| |\ \ \ \ \
| | * | | | | [ticket/13100] Remove pointless variableOliver Schramm2014-11-041-1/+0
| | * | | | | [ticket/13100] Display only confirmation buttons when deleting shadow topicOliver Schramm2014-10-203-2/+19
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-215-13/+116
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3023 from Nicofuma/ticket/13133Joas Schilling2014-11-215-13/+116
| |\ \ \ \ \ \
| | * | | | | | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| | * | | | | | [ticket/13133] Add unit testsTristan Darricau2014-10-094-9/+88
| | * | | | | | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-214-14/+78
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2765 from Elsensee/ticket/11863Joas Schilling2014-11-214-14/+78
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11863] Add functional testOliver Schramm2014-10-171-0/+55
| | * | | | | | | [ticket/11863] Display warning to user because of activation methodOliver Schramm2014-10-172-1/+10
| | * | | | | | | [ticket/11863] Grey out unavailable activation methods when emails disabledOliver Schramm2014-10-173-13/+13
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3043 from rxu/ticket/13182Joas Schilling2014-11-211-4/+39
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/13182] Add posting.php core event to allow modifying the message textrxu2014-11-221-4/+39
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-1/+50
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3150 from omniError/ticket/13347Joas Schilling2014-11-212-1/+50
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/13347] update event docsomniError2014-11-171-1/+43
| | * | | | | | | | | [ticket/13347] fix CSomniError2014-11-171-7/+7
| | * | | | | | | | | [ticket/13347] missing acp_forums template eventsomniError2014-11-171-0/+7
| | | |_|_|_|/ / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3131 from omniError/ticket/13328Joas Schilling2014-11-211-0/+16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/13328] fix CSomniError2014-11-111-14/+14
| | * | | | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sqlomniError2014-11-101-0/+16
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3130 from omniError/ticket/13326Joas Schilling2014-11-211-0/+3
| |\ \ \ \ \ \ \ \ \