| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-14619
|
|\
| |
| |
| |
| |
| |
| |
| | |
* prep-release-3.2.0-b2:
[prep-release-3.2.0-b2] Add schema.json
[prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
[prep-release-3.2.0-b2] Add migration for 3.2.0-b2
[prep-release-3.2.0-b2] Update version to 3.2.0-b2
|
| | |
|
|\ \ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).
PHPBB3-14495
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[ticket/14497] Support second app.php script in install folder
* marc1706/ticket/14497:
[ticket/14497] Do not check for doctype on index and use correct return
[ticket/14497] Add test for visiting installer
[ticket/14497] Use nginx sample config in travis tests
[ticket/14497] Support second app.php script in install folder
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-14497
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
[ticket/14381] Set the mode in message parser to "reparse"
* JoshyPHP/ticket/14381:
[ticket/14381] Set the mode in message parser to "reparse"
[ticket/14495] Updates the version to 3.3.0-a1-dev
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| |\ \ \ \ |
|
| | |_|/ /
| |/| | |
| | | | |
| | | | | |
PHPBB3-14495
|
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
phpBB/adm/style/install_update_diff.html
phpBB/adm/style/installer_header.html
phpBB/install/database_update.php
phpBB/install/index.php
phpBB/styles/subsilver2/template/overall_header.html
phpBB/styles/subsilver2/template/simple_header.html
phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
phpBB/styles/subsilver2/template/viewtopic_print.html
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.
PHPBB3-14136
|
|\ \ \ \
| |_|_|/
|/| | |
| | | | |
[ticket/14499] Add command to update the board from CLI
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-14499
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-14499
|
| | |/
| |/|
| | |
| | | |
PHPBB3-14499
|
|\ \ \
| |/ /
|/| /
| |/
| |
| | |
Conflicts:
phpBB/docs/events.md
phpBB/styles/subsilver2/template/memberlist_view.html
|
| |\
| | |
| | |
| | | |
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
|
| | |
| | |
| | |
| | | |
PHPBB3-14316
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/constants.php
phpBB/includes/functions_user.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* 3.1.x:
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
* rxu/ticket/14356-fix:
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-14356
|
| | | | |
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
[ticket/14289] Add events to navbar header
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14289
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14289
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14289
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14289
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
|
| | | | | | |
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
phpBB/styles/prosilver/template/viewtopic_body.html
phpBB/styles/subsilver2/template/viewtopic_body.html
|
| |\ \ \ \ \
| | |/ / / /
| |/| | / /
| | | |/ /
| | |/| | |
[ticket/14356] Add template events to viewtopic around back2top link
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14356
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| |/ / / |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
* 3.1.x:
[ticket/14271] Properly use try_files in nginx sample config
[ticket/14271] Improve try_files and use split path info
[ticket/14271] Update sample config
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
[ticket/14271] Update sample config
* marc1706/ticket/14271:
[ticket/14271] Properly use try_files in nginx sample config
[ticket/14271] Improve try_files and use split path info
[ticket/14271] Update sample config
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14271
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14271
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14271
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-14339
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
phpBB/composer.json
phpBB/docs/INSTALL.html
phpBB/docs/README.html
|