1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-20 08:31:32 +02:00
Commit Graph

4774 Commits

Author SHA1 Message Date
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
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
c221858fab Merge branch '3.3.x' 2020-01-30 21:38:35 +01:00
KYPREO
c927c31391 [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-28 23:57:31 +11:00
JoshyPHP
2dbcad7840 [ticket/16342] Increase default hashing costs for Argon2 passwords
PHPBB3-16342
2020-01-28 01:42:39 +01:00
Marc Alexander
e31c05f065 Merge branch '3.3.x' 2020-01-22 21:22:45 +01:00
Marc Alexander
b3d07e26fc Merge pull request #5822 from rxu/ticket/16307
[ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set
2020-01-22 21:22:38 +01:00
KYPREO
68677b8525 [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-22 20:21:12 +11:00
Marc Alexander
8bdad7d73e [ticket/16314] Reorder controller helper constructor parameters
PHPBB3-16314
2020-01-20 17:28:37 +01:00
KYPREO
0b03fa963a [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-20 22:16:38 +11: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
765f2cfb5f Merge branch '3.3.x' 2020-01-18 14:34:37 +01:00
Alfredo Ramos
ff5fe30407 [ticket/16323] Replace the spaceless tag with its homologue filter
PHPBB3-16323
2020-01-14 14:44:34 -06:00
Marc Alexander
a6cd4df423 Merge pull request #5808 from marc1706/ticket/16284
[ticket/16284] Move 4.0 migrations to v400 folder
2020-01-14 21:20:09 +01:00
Marc Alexander
6acdfab319 [ticket/16284] Add depends_on to classes
PHPBB3-16284
2020-01-14 17:43:17 +01:00
Marc Alexander
c2505ade2a Merge branch '3.3.x' 2020-01-11 16:49:12 +01:00
3D-I
f26e20e1e9 [ticket/16308] Fix UCP reset password
remove HTML from PHP and code beautify

PHPBB3-16308
2020-01-10 23:23:15 +01:00
3D-I
a2fa918da2 [ticket/16308] Fix UCP reset password
PHPBB3-16308
2020-01-09 23:55:47 +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
75c03dd81e [ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set
PHPBB3-16307
2020-01-08 22:05:55 +07: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
417ec86d8a Merge branch '3.3.x' 2020-01-06 12:01:26 +01:00
Marc Alexander
17d4dcc30b Merge pull request #5820 from marc1706/ticket/16293
[ticket/16293] Do not update to hashes that don't support combined hashing
2020-01-06 11:20:39 +01:00
Marc Alexander
16dbbdb34c [ticket/16293] Do not update to hashes that don't support combined hashing
PHPBB3-16293
2020-01-06 11:18:16 +01:00
Marc Alexander
d4293866b3 Merge pull request #5818 from marc1706/ticket/16266
[ticket/16266] Remove extra declaration of constants
2020-01-05 15:29:40 +01:00
Marc Alexander
9fa058a8bd [ticket/16266] Remove extra declaration of constants
PHPBB3-16266
2020-01-05 14:58:17 +01:00
Marc Alexander
944a748cb6 [prep-release-3.3.0] Add migration for 3.3.0 2020-01-04 21:54:59 +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
4f39da4343 [prep-release-3.2.9] Add migration for 3.2.9 2020-01-04 10:17:57 +01:00
rxu
4ed854c818 [ticket/16288] PHP 8 compatibility
PHPBB3-16288
2020-01-03 02:21:37 +07:00
Marc Alexander
fa39235a0d Merge branch '3.3.x' 2020-01-02 10:46:56 +01:00
Marc Alexander
dce0441ecf Merge pull request #5809 from marc1706/ticket/16285
[ticket/16285] Add sanity checks to migrations for 3.3
2020-01-02 10:46:52 +01:00
Marc Alexander
ba2f1e1689 Merge branch '3.3.x' 2020-01-02 10:22:19 +01:00
Marc Alexander
46b70ded94 Merge pull request #5805 from 3D-I/ticket/16283
[ticket/16283] Update requirements for 3.3.0
2020-01-02 10:20:53 +01:00
Marc Alexander
481bd70b26 Merge branch '3.3.x' 2020-01-02 10:13:45 +01:00
3D-I
fa099867a8 [ticket/16279] Add permission for Emoji in topic title
PHPBB3-16279
2020-01-02 10:02:01 +01:00
3D-I
48eb74cfcd [ticket/16279] Add permission for Emoji in topic title
PHPBB3-16279
2020-01-02 10:01:48 +01:00
Marc Alexander
db5121511d Merge pull request #5802 from 3D-I/ticket/16279
[ticket/16279] Add permission for Emoji in topic title
2020-01-02 09:59:25 +01:00
3D-I
c7dd7d42c6 [ticket/16283] Update requirements for 3.3.0
PHPBB3-16283
2020-01-01 19:23:50 +01:00
3D-I
0806d34eee [ticket/16279] Add permission for Emoji in topic title
PHPBB3-16279
2020-01-01 19:11:45 +01:00
Marc Alexander
706a10d4cf Merge pull request #5792 from KYPREO/ticket/16269
[ticket/16269] Strip HTML markup from Sphinx search index
2020-01-01 17:26:10 +01:00
Marc Alexander
a0e2fa9a45 Merge branch '3.3.x' 2020-01-01 16:35:46 +01:00
Marc Alexander
7ae7502146 Merge pull request #5798 from rxu/ticket/16277
[ticket/16277] Move from each() function
2020-01-01 16:35:42 +01:00
Marc Alexander
14e3eb2d0e Merge branch '3.3.x' 2020-01-01 16:25:15 +01:00