aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeusCesar G2014-09-231-0/+4
|\
| * [ticket/12889] Fix multiple select listshanakin2014-09-231-0/+4
* | Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeusCesar G2014-09-232-1/+10
|\ \
| * | [ticket/13082] Repair fixJakub Senko2014-09-212-3/+8
| * | [ticket/13082] Join classesJakub Senko2014-09-211-1/+1
| * | [ticket/13082] move style to css fileJakub Senko2014-09-202-1/+5
| * | [ticket/13082] Replace float by text-alignJakub Senko2014-09-201-1/+1
| |/
* | Merge remote-tracking branch 'hanakin/ticket/13097' into develop-ascraeusCesar G2014-09-231-1/+1
|\ \
| * | [ticket/13097] Add missing unit typehanakin2014-09-231-1/+1
|/ /
* | Merge pull request #2937 from Senky/ticket/13027Joas Schilling2014-09-231-1/+1
|\ \
| * | [ticket/13027] round to floorJakub Senko2014-09-091-1/+1
* | | Merge pull request #2974 from hanakin/ticket/13080Joas Schilling2014-09-231-14/+11
|\ \ \
| * | | [ticket/13080] Fix mediaqueries formatinghanakin2014-09-201-14/+7
| * | | [ticket/13080] Remove nowrap from dd in responsivehanakin2014-09-201-0/+4
| | |/ | |/|
* | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-09-230-0/+0
|\ \ \
| * \ \ Merge pull request #2981 from nickvergessen/ticket/10729Marc Alexander2014-09-234-8/+994
| |\ \ \
* | \ \ \ Merge pull request #2984 from nickvergessen/ticket/10729-ascMarc Alexander2014-09-234-9/+1028
|\ \ \ \ \
| * | | | | [ticket/10729] Also test *delete_user on posts and topicsJoas Schilling2014-09-232-14/+24
| * | | | | [ticket/10729] Fix handling of third parameter in 3.1Joas Schilling2014-09-232-12/+15
| * | | | | [ticket/10729] Fix setup of the tests for 3.1Joas Schilling2014-09-231-7/+11
| * | | | | [ticket/10729] Update fixture to 3.1 database structureJoas Schilling2014-09-231-7/+12
| * | | | | Merge branch 'ticket/10729' into ticket/10729-ascJoas Schilling2014-09-234-4/+982
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2Joas Schilling2014-09-231-1/+2
| | * | | | [ticket/10729] Ensure that no bans exist before testing create_sessionJoas Schilling2014-09-221-0/+7
| | * | | | [ticket/10729] Add assert messages and finish up testsJoas Schilling2014-09-222-27/+228
| | * | | | [ticket/10729] Add tests for some special tables with unique conditionsJoas Schilling2014-09-222-103/+223
| | * | | | [ticket/10729] Add tests for user posts, reports and attachmentsJoas Schilling2014-09-222-0/+645
| | * | | | [ticket/10729] Fix doc block for user_deleteJoas Schilling2014-09-221-3/+8
| * | | | | [ticket/10729] Update *_delete_user when user being deletedOliver Schramm2014-07-181-0/+12
| * | | | | Merge branch 'ticket/10729' into ticket/10729-2Oliver Schramm2014-07-181-5/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | [ticket/10729] Update message_edit_user when user being deletedOliver Schramm2014-07-181-0/+6
| | * | | | [ticket/10729] Update post_edit_user when user being deletedOliver Schramm2014-07-171-5/+6
* | | | | | Merge pull request #2963 from Senky/ticket/13045Dhruv Goel2014-09-219-13/+9
|\ \ \ \ \ \
| * | | | | | [ticket/13045] Remove Pragma headersJakub Senko2014-09-179-13/+9
* | | | | | | Merge pull request #2976 from n-aleha/ticket/13085Dhruv Goel2014-09-211-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ticket/13085] Fix typo in oauth.phpn-aleha2014-09-211-1/+1
|/ / / / / /
* | | | | | Merge branch 'prep-release-3.1.0-RC4' into develop-ascraeusJoas Schilling2014-09-208-41/+164
|\ \ \ \ \ \
| * | | | | | [prep-release-3.1.0-RC4] Update phpBB Version for RC4 developmentJoas Schilling2014-09-203-5/+5
| * | | | | | [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4Joas Schilling2014-09-191-1/+89
| * | | | | | [prep-release-3.1.0-RC4] Prepare ChangelogJoas Schilling2014-09-191-31/+34
| * | | | | | [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4Joas Schilling2014-09-191-0/+32
| * | | | | | [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4Joas Schilling2014-09-196-8/+8
|/ / / / / /
* | | | | | Merge pull request #2969 from marc1706/ticket/13073Joas Schilling2014-09-198-27/+235
|\ \ \ \ \ \
| * | | | | | [ticket/13073] Remove _test suffix from common test classMarc Alexander2014-09-195-9/+9
| * | | | | | [ticket/13073] Switch $input with $expected and add paths with lettersMarc Alexander2014-09-191-7/+9
| * | | | | | [ticket/13073] Use abstract class for controller helper route testsMarc Alexander2014-09-195-7/+40
| * | | | | | [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-193-1/+44
| * | | | | | [ticket/13073] Use just one regex in helper route()Marc Alexander2014-09-191-1/+1
| * | | | | | [ticket/13073] Properly place comments in helperMarc Alexander2014-09-191-2/+1
| * | | | | | [ticket/13073] Use correct class names in test filesMarc Alexander2014-09-192-2/+2