| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| | |
* develop-ascraeus:
[ticket/13023] Add template event posting_editor_buttons_custom_tags_before
Conflicts:
phpBB/styles/subsilver2/template/posting_buttons.html
|
| | |\
| | |
| | |
| | |
| | | |
* Nicofuma/ticket/13023:
[ticket/13023] Add template event posting_editor_buttons_custom_tags_before
|
| | | |
| | |
| | |
| | | |
PHPBB3-13023
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-ascraeus:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/memberlist_email.html
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* ticket/13262:
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-13262
|
| | |/ /
| | |
| | |
| | | |
PHPBB3-13267
|
| |\ \ \ |
|
| | |/ /
| | |
| | |
| | | |
PHPBB3-13262
|
| |\ \ \
| |/ / |
|
| | | | |
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-ascraeus:
[prep-release-3.1.0] Update CHANGELOG with last minute changes
|
| | | | |
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-ascraeus:
[prep-release-3.1.0] Add missing CHANGELOG entries for RC6
|
| | | | |
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-ascraeus:
[prep-release-3.1.0] Add CHANGELOG for 3.1.0
|
| | | | |
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-ascraeus:
[ticket/13208] Add security issues to the final changelog
[prep-release-3.1.0] Prepare Changelog
[prep-release-3.1.0] Update version to 3.1.0
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| | | | |
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| | | | |
|
| | | | |
|
| |\ \ \
| |/ / |
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
phpBB/docs/AUTHORS
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12120
|
| |\ \ \ \
| |/ / / |
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-13187
|
| |\ \ \ \
| |/ / / |
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12568
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
phpBB/styles/subsilver2/template/viewtopic_body.html
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-13025
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-13025
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-13025
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
phpBB/styles/subsilver2/template/forumlist_body.html
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-13107
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
phpBB/styles/subsilver2/template/ucp_header.html
|