aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11593] initialize $is_expr as null before being passed to get_varrefDhruv2013-06-291-0/+1
| | | | PHPBB3-11593
* Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
|\ | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] fix if condition to check for IE Conflicts: phpBB/download/file.php
| * [ticket/10820] fix if condition to check for IEDhruv2013-06-141-1/+1
| | | | | | | | PHPBB3-10820
* | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-132-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (13) and riadhchtara (1) * ticket/10820: [ticket/10820] Add additional check for IE in condition [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7 [ticket/10820] remove unnecessary parentheses [ticket/10820] fix docblock [ticket/10820] add param and return to function [ticket/10820] simplify regex and escape dot [ticket/10820] Use singular return [ticket/10820] remove unnecessary condition checks [ticket/10820] add function docblock [ticket/10820] fix IE check function [ticket/10820] proper usage of global and local variable browser [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 Conflicts: phpBB/download/file.php
| * [ticket/10820] Add additional check for IE in conditionDhruv2013-06-131-2/+2
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Fix function docblockDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Inject IE version in functionDhruv2013-06-121-8/+9
| | | | | | | | PHPBB3-10820
| * [ticket/10820] fix regexDhruv2013-06-121-1/+9
| | | | | | | | | | | | Extract IE version from user agent string and then compare it with 7 PHPBB3-10820
| * [ticket/10820] remove unnecessary parenthesesDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] fix docblockDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] add param and return to functionDhruv2013-06-121-3/+6
| | | | | | | | | | | | | | Add param and return in function docblock. Rename function parameter to $user_agent. PHPBB3-10820
| * [ticket/10820] simplify regex and escape dotDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Use singular returnDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] remove unnecessary condition checksDhruv2013-06-121-2/+2
| | | | | | | | PHPBB3-10820
| * [ticket/10820] add function docblockDhruv2013-06-121-0/+4
| | | | | | | | PHPBB3-10820
| * [ticket/10820] fix IE check functionDhruv2013-06-121-8/+8
| | | | | | | | | | | | Add phpbb_ prefix to function name and return boolean value. PHPBB3-10820
| * [ticket/10820] proper usage of global and local variable browserDhruv2013-06-121-2/+2
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Image downloader recognize new version of ieriadhchtara2013-06-121-9/+14
| | | | | | | | | | | | | | | | | | | | When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 PHPBB3-10820
* | Merge branch 'develop' into ticket/10820-developDhruv2013-06-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (10) and Joas Schilling (2) # Via Andreas Fischer (3) and Joas Schilling (1) * develop: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-111-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data() Conflicts: tests/mock/cache.php
| | * Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-111-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11579: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| | | * [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The globals $db and $user are not used in that function. PHPBB3-11579
* | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-13174-2575/+5351
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (146) and others # Via Andreas Fischer (50) and others * develop: (356 commits) [ticket/11599] Copy the forums into a static array for later reuse [ticket/11602] Do not call localize_errors() if avatars are disabled [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php [ticket/11543] Add more users so #hidden <> #normal [ticket/11590] Close database connections when tearDown() is called [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count() [ticket/11481] Move prepended slash from calls into function ...
| * | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
| * | | Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0715-1171/+1542
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11481: [ticket/11481] Move prepended slash from calls into function [ticket/11481] Remove globals and use dependency injection instead [ticket/11481] Use container for all classes and inject dependencies [ticket/11481] Move functions from feed into helper class [ticket/11481] Move active topics feed to own file [ticket/11481] Move topics feed to own file [ticket/11481] Move news feed to own file [ticket/11481] Move forums feed to own file [ticket/11481] Move topic feed to own file [ticket/11481] Move forum feed to own file [ticket/11481] Move overall feed to own file [ticket/11481] Move feed topic base to own file [ticket/11481] Move feed post base to own file [ticket/11481] Move feed base to own file [ticket/11481] Move feed factory to own file
| | * | | [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-066-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0612-125/+157
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-069-34/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-063-109/+167
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-062-123/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-062-77/+93
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move news feed to own fileJoas Schilling2013-06-062-99/+115
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-062-62/+78
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-062-98/+114
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-062-129/+145
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-062-83/+99
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-062-45/+61
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-062-43/+59
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed base to own fileJoas Schilling2013-06-062-214/+230
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-062-88/+104
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-061-4/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11587: [ticket/11587] Add functional tests for group teampage settings [ticket/11587] Pass legend and teampage settings to group_create()
| | * | | | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without passing those values, the group is removed from the teampage and the legend while submitting the edit form on the ucp groups manage page. PHPBB3-11587
| * | | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-065-78/+165
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Make inTag function reusable [feature/editor-code-tabs] Check for browser support in function [feature/editor-code-tabs] Apply code editor to everything [feature/editor-code-tabs] Correctly count indentation on first line
| | * | | | | [feature/editor-code-tabs] Make inTag function reusableVjacheslav Trushkin2013-05-221-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change inTag function to reusable JS function that can check for any BBCode PHPBB3-11557
| | * | | | | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for browser support and valid textarea in function instead of before applying function. PHPBB3-11557
| | * | | | | [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-205-92/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code editor from prosilver to assets Apply code editor to subsilver2 Apply code editor to ACP elements where bbcode is allowed PHPBB3-11557
| | * | | | | [feature/editor-code-tabs] Correctly count indentation on first lineVjacheslav Trushkin2013-05-201-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly count indentation on first line of code tag PHPBB3-11557
| * | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11564' into developNathaniel Guse2013-06-062-5/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11564: [ticket/11564] Missing new line in tweaks.css [ticket/11564] Notifications popup fixes
| | * | | | | | [ticket/11564] Missing new line in tweaks.cssVjacheslav Trushkin2013-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing new line at the end of tweaks.css PHPBB3-11564
| | * | | | | | [ticket/11564] Notifications popup fixesVjacheslav Trushkin2013-05-232-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix width issue with vertical scrollbar Correctly absolutely position it above link, allowing style authors to move notifications link around in style Fix IE7 positioning PHPBB3-11564