a2838ad0b1
Merge branch '3.1.x' into 3.2.x
2016-08-28 15:54:11 +02:00
a019a86bfc
Merge pull request #4338 from Senky/ticket/14469
...
Add viewforum_body_topicrow_before template event
2016-08-28 15:53:30 +02:00
7c79e7844c
Merge branch '3.1.x' into 3.2.x
2016-08-28 15:44:49 +02:00
71a70500ea
Merge pull request #4389 from kasimi/ticket/14715-3.1.x
...
[ticket/14715] Add template events in posting_topic_review & mcp_topic
2016-08-28 15:41:59 +02:00
317f3e848f
[ticket/14469] Add viewforum_body_topicrow_before template event
...
PHPBB3-14469
2016-08-11 10:25:51 +02:00
6cc4d78ebf
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/styles/subsilver2/template/memberlist_email.html
2016-08-03 22:21:25 +02:00
5330ea0f09
Merge pull request #4324 from Senky/ticket/14516
...
[ticket/14516] Add memberlist_email_before event
2016-08-03 22:20:48 +02:00
33cd613406
[ticket/14715] Converted tabs to spaces
...
PHPBB3-14715
2016-07-22 12:17:15 +02:00
20e08aa2a0
[ticket/14715] Fixed typos in events.md
...
PHPBB3-14715
2016-07-21 17:49:35 +02:00
da7c41f167
[ticket/14715] Add template events in posting_topic_review & mcp_topic
...
The events will allow adding content before and after the post details
in topic review and topic moderation.
PHPBB3-14715
2016-07-21 17:48:42 +02:00
775df0eb8a
[ticket/14516] Add memberlist_email_before event
...
PHPBB3-14516
2016-07-17 20:43:40 +02:00
4e480d46f5
Merge pull request #4311 from Crizz0/ticket/14620
...
[ticket/14620] Change docs/ and files to 3.2.x
2016-07-17 17:52:05 +02:00
6f1b635992
[ticket/14506] Remove subsilver2 from docs/events.md
...
PHPBB3-14506
2016-07-16 22:50:37 +02:00
019e85d064
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/styles/subsilver2/template/mcp_move.html
2016-07-16 21:25:17 +02:00
b54aa81cdd
Merge pull request #4337 from Senky/ticket/14506
...
Add mcp_move_before template event
2016-07-16 21:24:33 +02:00
c9cfde7837
[ticket/14620] Adds link to Translations forum
...
PHPBB3-14620
2016-07-14 20:23:46 +02:00
45ba2e9770
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/install/install_install.php
phpBB/language/en/install.php
2016-07-07 19:19:40 +02:00
55b854906d
Merge pull request #4342 from Senky/ticket/14654
...
[ticket/14654] Change Imagemagick to ImageMagick
2016-07-07 19:15:33 +02:00
dbf02b4514
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x
...
* upstream/prep-release-3.2.0-RC1:
[prep-release-3.2.0-RC1] Update changelog
[prep-release-3.2.0-RC1] Add migration
[prep-release-3.2.0-RC1] Update schema.json
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
2016-06-27 21:54:41 +02:00
63b902c2f9
[ticket/14620] Changes specific update-support to general: <=beta to >=RC1
...
PHPBB3-14620
2016-06-21 20:18:15 +02:00
597e7163c0
Merge pull request #4233 from VSEphpbb/ticket/14547
...
[ticket/14547] Add Vagrant support to phpBB
2016-06-20 21:22:34 +02:00
d5e342db3a
[ticket/14547] Fix Docs and increase PHP memory limit
...
PHPBB3-14547
2016-06-19 09:40:51 -07:00
450e5b36b8
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
phpBB/styles/subsilver2/template/mcp_forum.html
phpBB/styles/subsilver2/template/search_results.html
phpBB/styles/subsilver2/template/viewforum_body.html
2016-06-19 18:07:29 +02:00
e8c6a3aa0a
[prep-release-3.2.0-RC1] Update changelog
2016-06-19 18:01:48 +02:00
e9cbb45435
[ticket/14672] Change event name add to events.md
...
PHPBB3-14672
2016-06-13 06:26:55 -04:00
7dc1af25bc
[ticket/14654] Change Imagemagick to ImageMagick
...
PHPBB3-14654
2016-06-11 21:32:16 +02:00
25ae8876b6
[ticket/14620] Adds section update from 3.0/3.1 to 3.2
...
PHPBB3-14620
2016-06-08 22:06:01 +02:00
797565dfa7
[ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date
...
PHPBB3-14620
2016-06-08 21:45:52 +02:00
800b7be873
[ticket/14620] Updates section 4.i. Full package to 3.2.0
...
PHPBB3-14620
2016-06-08 20:29:17 +02:00
6350798e97
[ticket/14506] Add mcp_move_before template event
...
PHPBB3-14506
2016-05-29 11:41:54 +02:00
85fdff8230
[ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html
...
PHPBB3-14620
2016-05-24 22:44:07 +02:00
9c34594bc3
[ticket/14595] Added smtp_port where places where smtp_host exists.
...
PHPBB3-14595
2016-05-14 09:19:26 -07:00
96973a7cec
[ticket/14620] Changes 3.1 to 3.2 links in FAQ.html
...
PHPBB3-14620
2016-05-14 15:26:05 +02:00
42053efb51
[ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issues
...
PHPBB3-14620
2016-05-14 15:13:14 +02:00
2ca49e02b4
[ticket/14620] Start to change install.html to 3.2.0 usage.
...
PHPBB3-14620
2016-05-02 22:41:44 +02:00
e9b7cb1324
[ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
...
PHPBB3-14619
2016-05-01 22:31:39 +02:00
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x
...
* 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
2016-04-28 21:58:16 +02:00
3cd0c53118
[ticket/14547] Use package compatible with phpBB requirements
...
PHPBB3-14547
2016-04-28 08:36:49 -07:00
6196e4ae4d
[ticket/14547] Add Vagrant to phpBB
...
PHPBB3-14547
2016-04-28 08:36:49 -07:00
d89b75bd36
Merge branch '3.1.x' into 3.2.x
2016-04-09 19:53:39 +02:00
e7043dc044
[prep-release-3.1.9] Add changelog for 3.1.9-RC1
2016-04-09 08:19:34 +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
97bf5e8a8d
[prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
2016-03-03 22:54:13 +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
