aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-7/+21
|\
| * Merge pull request #3123 from Elsensee/ticket/13310Joas Schilling2014-11-221-7/+21
| |\
| | * [ticket/13310] Add event core.acp_email_modify_sqlOliver Schramm2014-11-091-1/+11
| | * [ticket/13310] Always use sql_build_query in acp_email.phpOliver Schramm2014-11-091-6/+10
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-5/+5
|\ \ \ | |/ /
| * | Merge pull request #3160 from PayBas/ticket/13228Joas Schilling2014-11-222-5/+5
| |\ \
| | * | [ticket/13228] Gotta use !important after all. Too badPayBas2014-11-221-1/+1
| | * | [ticket/13228] Fix codebox "select all" font-size in UCP and MCPPayBas2014-11-211-4/+4
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-223-11/+111
|\ \ \ \ | |/ / /
| * | | Merge pull request #3116 from rxu/ticket/13297Joas Schilling2014-11-223-11/+111
| |\ \ \
| | * | | [ticket/13297] Add unicode modifier to url/email regular expression patterns.rxu2014-11-093-11/+111
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3158 from prototech/ticket/13354Joas Schilling2014-11-221-1/+1
| |\ \ \ \
| | * | | | [ticket/13354] Fix incorrect column name when deleting all topic logs.Cesar G2014-11-211-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3161 from Crizz0/ticket/12885Joas Schilling2014-11-221-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/12885] New if for Index-page - board-index-text switchCrizzo2014-11-221-1/+1
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-221-0/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #3164 from Crizz0/ticket/10442Joas Schilling2014-11-221-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctnessCrizzo2014-11-221-0/+2
| | |/ / / / / /
* | | | | | | | Merge pull request #3162 from nickvergessen/ticket/13359Marc Alexander2014-11-221-1/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13359] Add phpbb\template\twig\environment to template constructorJoas Schilling2014-11-221-1/+29
* | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-222-2/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge pull request #3094 from nickvergessen/ticket/10744Marc Alexander2014-11-222-2/+26
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | [ticket/10744] Fix some doc blocksJoas Schilling2014-11-211-2/+3
| | * | | | | | [ticket/10744] Type hint objects for IDE usagesJoas Schilling2014-11-211-0/+15
| | * | | | | | [ticket/10744] Prevent installing styles with reserved namesJoas Schilling2014-11-212-0/+8
| |/ / / / / /
* | | | | | | 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