Oliver Schramm
aa961991fd
[ticket/15339] Allow a module to have multiple parents
...
Also restore old behaviour from Olympus regarding re-sorting modules
PHPBB3-15339
2017-11-17 01:29:38 +01:00
Marc Alexander
c123254242
Merge branch '3.2.x'
2017-11-16 22:11:11 +01:00
Marc Alexander
0517e43dff
Merge pull request #4976 from rubencm/ticket/15171
...
[ticket/15171] Replace all BBCode templates by default
2017-11-16 21:56:57 +01:00
Máté Bartus
cd757469a6
Merge branch '3.2.x'
2017-11-15 21:45:10 +01:00
Máté Bartus
1a1a2dc046
Merge pull request #4949 from marc1706/ticket/15353
...
[ticket/15353] Make sure users can continue update after merging file diff
2017-11-15 21:44:53 +01:00
JoshyPHP
288def143c
[ticket/15442] Allow unsafe HTML in bbcode.html
...
PHPBB3-15442
2017-11-07 10:34:11 +01:00
rxu
f9b9d659a1
[ticket/15224] Fix some MySQL fulltext index searching errors
...
PHPBB3-15224
2017-11-04 19:14:04 +07:00
Marc Alexander
c309b4cd8d
Merge branch '3.2.x'
2017-11-01 18:02:14 +01:00
Marc Alexander
22e97296af
Merge pull request #5019 from marc1706/ticket/14994
...
[ticket/14994] Refactor template->assign_block_var
2017-11-01 17:23:33 +01:00
Marc Alexander
a3fd51ae47
Merge branch '3.2.x'
2017-11-01 15:59:09 +01:00
Marc Alexander
44277d6a0d
Merge pull request #5013 from rxu/ticket/15419
...
[ticket/15419] Fix Sphinx UTF8 search in delta index
2017-11-01 15:59:05 +01:00
javiexin
a30693a594
[ticket/14994] Refactor template->assign_block_var
...
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array. This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests. Added PHP 7.2 compatibility.
PHPBB3-14994
2017-11-01 12:29:49 +01:00
javiexin
c2043e47da
[ticket/14994] Refactor template->assign_block_var
...
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array. This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests. Added PHP 7.2 compatibility.
PHPBB3-14994
2017-11-01 12:29:49 +01:00
Marc Alexander
e157d8890b
Merge pull request #5020 from marc1706/ticket/15424
...
[ticket/15424] Multiple typo fixes in docs & comments
2017-11-01 12:27:13 +01:00
Marc Alexander
14cb1b9cfc
Merge branch '3.2.x'
2017-11-01 12:19:46 +01:00
Marc Alexander
c14cc433b7
Merge pull request #4988 from Elsensee/ticket/15389
...
[ticket/15389] Allow arrays in event dispatcher
2017-11-01 12:00:23 +01:00
Marc Alexander
6259789e02
Merge branch '3.2.x'
2017-11-01 10:40:01 +01:00
Marc Alexander
a6c5204cbd
Merge pull request #4973 from DavidIQ/ticket/15372
...
[ticket/15372] Add permission for listing topics without being able to read them
2017-11-01 10:39:56 +01:00
Marc Alexander
28df230f8d
Merge branch '3.2.x'
2017-10-31 16:13:39 +01:00
Marc Alexander
131c264492
Merge pull request #4985 from senky/ticket/13150
...
[ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after
2017-10-31 16:13:34 +01:00
Rubén Calvo
4bf0f4a50f
[ticket/15171] Add migration
...
PHPBB3-15171
2017-10-31 14:37:36 +01:00
Rubén Calvo
3bfd006e77
[ticket/15171] Fix texformatter
...
PHPBB3-15171
2017-10-31 14:30:45 +01:00
Marc Alexander
ea23d456d5
Merge branch '3.2.x'
2017-10-31 09:58:33 +01:00
Marc Alexander
fbbd1713d7
Merge pull request #4969 from Elsensee/ticket/15245
...
[ticket/15245] Fix images in feeds when accessing via app.php
2017-10-31 09:58:29 +01:00
Marc Alexander
0c009e3feb
Merge pull request #4959 from rubencm/ticket/15366
...
[ticket/15366] Remove useless code
2017-10-29 22:09:49 +01:00
Marc Alexander
7a54b0631d
Merge branch '3.2.x'
2017-10-29 12:49:25 +01:00
Marc Alexander
d56e573a8e
Merge pull request #4950 from Nicofuma/ticket/15357-3.2.x
...
[ticket/15298] Never suppress exception trace when using CLI
2017-10-29 12:49:16 +01:00
luzpaz
e13ba99c81
[ticket/15424] Multiple typo fixes in docs & comments
...
Fixed typos in some docs, guidelines, some non-user-facing files.
PHPBB3-15424
2017-10-29 12:44:01 +01:00
javiexin
e32324c72a
[ticket/14994] Refactor template->assign_block_var
...
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array. This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
PHPBB3-14994
2017-10-29 11:06:18 +01:00
Oliver Schramm
297278a45c
Merge branch 'ticket/15339' into ticket/15339-33
2017-10-28 04:00:22 +02:00
David Colón
33ceceda02
[ticket/15372] Add permission to schema and copy from f_read
2017-10-26 16:21:50 -04:00
David Colón
4ae7cb89ff
[ticket/15372] Remove revert_data from migration
2017-10-26 16:09:01 -04:00
David Colón
2ba529e144
[ticket/15372] Fix pagination and don't render viewtopic link
2017-10-26 16:09:01 -04:00
David Colón
e55480385b
[ticket/15372] Migration for adding f_list_topic permission
2017-10-26 16:09:01 -04:00
David Colón
dc5267728b
[ticket/15372] Add and handle f_list_topics permission
2017-10-26 16:09:01 -04:00
rxu
4f0b736f14
[ticket/15419] Fix Sphinx UTF8 search in delta index
...
PHPBB3-15419
2017-10-24 20:35:25 +07:00
Marc Alexander
d11db17e2c
Merge branch '3.2.x'
2017-10-22 10:19:35 +02:00
Marc Alexander
3b5c624c03
Merge pull request #4930 from rubencm/ticket/15201
...
[ticket/15201] Set user style to default style when it is disabled or uninstalled
2017-10-22 10:19:30 +02:00
Marc Alexander
5338b7a361
Merge branch '3.2.x'
2017-10-17 19:54:24 +02:00
Marc Alexander
7bdff132ff
Merge pull request #4997 from kasimi/ticket/15396
...
[ticket/15396] Fix revert_schema() steps not executed in correct order
2017-10-17 19:54:19 +02:00
Marc Alexander
d509bd9baa
Merge pull request #4947 from rubencm/ticket/15289-2
...
[ticket/15289] Allow to configure storage from acp
2017-10-16 21:05:01 +02:00
Marc Alexander
3dc1cde5c6
Merge branch '3.2.x'
2017-10-15 21:32:26 +02:00
Julien Tant
5aceccf00b
[ticket/15401] Use separate constant for memcached driver config
...
PHPBB3-15401
2017-10-15 14:13:26 +02:00
kasimi
ed9b896d22
[ticket/15396] Fix revert_schema() steps not executed in correct order
...
PHPBB3-15396
2017-10-13 14:46:32 +02:00
Marc Alexander
f57e377847
[ticket/15353] Use empty where applicable
...
PHPBB3-15353
2017-10-12 21:56:59 +02:00
Jakub Senko
4d333e7f70
[ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after
...
PHPBB3-13150
2017-10-09 16:42:48 +02:00
Rubén Calvo
eaeec9b50b
[ticket/15377] Use __DIR__ constant
...
PHPBB3-15377
2017-10-09 12:31:57 +02:00
Rubén Calvo
18c5f5c6e8
[ticket/15377] Fix INCLUDECSS and INCLUDEJS
...
PHPBB3-15377
2017-10-05 20:54:01 +02:00
Oliver Schramm
bba4b4fc30
Merge branch '3.2.x'
2017-10-05 15:40:28 +02:00
Oliver Schramm
9c91bc4976
Merge pull request #4967 from Leinad4Mind/3.2.x
...
[PHPBB3-14629] round() the log() explicitly to a proper integer
2017-10-05 15:40:24 +02:00