| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
| |
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/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
|
| | |
| |
| |
| | |
PHPBB3-14339
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
phpBB/composer.json
phpBB/docs/INSTALL.html
phpBB/docs/README.html
|
| | |
| |
| |
| | |
PHPBB3-14339
|
| | |
| |
| |
| | |
PHPBB3-14205
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tests/template/template_includecss_test.php
|
| | |
| |
| |
| | |
PHPBB3-13995
|
| | |
| |
| |
| | |
PHPBB3-13995
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
PHPBB3-12599
|
| | |
| |
| |
| | |
PHPBB3-12599
|
| | |
| |
| |
| | |
PHPBB3-12599
|
| | |
| |
| |
| | |
PHPBB3-12599
|
| |/
|
|
| |
PHPBB3-13407
|
| |
|
|
| |
PHPBB3-13302
|
| |
|
|
| |
PHPBB3-13302
|
| |
|
|
| |
PHPBB3-13302
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12568
|
| |
|
|
| |
PHPBB3-12747
|
| |
|
|
| |
PHPBB3-12594
|
| |
|
|
| |
PHPBB3-12594
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11951] Add MariaDB to platforms we test on.
[ticket/11951] Add MariaDB to supported DBMSes in requirement section.
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
|
| | |
| |
| |
| | |
PHPBB3-11951
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
|
| | |
| |
| |
| | |
PHPBB3-11112
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| | |
| |
| |
| | |
PHPBB3-10776
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ticket/10776
# 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
|
| | | |
| | |
| | |
| | | |
PHPBB3-10776
|
| | | |
| | |
| | |
| | | |
PHPBB3-10776
|
| | | |
| | |
| | |
| | | |
PHPBB3-11205
|
| | | |
| | |
| | |
| | | |
PHPBB3-11181
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10441] Make CDB linking more consistent
[ticket/10441] Typo
[ticket/10441] Update to docs/README.html
Conflicts:
phpBB/docs/README.html
|
| | | |
| | |
| | |
| | | |
PHPBB3-10441
|
| | | |
| | |
| | |
| | | |
PHPBB3-10441
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated information about styles, languages, and MODs
Added a section about the Knowledge Base.
Various phrase changes.
PHPBB3-10441
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[ticket/9896] Links changed
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* Senky/ticket/9896:
[ticket/9896] Links changed
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Link to languaged updated to http://www.phpbb.com/languages/
Link to styles updated to http://www.phpbb.com/customise/db/styles-2/
Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/
Link to Community Forums updated to http://www.phpbb.com/community/
PHPBB3-9896
|
| | |/
| |
| |
| |
| | |
PHPBB3-10688
PHPBB3-10834
|