aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | [ticket/14785] Add template event overall_header_headerbar_after/beforeGerB2016-09-242-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-14785
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4462 from marc1706/ticket/14796Marc Alexander2016-09-241-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14796] Use log_table class member instead of table constant
| | * | | | [ticket/14796] Use log_table class member instead of table constantForumhulp.com2016-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was still using the old LOG_TABLE constant in the delete method. PHPBB3-14796
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-240-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * 3.1.x:
| * | | | | Merge pull request #4394 from marc1706/ticket/14484Tristan Darricau2016-09-243-35/+399
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14484] Add possibility to use extensions in UI tests * marc1706/ticket/14484: [ticket/14484] Properly enable extensions in UI tests [ticket/14484] Move facebook/webdriver back to tests dir composer.json [ticket/14484] Move facebook webdriver to main composer.json
* | \ \ \ \ \ Merge pull request #4455 from marc1706/ticket/14484-rheaTristan Darricau2016-09-241-10/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14484] Add possibility to use extensions in UI tests * marc1706/ticket/14484-rhea: [ticket/14484] Remove duplicate methods and no longer needed calls [ticket/14484] Remove invalid code caused by merge conflict [ticket/14484] Properly enable extensions in UI tests [ticket/14484] Move facebook/webdriver back to tests dir composer.json [ticket/14484] Move facebook webdriver to main composer.json
| * | | | | | | [ticket/14484] Remove duplicate methods and no longer needed callsMarc Alexander2016-09-211-45/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14484
| * | | | | | | [ticket/14484] Remove invalid code caused by merge conflictMarc Alexander2016-09-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14484
| * | | | | | | Merge branch 'ticket/14484' into ticket/14484-rheaMarc Alexander2016-09-181-26/+141
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | [ticket/14484] Properly enable extensions in UI testsMarc Alexander2016-07-311-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14484
| | * | | | | | [ticket/14484] Move facebook/webdriver back to tests dir composer.jsonMarc Alexander2016-07-316-47/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make sure we don't try to install it to incompatible PHP 5.3.3. PHPBB3-14484
| | * | | | | | [ticket/14484] Move facebook webdriver to main composer.jsonMarc Alexander2016-07-277-95/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated ui test case file to have same feature set as the 3.2.x version. PHPBB3-14484
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-8/+30
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3527 from Elsensee/ticket/13709Marc Alexander2016-09-241-8/+30
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | [ticket/13709] Add fallback for email templates used by extensions
| | * | | | | | [ticket/13709] Add fallback for email templates used by extensionsOliver Schramm2016-08-211-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a fallback to english for the core like we do it in $user->add_lang() PHPBB3-13709
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-4/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4432 from Senky/ticket/14762Marc Alexander2016-09-241-4/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14762] Add core event to session.php
| | * | | | | | | [ticket/14762] Add core event to session.phpJakub Senko2016-09-181-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14762
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #4433 from Senky/ticket/14747Marc Alexander2016-09-241-0/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | [ticket/14747] Add post_data to core.modify_posting_auth
| | * | | | | | | [ticket/14747] Add post_data to core.modify_posting_authJakub Senko2016-09-031-0/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14747
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4460 from marc1706/ticket/14784Marc Alexander2016-09-241-2/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14784] missing rewrite for lighttpd
* | \ \ \ \ \ \ \ Merge pull request #4460 from marc1706/ticket/14784Marc Alexander2016-09-241-2/+11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | [ticket/14784] missing rewrite for lighttpd
| * | | | | | | | [ticket/14784] missing rewrite for lighttpdTobi Schäfer2016-09-241-2/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14784
* | | | | | | | Merge pull request #4459 from rxu/ticket/14794Marc Alexander2016-09-231-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
| * | | | | | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibilityrxu2016-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14794
* | | | | | | | | Merge pull request #4457 from rxu/ticket/14793Marc Alexander2016-09-234-3/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
| * \ \ \ \ \ \ \ \ [ticket/14793] Merge branch 'ticket/14748' of https://github.com/marc1706/phpbbrxu2016-09-231-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14793
| | * | | | | | | | | [ticket/14748] Add PHP 7.1 to test matrix and keep nightlyMarc Alexander2016-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP nightlies already target PHP 7.2. PHPBB3-14748
| | * | | | | | | | | [ticket/14748] Make sure config values are casted to intMarc Alexander2016-08-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14748
| * | | | | | | | | | [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+rxu2016-09-223-3/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14793
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-221-0/+42
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4392 from ErnadoO/PHPBB3-14592Marc Alexander2016-09-221-0/+42
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14592] [PHP] core.search_backend_search_after
| | * | | | | | | | | [ticket/14592] Fix variable typeErwan Nader2016-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14592
| | * | | | | | | | | [ticket/14592] Fixed docblock from unit testsErwan Nader2016-07-241-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14592
| | * | | | | | | | | [ticket/14592] Fixed syntax errors from unit testsErwan Nader2016-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14592
| | * | | | | | | | | [ticket/14592] [PHP] core.search_backend_search_afterErwan Nader2016-07-241-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14592
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-221-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #4454 from rxu/tcket/14787-1Marc Alexander2016-09-221-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14787] Add more parameters to the core.search_modify_url_parameters
| | * | | | | | | | | [ticket/14787] Add more parameters to the core.search_modify_url_parametersrxu2016-09-191-1/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14787
* | | | | | | | | | Merge pull request #4456 from marc1706/ticket/14791Máté Bartus2016-09-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | [ticket/14791] Get form tokens from correct button in search test base
| * | | | | | | | | [ticket/14791] Get form tokens from correct button in search test baseMarc Alexander2016-09-211-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14791
* | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-181-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14787] Add more parameters to the core.search_modify_url_parameters
| * | | | | | | | Merge pull request #4450 from rxu/ticket/14787Tristan Darricau2016-09-181-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14787] Add more parameters to the core.search_modify_url_pameters * rxu/ticket/14787: [ticket/14787] Add more parameters to the core.search_modify_url_parameters
| | * | | | | | | | [ticket/14787] Add more parameters to the core.search_modify_url_parametersrxu2016-09-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14787
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-189-16/+118
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons
| * | | | | | | | | Merge pull request #4452 from marc1706/ticket/14789Tristan Darricau2016-09-189-17/+119
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14789] Further harden ACP link and form checks * marc1706/ticket/14789: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons
| | * | | | | | | | | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14789