aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12841] Fix white space issues reported by snifferMatt Friedman2014-07-111-3/+3
| | | | PHPBB3-12841
* [ticket/12841] Allow extensions to position new config varsMatt Friedman2014-07-111-0/+26
| | | | PHPBB3-12841
* Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeusMarc Alexander2014-07-083-6/+29
|\
| * [ticket/12834] Correctly match directories in session pageJoas Schilling2014-07-083-2/+21
| | | | | | | | | | | | Also clean path before working with it PHPBB3-12834
| * [ticket/12834] Fix tests to match what we want to haveJoas Schilling2014-07-081-4/+8
| | | | | | | | PHPBB3-12834
* | Merge pull request #2676 from Nicofuma/ticket/12787Joas Schilling2014-07-0814-4/+190
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12787] Allow the route to say that the referer has to be used. * Nicofuma/ticket/12787: [ticket/12787] Updates phpbb_mock_controller_helper [ticket/12787] Add controller_helper::get_current_url() [ticket/12787] Remove one app.php when it's both in $path and $web_root_path [ticket/12787] Fix the absolute board url [ticket/12787] Use a parameter (_referer) instead of the Referer header [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer() [ticket/12099] Remove config again [ticket/12099] Correctly fix the path when performing AJAX requests [ticket/12099] Add request argument to path_helper service
| * | [ticket/12787] Updates phpbb_mock_controller_helperTristan Darricau2014-07-081-0/+5
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Add controller_helper::get_current_url()Tristan Darricau2014-07-082-1/+17
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Remove one app.php when it's both in $path and $web_root_pathTristan Darricau2014-07-051-1/+7
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Fix the absolute board urlTristan Darricau2014-06-291-1/+1
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Use a parameter (_referer) instead of the Referer headerTristan Darricau2014-06-291-2/+4
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()Joas Schilling2014-06-291-0/+54
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Remove config againJoas Schilling2014-06-2912-19/+5
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Correctly fix the path when performing AJAX requestsJoas Schilling2014-06-291-37/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current request is a AJAX we need to fix the paths. We need to get the root path based on the Referer, so we can use the generated URLs in the template of the Referer. If we do not generate the relative path based on the Referer, but based on the currently requested URL, the generated URLs will not point to the intended locations: Referer desired URL desired relative root path memberlist.php faq.php ./ memberlist.php app.php/foo/bar ./ app.php/foo memberlist.php ../ app.php/foo app.php/fox ../ app.php/foo/bar memberlist.php ../../ ../page.php memberlist.php ./phpBB/ ../sub/page.php memberlist.php ./../phpBB/ PHPBB3-12099
| * | [ticket/12099] Add request argument to path_helper servicePico882014-06-2911-2/+74
| | | | | | | | | | | | PHPBB3-12099
* | | Merge remote-tracking branch 'paybas/ticket/12804' into develop-ascraeusMarc Alexander2014-07-087-14/+34
|\ \ \
| * | | [ticket/12804] Disable jabber from memberlist sort optionsPayBas2014-07-081-2/+8
| | | | | | | | | | | | | | | | PHPBB3-12804
| * | | [ticket/12804] Dont use ternary formPayBas2014-07-072-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12804
| * | | [ticket/12804] Hide jabber for subSilver2 as wellPayBas2014-07-073-2/+10
| | | | | | | | | | | | | | | | PHPBB3-12804
| * | | [ticket/12804] Hide Jabber from UCP & member search when disabledPayBas2014-07-074-10/+16
| | | | | | | | | | | | | | | | PHPBB3-12804
* | | | Merge pull request #2695 from VSEphpbb/ticket/12812Tristan Darricau2014-07-084-0/+214
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12812] Add a migrator tool for config_text database changes * VSEphpbb/ticket/12812: [ticket/12812] Remove unused global $db from tests [ticket/12812] Improve migrator config_text tool tests [ticket/12812] Improve migrator config_text tool tests [ticket/12812] Add a migrator tool for config_text database changes
| * | | | [ticket/12812] Remove unused global $db from testsMatt Friedman2014-07-071-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12812
| * | | | [ticket/12812] Improve migrator config_text tool testsMatt Friedman2014-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12812
| * | | | [ticket/12812] Improve migrator config_text tool testsMatt Friedman2014-07-051-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12812
| * | | | [ticket/12812] Add a migrator tool for config_text database changesMatt Friedman2014-07-054-0/+218
| | | | | | | | | | | | | | | | | | | | PHPBB3-12812
* | | | | Merge pull request #2690 from Noxwizard/ticket/12802Tristan Darricau2014-07-071-3/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/12802] Properly handle connection failures in SQLite3 * Noxwizard/ticket/12802: [ticket/12802] Properly handle connection failures in SQLite3
| * | | | [ticket/12802] Properly handle connection failures in SQLite3Patrick Webster2014-07-031-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12802
* | | | | Merge pull request #2706 from Nicofuma/ticket/12825Joas Schilling2014-07-072-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12825] Better sniff for the extensions and skip the vendor/ directory * Nicofuma/ticket/12825: [ticket/12825] Better sniff for the extensions and skip the vendor/ directory
| * | | | | [ticket/12825] Better sniff for the extensions and skip the vendor/ directoryTristan Darricau2014-07-062-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12825
* | | | | | Merge pull request #2705 from PayBas/ticket/12824Joas Schilling2014-07-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12824] Move MCP/ACP links after navigation_append event * PayBas/ticket/12824: [ticket/12824] Move MCP/ACP links after navigation_append event
| * | | | | | [ticket/12824] Move MCP/ACP links after navigation_append eventPayBas2014-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12824
* | | | | | | Merge pull request #2708 from PayBas/ticket/12827Joas Schilling2014-07-071-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12827] Reorder quick-links * PayBas/ticket/12827: [ticket/12827] Reorder quick-links
| * | | | | | | [ticket/12827] Reorder quick-linksPayBas2014-07-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12827
* | | | | | | | Merge pull request #2710 from Crizz0/ticket/12830Joas Schilling2014-07-071-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12830] Removes double .postlink in colours.css * Crizz0/ticket/12830: [ticket/12830] Remove double .postlink in colours.css
| * | | | | | | | [ticket/12830] Remove double .postlink in colours.cssCrizzo2014-07-071-4/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12830
* | | | | | | | Merge pull request #2672 from Nicofuma/ticket/12782Joas Schilling2014-07-075-9/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12782] Use an interface for the phpbb event_dispatcher * Nicofuma/ticket/12782: [ticket/12782] Add doc block [ticket/12782] Use an interface for the phpbb event_dispatcher
| * | | | | | | | [ticket/12782] Add doc blockTristan Darricau2014-06-282-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12782
| * | | | | | | | [ticket/12782] Use an interface for the phpbb event_dispatcherTristan Darricau2014-06-285-9/+42
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12782
* | | | | | | | Merge pull request #2656 from nickvergessen/ticket/12197Tristan Darricau2014-07-071-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12197] Fix several misleading FAQ entries * nickvergessen/ticket/12197: [ticket/12197] Fix several misleading FAQ entries
| * | | | | | | [ticket/12197] Fix several misleading FAQ entriesJoas Schilling2014-06-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12197
* | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12811' into develop-ascraeusCesar G2014-07-072-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12811: [ticket/12811] Responsive adjustments to margin changes [ticket/12811] Fix padding/margin bug affecting bottom layout
| * | | | | | | | [ticket/12811] Responsive adjustments to margin changesMatt Friedman2014-07-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12811
| * | | | | | | | [ticket/12811] Fix padding/margin bug affecting bottom layoutMatt Friedman2014-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12811
* | | | | | | | | Merge remote-tracking branch 'PayBas/ticket/12813' into develop-ascraeusCesar G2014-07-077-27/+41
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12813: [ticket/12813] Move inline-CSS to css file [ticket/12813] Use -moz-only fix instead of generic padding [ticket/12813] Reorder .row pagination so it aligns better [ticket/12813] Fix page-jump title lang and use input type=number
| * | | | | | | | [ticket/12813] Move inline-CSS to css filePayBas2014-07-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12813
| * | | | | | | | [ticket/12813] Use -moz-only fix instead of generic paddingPayBas2014-07-063-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12813
| * | | | | | | | [ticket/12813] Reorder .row pagination so it aligns betterPayBas2014-07-054-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12813
| * | | | | | | | [ticket/12813] Fix page-jump title lang and use input type=numberPayBas2014-07-053-1/+9
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12813
* | | | | | | | Merge pull request #2697 from n-aleha/ticket/12816Andreas Fischer2014-07-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12816] Fix comment about logs in user_ban function * n-aleha/ticket/12816: [ticket/12816] Fix comment about logs in user_ban function
| * | | | | | | | [ticket/12816] Fix comment about logs in user_ban functionn-aleha2014-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12816