aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/10729 Update editor information when user being deleted
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2984 from nickvergessen/ticket/10729-ascMarc Alexander2014-09-234-9/+1028
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.1][ticket/10729] Update editor information when user being deleted
| * | | | | | | | | | | | | | [ticket/10729] Also test *delete_user on posts and topicsJoas Schilling2014-09-232-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| * | | | | | | | | | | | | | [ticket/10729] Fix handling of third parameter in 3.1Joas Schilling2014-09-232-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| * | | | | | | | | | | | | | [ticket/10729] Fix setup of the tests for 3.1Joas Schilling2014-09-231-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| * | | | | | | | | | | | | | [ticket/10729] Update fixture to 3.1 database structureJoas Schilling2014-09-231-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| * | | | | | | | | | | | | | Merge branch 'ticket/10729' into ticket/10729-ascJoas Schilling2014-09-234-4/+982
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_user.php
| | * | | | | | | | | | | | | [ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2Joas Schilling2014-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | | [ticket/10729] Ensure that no bans exist before testing create_sessionJoas Schilling2014-09-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | | [ticket/10729] Add assert messages and finish up testsJoas Schilling2014-09-222-27/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | | [ticket/10729] Add tests for some special tables with unique conditionsJoas Schilling2014-09-222-103/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | | [ticket/10729] Add tests for user posts, reports and attachmentsJoas Schilling2014-09-222-0/+645
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | | [ticket/10729] Fix doc block for user_deleteJoas Schilling2014-09-221-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| * | | | | | | | | | | | | | [ticket/10729] Update *_delete_user when user being deletedOliver Schramm2014-07-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| * | | | | | | | | | | | | | Merge branch 'ticket/10729' into ticket/10729-2Oliver Schramm2014-07-181-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_user.php
| | * | | | | | | | | | | | | [ticket/10729] Update message_edit_user when user being deletedOliver Schramm2014-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | | [ticket/10729] Update post_edit_user when user being deletedOliver Schramm2014-07-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
* | | | | | | | | | | | | | | Merge pull request #2963 from Senky/ticket/13045Dhruv Goel2014-09-219-13/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13045] Remove Pragma headers
| * | | | | | | | | | | | | | | [ticket/13045] Remove Pragma headersJakub Senko2014-09-179-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13045
* | | | | | | | | | | | | | | | Merge pull request #2976 from n-aleha/ticket/13085Dhruv Goel2014-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | [ticket/13085] Fix typo in oauth.php
| * | | | | | | | | | | | | | | [ticket/13085] Fix typo in oauth.phpn-aleha2014-09-211-1/+1
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13085
* | | | | | | | | | | | | | | Merge branch 'prep-release-3.1.0-RC4' into develop-ascraeusJoas Schilling2014-09-208-41/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-RC4: [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 [prep-release-3.1.0-RC4] Prepare Changelog [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
| * | | | | | | | | | | | | | | [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] Correctly generate routes from subfolders like /adm * marc1706/ticket/13073: [ticket/13073] Remove _test suffix from common test class [ticket/13073] Switch $input with $expected and add paths with letters [ticket/13073] Use abstract class for controller helper route tests [ticket/13073] Add path regex to get_preg_expression() and add unit tests [ticket/13073] Use just one regex in helper route() [ticket/13073] Properly place comments in helper [ticket/13073] Use correct class names in test files [ticket/13073] Rework route tests and add tests for more directory types [ticket/13073] Test that routes from subfolders like /adm work [ticket/13073] Add tests for routes from adm pages [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
| * | | | | | | | | | | | | | [ticket/13073] Remove _test suffix from common test classMarc Alexander2014-09-195-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Switch $input with $expected and add paths with lettersMarc Alexander2014-09-191-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Use abstract class for controller helper route testsMarc Alexander2014-09-195-7/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-193-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're now calling get_preg_expression() instead of hardcoding the regex into the helper route method. PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Use just one regex in helper route()Marc Alexander2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Properly place comments in helperMarc Alexander2014-09-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Use correct class names in test filesMarc Alexander2014-09-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Rework route tests and add tests for more directory typesMarc Alexander2014-09-194-51/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Test that routes from subfolders like /adm workMarc Alexander2014-09-192-101/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Add tests for routes from adm pagesMarc Alexander2014-09-191-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | | | | | | | | | | | [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routesMarc Alexander2014-09-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13073
* | | | | | | | | | | | | | | Merge pull request #2970 from nickvergessen/ticket/13062Tristan Darricau2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13062] Fix name of "ORDER_BY" key in SQL array * nickvergessen/ticket/13062: [ticket/13062] Fix name of "ORDER_BY" key in SQL array
| * | | | | | | | | | | | | | | [ticket/13062] Fix name of "ORDER_BY" key in SQL arrayJoas Schilling2014-09-191-1/+1
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13062
* | | | | | | | | | | | | | | Merge pull request #2952 from rxu/ticket/13066Joas Schilling2014-09-191-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13066] Add search results core event to modify search title * rxu/ticket/13066: [ticket/13066] Add search results core event to modify search title
| * | | | | | | | | | | | | | | [ticket/13066] Add search results core event to modify search titlerxu2014-09-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13066
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'hanakin/ticket/12598' into develop-ascraeusCesar G2014-09-1813-95/+156
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hanakin/ticket/12598: [ticket/12598] Fix sir typo [ticket/12598] Fix rtl positon in header [ticket/12598] Remove right border [ticket/12598] Remove border from .search-header [ticket/12598] Replace #search-box with class [ticket/12598] Remove hover border-color and use hover icon [ticket/12598] Add some responsive margin to give breathing room [ticket/12598] Clean up unused link colors [ticket/12598] Remove unused link colors [ticket/12598] Add lt IE9 fixes [ticket/12598] Improve search box styling
| * | | | | | | | | | | | | | | [ticket/12598] Fix sir typohanakin2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12598
| * | | | | | | | | | | | | | | [ticket/12598] Fix rtl positon in headerhanakin2014-09-181-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12598
| * | | | | | | | | | | | | | | [ticket/12598] Remove right borderhanakin2014-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12598
| * | | | | | | | | | | | | | | [ticket/12598] Remove border from .search-headerhanakin2014-09-181-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12598
| * | | | | | | | | | | | | | | [ticket/12598] Replace #search-box with classhanakin2014-09-186-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12598