Marc Alexander
0ceebede32
Merge pull request #5847 from rubencm/ticket/16349
...
[ticket/16349] Fix merge issues in acp_attachments and posting_attach_body.html
2020-02-12 07:17:32 +01:00
Marc Alexander
495428f2ad
Merge branch '3.3.x'
2020-02-11 17:05:39 +01:00
Marc Alexander
b1eaaea89a
Merge branch '3.2.x' into 3.3.x
2020-02-11 17:05:34 +01:00
Marc Alexander
33c50f236a
Merge branch '3.3.x'
2020-02-06 17:36:49 +01:00
Marc Alexander
d0d1fd189b
Merge pull request #5831 from marc1706/ticket/16314
...
[ticket/16314] Improve handling of page_footer output for controllers
2020-02-06 17:19:33 +01:00
mrgoldy
76cca33525
[ticket/16335] Ensure event variables are always defined
...
PHPBB3-16335
2020-02-05 15:24:40 +01:00
rubencm
ebdb771a0a
[ticket/16349] Fix merges
...
PHPBB3-16349
2020-02-02 21:09:21 +00:00
Marc Alexander
e6624c1fd5
[ticket/16314] Deprecate phpbb_check_and_display_sql_report
...
PHPBB3-16314
2020-02-02 13:48:46 +01:00
Marc Alexander
2d5289ed7e
Merge branch '3.3.x'
2020-02-01 08:50:24 +01:00
Marc Alexander
3bb2edd53d
Merge branch '3.2.x' into 3.3.x
2020-02-01 08:50:19 +01:00
Marc Alexander
7de24bad2e
Merge pull request #5832 from KYPREO/ticket/16329
...
[ticket/16329] Add configuration options for Plupload
2020-02-01 08:50:12 +01:00
Marc Alexander
28ecd3a8c0
Merge branch '3.3.x'
2020-01-25 15:35:38 +01:00
Marc Alexander
4094d62613
Merge branch '3.2.x' into 3.3.x
2020-01-25 15:35:34 +01:00
3D-I
11e2cd925b
[ticket/16337] Fix Emoji in BBcode Helpline
...
PHPBB3-16337
2020-01-24 04:46:57 +01:00
3D-I
f7797b89ed
[ticket/16337] Fix Emoji in BBcode Helpline
...
PHPBB3-16337
2020-01-24 04:38:01 +01:00
3D-I
7d80314235
[ticket/16337] Fix Emoji in BBcode Helpline
...
PHPBB3-16337
2020-01-24 02:55:12 +01:00
KYPREO
1f22248965
Merge branch '3.2.x' into ticket/16329
2020-01-22 20:24:47 +11:00
KYPREO
68677b8525
[ticket/16329] Add configuration options for Plupload
...
PHPBB3-16329
PHPBB3-16330
2020-01-22 20:21:12 +11:00
Marc Alexander
0d4bf2df9d
Merge branch '3.3.x'
2020-01-20 17:26:03 +01:00
Marc Alexander
1d90ddc0a9
Merge branch '3.2.x' into 3.3.x
2020-01-20 17:25:56 +01:00
Marc Alexander
830d16943b
Merge pull request #5813 from 3D-I/ticket/15712
...
[ticket/15712] Fix Emoji and rich text in PM subject & draft
2020-01-20 17:25:48 +01:00
KYPREO
a1617548cf
[ticket/16329] Add configuration options for Plupload
...
PHPBB3-16329
PHPBB3-16330
2020-01-20 15:19:56 +11:00
Marc Alexander
843e3ae849
[ticket/16314] Improve handling of page_footer output for controllers
...
Moved the common template output to controller helper and added
garbage_collection handling to kernel_terminate_subscriber.
PHPBB3-16314
2020-01-19 16:03:32 +01:00
Marc Alexander
1fefef3e06
Merge branch '3.3.x'
2020-01-18 21:46:17 +01:00
Marc Alexander
6f36a478a5
Merge branch '3.2.x' into 3.3.x
2020-01-18 21:46:12 +01:00
Marc Alexander
880deabac1
Merge pull request #5821 from marc1706/ticket/16296
...
[ticket/16296] Adjust form token check for mark actions
2020-01-18 21:46:07 +01:00
Marc Alexander
6129bb08ac
Merge branch '3.3.x'
2020-01-18 16:46:58 +01:00
Marc Alexander
eba65f57ab
Merge branch '3.2.x' into 3.3.x
2020-01-18 16:46:52 +01:00
Marc Alexander
bb5cf54e61
[ticket/16328] Inform admins about PHP requirements in phpBB 3.3
...
PHPBB3-16328
2020-01-18 14:03:27 +01:00
Marc Alexander
d50d878e7b
Merge branch '3.3.x'
2020-01-09 20:34:59 +01:00
Marc Alexander
1b7c42bf53
Merge pull request #5812 from rxu/ticket/16288
...
[ticket/16288] PHP 8 compatibility
2020-01-09 20:34:53 +01:00
rxu
f69d9e9559
[ticket/16288] Drop redundant parentheses
...
PHPBB3-16288
2020-01-08 17:36:48 +07:00
Marc Alexander
11d7b71959
[ticket/16296] Adjust form token check for mark actions
...
PHPBB3-16296
2020-01-07 20:26:56 +01:00
Marc Alexander
2a5c7b1d43
Merge pull request #5731 from marc1706/ticket/16204
...
[ticket/16204] Remove hooks system
2020-01-06 22:03:23 +01:00
Marc Alexander
eb8ace14c8
[prep-release-3.3.0] Update version numbers for 3.3.0 release
2020-01-04 21:54:48 +01:00
Marc Alexander
72bf5d8d15
Merge branch '3.3.x'
2020-01-04 21:53:26 +01:00
Marc Alexander
1b8193ab8b
Merge branch '3.2.x' into 3.3.x
2020-01-04 21:51:44 +01:00
Marc Alexander
ed9cbc89c1
Merge branch 'prep-release-3.2.9' into 3.2.x
2020-01-04 14:19:57 +01:00
Marc Alexander
a2a0038368
[prep-release-3.2.9] Update version numbers for 3.2.9
2020-01-04 10:16:06 +01:00
Marc Alexander
4f007321e1
[ticket/security-250] Check form key when approving group membership
...
SECURITY-250
2020-01-03 17:24:33 +01:00
Marc Alexander
25c80df156
[ticket/security-252] Check form token on marking PM
...
SECURITY-252
2020-01-03 17:21:42 +01:00
Marc Alexander
e7a6ed20e8
[ticket/security-251] Check form token when moving PM to folder
...
SECURITY-251
2020-01-03 17:21:35 +01:00
Marc Alexander
502407a1dd
Merge pull request #58 from phpbb/ticket/security-253
...
[ticket/security-253] Check form key when exporting PM data
2020-01-03 17:19:06 +01:00
Marc Alexander
92aa37314a
Merge branch '3.3.x'
2020-01-03 11:25:55 +01:00
Marc Alexander
a0ffbfce31
[ticket/16287] Correctly pass json response to PHP file
...
PHPBB3-16287
2020-01-03 10:17:40 +01:00
3D-I
f0ebd6da0f
[ticket/15712] Add Emoji and rich text in PM Draft subject
...
Extends to Drafts
PHPBB3-15712
2020-01-03 00:06:15 +01:00
Marc Alexander
b3f80239c1
[ticket/16287] Use twig syntax and fix coding guidelines issues
...
PHPBB3-16287
2020-01-02 21:06:58 +01:00
rxu
4ed854c818
[ticket/16288] PHP 8 compatibility
...
PHPBB3-16288
2020-01-03 02:21:37 +07:00
3D-I
b0586b4f4d
[ticket/15712] Add Emoji and rich text in PM subject
...
PHPBB3-15712
2020-01-02 20:09:32 +01:00
paul sohier
f866a8fd1b
[ticket/16287] After installation an error is given over statistics submission
...
The phpBB.com website required specific fields to be available for the
statistics. This change switched over to a new statistics page on
www.phpbb.com that uses form fields instead, and that returns JSON as value.
PHPBB3-16287
2020-01-02 15:36:00 +01:00
