# By Nathan Guse (22) and others
# Via Nathan Guse (10) and others
* 'develop' of github.com:phpbb/phpbb3: (39 commits)
[ticket/11843] Added newlines and included numbers in the DEFINE vars test
[ticket/11843] Add checking DEFINE variables with underscores to template_test
[ticket/11843] The twig lexer fixes DEFINE variables with underscores again
[ticket/11727] Fix indentation
[ticket/11727] Fix indentation
[ticket/11745] Correct language, coding guidelines
[ticket/11828] Fix greedy operators in lexer
[ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
[ticket/11833] Fix bad template loop
[ticket/11816] !$DOESNT_EXIST test
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
[ticket/11829] Use report_closed to determine status in MCP report_details
[ticket/11816] Test !$DEFINITION
[ticket/11822] Use namespace lookup order for asset loading
[ticket/11727] Template loader support for safe directories to load files from
[ticket/11816] Fix define/loop checks in IF statements containing parenthesis
[ticket/11373] Use inheritdoc
[ticket/11637] generate_text_for_display on search.php
[ticket/11744] Cast to int
[ticket/11744] Inheritdoc
...
* develop-olympus:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* prep-release-3.0.12:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
[ticket/10772] Remove unnecessary comment
[ticket/10772] Functional tests for forum style
[ticket/10772] Use forum specific style for trigger_error
* 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' of https://github.com/phpbb/phpbb3: (29 commits)
[ticket/11588] Also use version.phpbb.com in install_update.php.
[ticket/11587] Add functional tests for group teampage settings
[ticket/11538] Add admin as admins leader and moderator in memberlist_test
[ticket/11587] Pass legend and teampage settings to group_create()
[ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
[ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
[ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
[ticket/11586] Combine administrator/moderator checks together.
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11122] Add dhruv to active authors
[ticket/11122] Remove Oleg and igorw from active authors
[ticket/10840] Add check_form_key to acp_groups.php
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
[ticket/11409] Add success message after updating group position settings
[ticket/11549] Add functional test for ACP Extension Module with Template
[ticket/11570] Fix link and make the notice more conspiciuous
[ticket/11549] Do not set extension dir path for style in adm/index.php
[ticket/11570] Add link back to update process
[ticket/11569] Add type parameter and fix language variable
[ticket/11569] Add parameter to URL and remove comment
...
Conflicts:
tests/functional/common_groups_test.php
* ticket/11568:
[ticket/11568] Split status code and html debug assertion into two methods
[ticket/11568] Add comma at end of array key-value couple
[ticket/11568] Invert logic for asserting the response
[ticket/11568] Use static calls for static methods
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* ticket/11568:
[ticket/11568] Add method to get page content
[ticket/11568] Allow different status codes
[ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
[ticket/11568] Fix common_groups_test.php form handling
[ticket/11568] Make CookieJar static aswell
[ticket/11568] Remove manual calls to assert_response_success()
[ticket/11568] Only use a static version of the client
[ticket/11568] Any output before the doc type means there was an error
[ticket/11568] Set client manually so we can increase the cURL timeout
[ticket/11568] Use Goutte Client to install the board for functional tests
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* EXreaction/ticket/11415:
[ticket/11415] Add test for find_from_extension()
[ticket/11415] Send the extension base the finder rather than the manager
[ticket/11415] Create function in finder find_from_extension
[ticket/11415] Fix ext.manager constructor in tests
[ticket/11415] Make migrator/ext.manager dependencies of the base ext class
[ticket/11415] Remove migrator dependency from extension manager
[ticket/11415] Move migrator to base extension class from ext.manager
[ticket/11415] Move while loop from ext manager to acp_extensions.php
