* remotes/dhruvgoel92/ticket/11566-develop:
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
* ticket/11566:
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
Conflicts:
phpBB/report.php
* dhruvgoel92/ticket/9341:
[ticket/9341] Assert that page doesnt contain next or prev page posts
[ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
[ticket/9341] remove PREV_PAGE tpl var used for backward compatability
[ticket/9341] Add tests for checking Next and Previous template vars
[ticket/9341] Move create_topic and post into functional test case
[ticket/9341] Use U_PREVIOUS and U_NEXT in template files
[ticket/9341] Correctly named template vars
* develop-olympus:
[ticket/10776] update min php version 5.3.3 in readme
[ticket/10776] Fixed a couple language changes in docs/README.html.
[ticket/10776] Fixed errors in docs/README.html.
Conflicts:
phpBB/docs/README.html
* dhruvgoel92/ticket/10776:
[ticket/10776] update min php version 5.3.3 in readme
[ticket/10776] Fixed a couple language changes in docs/README.html.
[ticket/10776] Fixed errors in docs/README.html.
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
[ticket/10776] Fixed a couple language changes in docs/README.html.
[ticket/10776] Fixed errors in docs/README.html.
Conflicts:
phpBB/docs/README.html
When search returns no results there is no need to go inside the if
statement. Since $result_count becomes zero, $start becomes negative
which leads to failed assertion.
PHPBB3-11437
# 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
# 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()
# 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
...
