aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-202-1/+73
|\
| * Merge pull request #3278 from rxu/ticket/13492Joas Schilling2015-01-202-1/+73
| |\ | | | | | | | | | [ticket/13492] Fix IDN support for custom BBCode URL tokens
| | * [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-202-1/+71
| | | | | | | | | | | | | | | | | | Also fix the $utf8 checking regexp removing the curly braces. PHPBB3-13492
| | * [ticket/13492] Add IDN support for custom BBCode URL tokensrxu2015-01-111-1/+3
| | | | | | | | | | | | | | | | | | | | | Custom BBCode URL tokens does not support IDN. Custom BBCodes added earlier than IDN has been applied are unaffected. PHPBB3-13492
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-191-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13504] Fix invalid variable $user
| * | Merge pull request #3308 from nickvergessen/ticket/13504Andreas Fischer2015-01-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13504] Fix invalid variable $user * nickvergessen/ticket/13504: [ticket/13504] Fix invalid variable $user
| | * | [ticket/13504] Fix invalid variable $userJoas Schilling2015-01-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13504
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-190-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/10985] Add fix to properly inherit style during update process
| * | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-190-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10985] Add fix to properly inherit style during update process Conflicts: phpBB/includes/bbcode.php
| | * | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| | |\ \ | | | | | | | | | | [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| | | * | [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10985
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-191-28/+28
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3296 from PayBas/ticket/13431Joas Schilling2015-01-191-28/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13431] Fix responsive RTL media queries for <IE11
| | * | | | [ticket/13431] Fix responsive RTL media queries for <IE11PayBas2015-01-161-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13431
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-191-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3294 from PayBas/ticket/13507Joas Schilling2015-01-191-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13507] Fix horizontal scrollbar for large images in posts
| | * | | | | [ticket/13507] Fix horizontal scrollbar for large images in postsPayBas2015-01-161-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13507
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-193-23/+63
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13192] Add test for app.php in external subfolder [ticket/13192] Use ltrim() instead of preg_replace() [ticket/13192] Order test cases consistently [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root [ticket/13192] Pass correct parameters and rename method to get_valid_page [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals [ticket/13192] Use get_valid_user_page method in build_url function [ticket/13192] Add method for generating valid user page links
| * | | | | Merge pull request #3055 from marc1706/ticket/13192Tristan Darricau2015-01-193-23/+63
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13192] Add method for generating valid user page links based on mod_rewrite * marc1706/ticket/13192: [ticket/13192] Add test for app.php in external subfolder [ticket/13192] Use ltrim() instead of preg_replace() [ticket/13192] Order test cases consistently [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root [ticket/13192] Pass correct parameters and rename method to get_valid_page [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals [ticket/13192] Use get_valid_user_page method in build_url function [ticket/13192] Add method for generating valid user page links
| | * | | | | [ticket/13192] Add test for app.php in external subfolderMarc Alexander2015-01-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | | [ticket/13192] Use ltrim() instead of preg_replace()Marc Alexander2015-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | | [ticket/13192] Order test cases consistentlyMarc Alexander2015-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | | [ticket/13192] Remove app.php on mod rewrite even if app.php is outside rootMarc Alexander2015-01-042-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | | [ticket/13192] Pass correct parameters and rename method to get_valid_pageMarc Alexander2014-10-213-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | | [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globalsMarc Alexander2014-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $request global existed twice and the $phpEx global is not being used in confirm_box(). PHPBB3-13192
| | * | | | | [ticket/13192] Use get_valid_user_page method in build_url functionMarc Alexander2014-10-211-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | | [ticket/13192] Add method for generating valid user page linksMarc Alexander2014-10-212-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-171-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13511] Call the check() method with the phpcsFile object
| * | | | | | Merge pull request #3299 from Nicofuma/ticket/13511Andreas Fischer2015-01-171-7/+7
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13511] Call the check() method with the phpcsFile object * Nicofuma/ticket/13511: [ticket/13511] Call the check() method with the phpcsFile object
| | * | | | | [ticket/13511] Call the check() method with the phpcsFile objectTristan Darricau2015-01-171-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13511
* | | | | | Merge pull request #3237 from MGaetan89/ticket/12487Tristan Darricau2015-01-165-89/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12487] Update PHP code * MGaetan89/ticket/12487: [ticket/12487] Update PHP code
| * | | | | | [ticket/12487] Update PHP codeGaëtan Muller2015-01-115-89/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12487
* | | | | | | Merge pull request #3290 from MGaetan89/ticket/13499Tristan Darricau2015-01-153-21/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13499] Move get_remote_file() to functions_compatibility.php * MGaetan89/ticket/13499: [ticket/13499] Move `get_remote_file()` to `functions_compatibility.php`
| * | | | | | | [ticket/13499] Move `get_remote_file()` to `functions_compatibility.php`Gaëtan Muller2015-01-153-21/+21
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13499
* | | | | | | Merge pull request #3289 from MGaetan89/ticket/13450Tristan Darricau2015-01-1472-14/+253
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13450] Type-hint return value of $phpbb_container->get() * MGaetan89/ticket/13450: [ticket/13450] Type-hint return value of $phpbb_container->get()
| * | | | | | | [ticket/13450] Type-hint return value of $phpbb_container->get()Gaëtan Muller2015-01-1272-14/+253
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13450
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-134-2/+31
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3234 from brunoais/ticket/13154Joas Schilling2015-01-134-2/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13154] Event to edit user list for notification in notifications
| | * | | | | | [ticket/13154] Don't assign dispatcher to a variable. Just the obj param.brunoais2015-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
| | * | | | | | [ticket/13154] Wrong variable name in the comment blockbrunoais2014-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
| | * | | | | | [ticket/13154] space before @varbrunoais2014-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not a tab. PHPBB3-13154
| | * | | | | | [ticket/13154] Fix submit_post_test() test groupbrunoais2014-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
| | * | | | | | [ticket/13154] Forgot the $this->brunoais2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
| | * | | | | | [ticket/13154] Adjusting phpBB tests for the dispatcherbrunoais2014-12-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
| | * | | | | | [ticket/13154] Adding phpBB dispatcher to notifications managerbrunoais2014-12-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
| | * | | | | | [ticket/13154] Allow filtering the list of users to be notifiedbrunoais2014-12-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13154
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-131-2/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3233 from brunoais/ticket/13160Joas Schilling2015-01-131-2/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13160] Viewtopic; before viewing permissions event
| | * | | | | | | [ticket/13160] New line before comment blockbrunoais2015-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13160
| | * | | | | | | [ticket/13146] Remove empty linebrunoais2015-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146