93f932b80f
[ticket/14495] Revert changes in master
...
PHPBB3-14495
2016-04-02 12:12:24 +02:00
83b56f7855
[ticket/14495] Specify correct version numbers in 3.2.x
...
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
2016-04-02 10:06:59 +02:00
3eb6f7176a
Merge pull request #4193 from marc1706/ticket/14497
...
[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
2016-03-25 11:46:15 +01:00
f6cc30cbfe
Merge pull request #4245 from JoshyPHP/ticket/14381
...
[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
2016-03-25 11:03:27 +01:00
2e3f89444a
Merge branch 'ticket/14136' into ticket/14136-3.2.x
...
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
2016-03-24 16:12:56 +01:00
244d171cb0
[ticket/14136] Add back X-UA-Compatible meta tag
...
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
2016-03-24 16:07:07 +01:00
b324cf1907
Merge branch '3.2.x'
2016-02-29 21:45:16 +01:00
b80cb8e796
Merge pull request #4194 from Nicofuma/ticket/14499
...
[ticket/14499] Add command to update the board from CLI
2016-02-29 21:45:11 +01:00
52dffef03c
[ticket/14499] Fix wording and comments
...
PHPBB3-14499
2016-02-29 20:27:12 +01:00
8ec1a60156
[ticket/14499] Add missing config settings
...
PHPBB3-14499
2016-02-28 20:49:18 +01:00
47f70a4cfd
Merge branch '3.2.x'
2016-02-27 10:55:17 +01:00
a937e38bd5
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/docs/events.md
phpBB/styles/subsilver2/template/memberlist_view.html
2016-02-27 10:54:48 +01:00
34389df1ae
Merge pull request #4049 from rxu/ticket/14316
...
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
2016-02-27 10:52:09 +01:00
673acc7313
[ticket/14316] Add events before/after the custom/zebra fields in profile view
...
PHPBB3-14316
2016-02-27 11:53:19 +07:00
5bdfc6167b
[ticket/14499] Add command to update the board from CLI
...
PHPBB3-14499
2016-02-25 22:39:42 +01:00
37b2791837
[ticket/14497] Support second app.php script in install folder
...
PHPBB3-14497
2016-02-25 15:34:32 +01:00
294f926bfc
[ticket/14495] Updates the version to 3.3.0-a1-dev
...
PHPBB3-14495
2016-02-24 22:25:41 +01:00
8663edce76
Merge branch '3.1.x' into 3.2.x
...
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
2016-02-13 18:08:01 +01:00
cafd165bd0
[prep-release-3.1.8] Update changelog
2016-02-13 16:45:51 +01:00
e63493115a
[prep-release-3.1.8] Add changelog for 3.1.8-RC1
2016-02-13 14:57:53 +01:00
df505d772d
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
2016-02-05 20:36:57 +01:00
8a2f564f3d
Merge pull request #4164 from rxu/ticket/14356-fix
...
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
* rxu/ticket/14356-fix:
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
2016-02-05 20:36:47 +01:00
408ba75321
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description
...
PHPBB3-14356
2016-02-06 00:37:00 +07:00
3e0aa1b3a4
[prep-release-3.2.0-b1] Add changelog for 3.2.0-b1
2016-02-05 15:56:28 +01:00
3a4dae369d
Merge branch '3.1.x'
2016-01-27 14:31:29 +01:00
3c4f150859
Merge pull request #4029 from RMcGirr83/ticket_14289
...
[ticket/14289] Add events to navbar header
2016-01-27 14:29:14 +01:00
3af3c391a7
[ticket/14289] Fix location in events.md file
...
PHPBB3-14289
2016-01-19 06:29:09 -05:00
9b51fe2dd5
[ticket/14289] Move append before prepend in events doc
...
PHPBB3-14289
2016-01-16 09:21:07 -05:00
469b975f94
[ticket/14289] Change to 3.1.8-RC1 and rename event
...
PHPBB3-14289
2016-01-10 07:17:43 -05:00
7f7b09fdeb
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
2016-01-09 18:45:32 +01:00
fd5e66cbf1
Merge branch 'prep-release-3.1.7' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2016-01-09 18:42:07 +01:00
85e98a9d70
[prep-release-3.1.7] Add changelog for 3.1.7-pl1
2016-01-09 09:46:32 +01:00
d3ca327f2c
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/prosilver/template/viewtopic_body.html
phpBB/styles/subsilver2/template/viewtopic_body.html
2016-01-07 16:28:44 +01:00
a7058d968f
Merge pull request #4079 from rxu/ticket/14356
...
[ticket/14356] Add template events to viewtopic around back2top link
2016-01-07 16:26:16 +01:00
7381e99517
[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2
2015-12-19 17:17:01 +01:00
33db45edac
[ticket/14356] Add template events to viewtopic around back2top link
...
PHPBB3-14356
2015-12-17 23:18:37 +07:00
b2a26ab5f4
Merge branch '3.1.x'
...
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
2015-12-12 15:24:29 +01:00
099a1b5f75
[prep-release-3.1.7] Add changelog for 3.1.7-RC1
2015-12-12 01:37:56 +01:00
4bcec475fe
Merge branch '3.1.x'
...
* 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
2015-12-08 19:48:12 +01:00
901785bc5e
Merge pull request #4018 from marc1706/ticket/14271
...
[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
2015-12-08 19:48:02 +01:00
61255a8982
[ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions"
...
PHPBB3-14339
2015-12-07 21:35:23 +01:00
1dba763e09
Merge branch 'ticket/14339' into ticket/14339-master
...
Conflicts:
phpBB/composer.json
phpBB/docs/INSTALL.html
phpBB/docs/README.html
2015-12-07 21:33:59 +01:00
e8247faacc
[ticket/14339] Properly state PHP version support
...
PHPBB3-14339
2015-12-05 13:54:39 +01:00
3698e9b8e0
Merge branch 'prep-release-3.2.0-a1'
...
* prep-release-3.2.0-a1:
[prep-release-3.2.0-a1] Add changelog for 3.2.0-a1
[prep-release-3.2.0-a1] Add migration for 3.2.0-a1
[prep-release-3.2.0-a1] Update version to 3.2.0-a1
2015-11-23 23:17:01 +01:00
780e472458
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/prosilver/template/viewtopic_body.html
phpBB/styles/subsilver2/template/viewtopic_body.html
2015-11-15 19:56:30 +01:00
e3f1cca911
Merge pull request #3888 from Senky/ticket/14146
...
[ticket/14146] Add viewtopic_body_post_subject_before event
2015-11-15 19:48:50 +01:00
7c736d527d
[ticket/14289] Add events to navbar header
...
PHPBB3-14289
2015-11-13 05:50:10 -05:00
f7a25ad8c3
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
2015-11-13 09:36:04 +01:00
19c84dabe1
[ticket/14066] Change the events listing order in events.md.
...
PHPBB3-14066
2015-11-12 20:53:36 +07:00
9ef06d67e6
[ticket/14066] Add template events to search_body.html
...
PHPBB3-14066
2015-11-12 20:53:35 +07:00
