1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-06 00:43:02 +02:00

33879 Commits

Author SHA1 Message Date
Marc Alexander
0a738440af
Merge branch '3.3.x' 2020-02-14 07:06:39 +01:00
Marc Alexander
9a919d8fa3
Merge branch '3.2.x' into 3.3.x 2020-02-14 07:06:35 +01:00
Marc Alexander
b4ecdae8e4
Merge pull request #5848 from rubencm/ticket/16350
[ticket/16350] Move shared code to functions_admin.php
2020-02-14 07:06:31 +01:00
Marc Alexander
cd94e90ab9
Merge branch '3.3.x' 2020-02-14 07:05:03 +01:00
Marc Alexander
0ca20b14f5
Merge branch '3.2.x' into 3.3.x 2020-02-14 07:04:58 +01:00
Marc Alexander
e1ee0dfec1
Merge pull request #5840 from Kidounet/ticket/15395
[ticket/15395] change GIN tsvector indexes in Postgres Fulltext Search
2020-02-14 07:04:53 +01:00
Marc Alexander
90cdab3c0f
Merge branch '3.3.x' 2020-02-14 07:00:58 +01:00
Marc Alexander
685c41689e
Merge branch '3.2.x' into 3.3.x 2020-02-14 07:00:53 +01:00
Marc Alexander
8fcb5dcc4d
Merge pull request #5815 from KYPREO/ticket/16234
[ticket/16234] Fix & enhance Sphinx search backend functionality
2020-02-14 07:00:48 +01:00
KYPREO
a4855decb8 [ticket/16234] Fix & enhance Sphinx search backend functionality
PHPBB3-16234
PHPBB3-16233
PHPBB3-15367
PHPBB3-13958
2020-02-12 22:29:17 +11:00
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
KYPREO
852959cf2b [ticket/16234] Fix & enhance Sphinx search backend functionality
PHPBB3-16234
PHPBB3-16233
PHPBB3-15367
PHPBB3-13958
2020-02-12 16:42:53 +11: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
11f2c076f6
Merge pull request #5858 from mrgoldy/ticket/16335
[ticket/16335] Ensure attachment event variables are always defined
2020-02-11 17:05:29 +01:00
Marc Alexander
996b26e823
Merge branch '3.3.x' 2020-02-11 16:49:16 +01:00
Marc Alexander
10c038d8f3
Merge pull request #5859 from rxu/ticket/16360
[ticket/16360] Fix allocating color for GD 3D image CAPTCHA
2020-02-11 16:49:11 +01:00
Marc Alexander
6f8f2e675e
Merge branch '3.3.x' 2020-02-09 16:29:36 +01:00
Marc Alexander
3d4af04927
Merge branch '3.2.x' into 3.3.x 2020-02-09 16:29:30 +01:00
Marc Alexander
1af967b00e
Merge pull request #5842 from kasimi/ticket/16149
[ticket/16149] Always return default profile field data
2020-02-09 16:29:24 +01:00
rxu
b5993fc2a3
[ticket/16360] Fix allocating color for GD 3D image CAPTCHA
PHPBB3-16360
2020-02-09 19:35:06 +07:00
Kidounet
a29d2e1149
[ticket/15395] change GIN tsvector indexes in Postgres Fulltext Search
PHPBB3-15395
2020-02-09 13:11:18 +01:00
Marc Alexander
730204c1f9
Merge branch '3.3.x' 2020-02-09 12:49:10 +01:00
Marc Alexander
9cd1277d70
Merge branch '3.2.x' into 3.3.x 2020-02-09 12:49:06 +01:00
Marc Alexander
ee2a59ad59
Merge pull request #5838 from 3D-I/ticket/16339
[ticket/16339] Fix Poll's voting options refresh
2020-02-09 12:49:01 +01:00
Marc Alexander
6e42c34f79
Merge branch '3.3.x' 2020-02-09 12:24:12 +01:00
Marc Alexander
e05efe8280
Merge branch '3.2.x' into 3.3.x 2020-02-09 12:24:07 +01:00
Marc Alexander
ee33976d1d
Merge pull request #5835 from mrgoldy/ticket/15766
[ticket/15766] Check for role on changing permission settings
2020-02-09 12:24:00 +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
9e7dc9433a [ticket/16350] Move code to functions_admin
PHPBB3-16350
2020-02-04 06:33:11 +00:00
mrgoldy
87fe2847f0 [ticket/15766] Docblocks, comments and longhand variable names
PHPBB3-15766
2020-02-03 22:42:42 +01:00
rubencm
e2cc1aec26 [ticket/16350] Move shared code to functions.php
PHPBB3-16350
2020-02-02 21:45:08 +00: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
c221858fab
Merge branch '3.3.x' 2020-01-30 21:38:35 +01:00
Marc Alexander
297ac8ef4c
Merge pull request #5843 from JoshyPHP/ticket/16342
[ticket/16342] Increase default hashing costs for Argon2 passwords
2020-01-30 21:38:29 +01:00
Marc Alexander
0922605da8
Merge branch '3.3.x' 2020-01-30 21:16:53 +01:00
Marc Alexander
cd995ff45f
Merge branch '3.2.x' into 3.3.x 2020-01-30 21:16:46 +01:00
Marc Alexander
e61761e9af
Merge pull request #5834 from mrgoldy/ticket/15370
[ticket/15370] Loading indicator when submitting permissions
2020-01-30 21:16:37 +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
0bbe959fbd
Merge branch '3.3.x' 2020-01-27 19:49:01 +01:00
Marc Alexander
d2a344af5d
Merge pull request #5825 from AlfredoRamos/ticket/16313
[ticket/16313] Remove http block from sample Nginx configuration file
2020-01-27 19:45:15 +01:00
kasimi
9d5f9606a4
[ticket/16149] Always return default profile field data
PHPBB3-16149
2020-01-27 15:37:12 +01:00
Marc Alexander
28ecd3a8c0
Merge branch '3.3.x' 2020-01-25 15:35:38 +01:00