aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #1938 from prototech/ticket/12077Nathan Guse2014-01-172-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
| * | | | | | | [ticket/12077] Fix another strict standards error.Cesar G2013-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12077
| * | | | | | | [ticket/12077] Add missing space after template block name.Cesar G2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12077
| * | | | | | | [ticket/12077] Fix strict standards error.Cesar G2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12077
* | | | | | | | Merge pull request #1945 from VSEphpbb/ticket/12104Nathan Guse2014-01-171-5/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12104] Replace shadow topics $sql with $sql_array for better Eve...
| * | | | | | | | [ticket/12104] Update the event's doc block to reflect new variableMatt Friedman2014-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12104
| * | | | | | | | [ticket/12104] Remove newline before WHERE parameterMatt Friedman2014-01-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12104
| * | | | | | | | [ticket/12104] Remove empty LEFT_JOIN arrayMatt Friedman2014-01-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12104
| * | | | | | | | [ticket/12104] Replace shadow topics $sql with $sql_array for better Event ↵Matt Friedman2014-01-091-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling PHPBB3-12104
* | | | | | | | | Merge pull request #1947 from bantu/ticket/12107Nathan Guse2014-01-171-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/12107] Use log table property instead of log table constant.
| * | | | | | | | | [ticket/12107] Use log table property instead of log table constant.Andreas Fischer2014-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12107
* | | | | | | | | | Merge pull request #1949 from prototech/ticket/12110Nathan Guse2014-01-173-26/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/12110] Update Plupload to 2.1.1.
| * | | | | | | | | | [ticket/12110] Update Plupload to 2.1.1.Cesar G2014-01-163-26/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12110
* | | | | | | | | | | Merge pull request #1950 from prototech/ticket/12096Nathan Guse2014-01-173-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.
| * | | | | | | | | | | [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.Cesar G2014-01-163-3/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12096
* | | | | | | | | | | Merge pull request #1951 from prototech/ticket/12032Nathan Guse2014-01-178-4/+60
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | [ticket/12032] Do not inherit read status in certain notifications.
| * | | | | | | | | | [ticket/12032] Do not inherit read status in certain notifications.Cesar G2014-01-168-4/+60
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12032
* | | | | | | | | | Merge pull request #1893 from nickvergessen/ticket/12039Andreas Fischer2014-01-127-0/+326
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12039] Add config:* to the command line interface tool * nickvergessen/ticket/12039: [ticket/12039] Allow getting the value without a new line at the end [ticket/12039] Do not print success message when config did not exist [ticket/12039] Do not colour returned value in get command [ticket/12039] Update command descriptions [ticket/12039] Remove debug code [ticket/12039] Fix option descriptions [ticket/12039] Use an abstract class and some more minor adjustments [ticket/12039] Add config:* to the command line interface tool
| * | | | | | | | | [ticket/12039] Allow getting the value without a new line at the endJoas Schilling2014-01-101-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Do not print success message when config did not existJoas Schilling2014-01-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Do not colour returned value in get commandJoas Schilling2014-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Update command descriptionsJoas Schilling2013-12-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Remove debug codeJoas Schilling2013-12-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Fix option descriptionsJoas Schilling2013-11-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Use an abstract class and some more minor adjustmentsJoas Schilling2013-11-277-99/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | | | | | | [ticket/12039] Add config:* to the command line interface toolJoas Schilling2013-11-265-0/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12039
* | | | | | | | | | Merge pull request #1936 from nickvergessen/ticket/12030Nils Adermann2014-01-121-0/+54
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | [Ticket/12030] Include some directories completly in update packages
| * | | | | | | | | [ticket/12030] Fix some spelling issuesJoas Schilling2014-01-081-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12030
| * | | | | | | | | [ticket/12030] Fix wrong file and directory namesJoas Schilling2013-12-191-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12030
| * | | | | | | | | [ticket/12030] Include adm/images/ when the css file was updatedJoas Schilling2013-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The images are referenced relative from the admin.css file. So when it was updated and the images where not, the updater will be without images, unless we ensure that they are included in the update-package. PHPBB3-12021 PHPBB3-12030
| * | | | | | | | | [ticket/12030] Include config directory completly in update packagesJoas Schilling2013-12-191-0/+47
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one of the config files was updated, we need to include all config files because they are referenced relative from the files themselves. PHPBB3-12030
* | | | | | | | | Merge remote-tracking branch 'Marc/ticket/11997' into developJoas Schilling2014-01-089-74/+302
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11997: (23 commits) [ticket/11997] Use functional test cases that should always work [ticket/11997] Fix redirect tests for mod rewrite [ticket/11997] Add user's page dir to redirect path and fix unit tests for it [ticket/11997] Remove obsolete function get_controller_redirect_url() [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs [ticket/11997] Do not check if file or dir we redirect to exist [ticket/11997] Modifiy tests after adding path_helper clean_url method [ticket/11997] Add clean_url() method to path_helper [ticket/11997] Allow redirects to parent folders like previously [ticket/11997] Move expected redirect returns to controller and output to HTML [ticket/11997] Fix tests for path_helper's get_controller_redirect_url() [ticket/11997] Use get_controller_redirect_url() in redirect() function [ticket/11997] Add method for controller redirect URLs to path helper [ticket/11997] Undo changes to phpbb_own_realpath() [ticket/11997] Remove obsolete failover_flag in function redirect() [ticket/11997] Add functional test for redirects in controller [ticket/11997] Fix missing global [ticket/11997] Fix redirects from inside controllers [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths ...
| * | | | | | | | | [ticket/11997] Use functional test cases that should always workMarc Alexander2013-12-281-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous test cases that tried to redirect to ../index.php and similar might cause us to try to go to http://localhost/../index.php, which will result in http://index.php. As this obviously will trigger an error as intended, we should not put this inside our test cases for the redirect function. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Fix redirect tests for mod rewriteMarc Alexander2013-12-282-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controller routes that are supposed to link to parent directories can't be tested as the links are incorrectly created depending on enabled mod rewrite or not. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Add user's page dir to redirect path and fix unit tests for itMarc Alexander2013-12-282-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user's page directory needs to be added to the redirect URL for proper redirects outside of the forum root. Fix the unit tests accordingly. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Remove obsolete function get_controller_redirect_url()Marc Alexander2013-12-271-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11997
| * | | | | | | | | [ticket/11997] Use path_helper in in foo/bar extension for redirect URLsMarc Alexander2013-12-273-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using path_helper's clean_url() method, we'll be able to properly check the full URL instead of just parts of the expected URL. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLsMarc Alexander2013-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a call to this method to the redirect function will make sure that we do not end up with incorrect URLs after using append_sid(). PHPBB3-11997
| * | | | | | | | | [ticket/11997] Do not check if file or dir we redirect to existMarc Alexander2013-12-272-89/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redirect function will now properly redirect to where we want it to. It will no longer try to check if the file or directory we redirect to exist. This will ensure compatibility with the new routes. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Modifiy tests after adding path_helper clean_url methodMarc Alexander2013-12-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11997
| * | | | | | | | | [ticket/11997] Add clean_url() method to path_helperMarc Alexander2013-12-213-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method will get rid of unnecessary . and .. in URLs. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Allow redirects to parent folders like previouslyMarc Alexander2013-12-213-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirects to parent folders were possible with the previous redirect function. This change will allow these redirects again. PHPBB3-11997
| * | | | | | | | | [ticket/11997] Move expected redirect returns to controller and output to HTMLMarc Alexander2013-12-203-28/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The controller will now output the expected redirect returns the same way the redirect returns are output. The extension controller test will compare those 2 outputs. PHPBB3-11997
| * | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997Marc Alexander2013-12-07183-1980/+3564
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/functional/fixtures/ext/foo/bar/config/services.yml
| * | | | | | | | | | [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()Marc Alexander2013-12-072-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11997
| * | | | | | | | | | [ticket/11997] Use get_controller_redirect_url() in redirect() functionMarc Alexander2013-12-071-46/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method of path_helper will now be used instead of the previous hack of the phpbb_own_realpath() function. PHPBB3-11997
| * | | | | | | | | | [ticket/11997] Add method for controller redirect URLs to path helperMarc Alexander2013-12-071-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method will allow us to get proper redirect URLs for controllers. PHPBB3-11997
| * | | | | | | | | | [ticket/11997] Undo changes to phpbb_own_realpath()Marc Alexander2013-12-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11997
| * | | | | | | | | | [ticket/11997] Remove obsolete failover_flag in function redirect()Marc Alexander2013-11-171-41/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is no longer needed as the failover is no longer needed. PHPBB3-11997
| * | | | | | | | | | Merge pull request #4 from nickvergessen/ticket/marc/11997Marc Alexander2013-11-137-2/+104
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ticket/marc/11997