aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1861 from prototech/ticket/12011Nathan Guse2014-01-173-26/+36
|\ | | | | [ticket/12011] RTL fixes.
| * [ticket/12011] Correctly position the MCP minitabs.Cesar G2014-01-172-7/+16
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Prevent the <dfn> from bumping the unapproved icon to second lineCesar G2014-01-171-10/+0
| | | | | | | | | | | | | | A RTL rule is not needed for this since the content is just moved out of view. PHPBB3-12011
| * [ticket/12011] Separate the navbar bullet points from the text.Cesar G2014-01-171-0/+7
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Correctly align the posting options.Cesar G2014-01-171-1/+1
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Fix the overlapping unapproved post icon.Cesar G2014-01-171-2/+5
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Align PM/post titles to the right.Cesar G2014-01-171-1/+1
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Correctly align the pagination icon in topic rows.Cesar G2014-01-171-1/+2
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Stop the last post column from dropping to a second line.Cesar G2014-01-171-2/+2
| | | | | | | | PHPBB3-12011
| * [ticket/12011] Align ACP tabs to the right and separate ACP content from menu.Cesar G2014-01-171-2/+2
|/ | | | PHPBB3-12011
* Merge pull request #1809 from VSEphpbb/ticket/11966Nathan Guse2014-01-172-0/+4
|\ | | | | [ticket/11966] Add header navigation template events to Subsilver2
| * [ticket/11966] Merge branch 'develop' into ticket/11966Matt Friedman2013-12-12482-5335/+7910
| |\ | | | | | | | | | PHPBB3-11966
| * | [ticket/11966] Add header navigation template events to Subsilver2Matt Friedman2013-10-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add the overall_header_navigation_append / prepend template events used in Prosilver to subsilver2 as well. This will allow extensions to add Nav Links to Subsilver2. http://tracker.phpbb.com/browse/PHPBB3-11966 PHPBB3-11966
* | | Merge branch 'develop-olympus' into developNathan Guse2014-01-171-5/+17
|\ \ \ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
| * \ \ Merge remote-tracking branch 'remotes/bantu/ticket/12046' into develop-olympusNathan Guse2014-01-171-5/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * remotes/bantu/ticket/12046: [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
| | * | | [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.Andreas Fischer2013-11-291-5/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-12046
* | | | | 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