Marc Alexander
9d7acd1897
Merge pull request #4613 from rxu/ticket/14958
...
[ticket/14958] Optimize Twig extension lang() function
2017-01-06 15:29:35 +01:00
Marc Alexander
49b2269155
Merge branch '3.2.x'
2017-01-06 13:53:43 +01:00
Marc Alexander
f423c2803a
Merge pull request #4617 from marc1706/ticket/14949
...
[ticket/14949] Pass full notification array and post data for updating
2017-01-06 13:53:39 +01:00
Marc Alexander
93ca17f07a
Merge branch 'ticket/security-181' into ticket/security-181-rhea
2017-01-06 12:49:35 +01:00
Marc Alexander
1dea4625d0
[ticket/security-181] Update wording in INSTALL.html
...
SECURITY-181
2017-01-06 12:27:38 +01:00
Marc Alexander
743d3af3c5
[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
...
PHPBB3-14961
2017-01-06 12:06:39 +01:00
Marc Alexander
a187c46072
Merge branch '3.2.x'
2017-01-06 01:14:13 +01:00
Marc Alexander
91637f8070
Merge pull request #4608 from marc1706/ticket/14954
...
[ticket/14954] Properly check if topic has attachments in mcp_queue
2017-01-06 01:14:09 +01:00
Marc Alexander
839fec4a0c
Merge branch '3.2.x'
2017-01-06 01:12:43 +01:00
Marc Alexander
70cf5ddf9d
Merge pull request #4615 from marc1706/ticket/14946
...
[ticket/14946] Make sure to pass integers to max()
2017-01-06 01:12:39 +01:00
Marc Alexander
0543413626
Merge branch '3.2.x'
2017-01-06 01:06:10 +01:00
Marc Alexander
864953ebff
Merge pull request #4616 from marc1706/ticket/14945
...
[ticket/14945] Parse signature preview with generate_text_for_display()
2017-01-06 01:06:06 +01:00
Marc Alexander
af4f477a1b
[ticket/14961] Also translate "learn more" link
...
PHPBB3-14961
2017-01-06 01:04:14 +01:00
Marc Alexander
e0eeea800c
[ticket/14961] Add cookie notice as enablable feature
...
Uses Insites cookieconsent v3.0.3:
https://cookieconsent.insites.com
PHPBB3-14961
2017-01-06 00:57:12 +01:00
Marc Alexander
0a68593dd2
[ticket/14949] Pass full notification array and post data for updating
...
PHPBB3-14949
2017-01-05 23:39:30 +01:00
Marc Alexander
93567727fe
Merge branch '3.2.x'
2017-01-04 22:16:47 +01:00
Marc Alexander
0c6c94e527
Merge branch '3.1.x' into 3.2.x
2017-01-04 22:16:24 +01:00
Marc Alexander
77b3f36992
Merge pull request #4532 from senky/ticket/14662
...
[ticket/14662] Add memberlist_team_username_prepend/append
2017-01-04 22:15:37 +01:00
Marc Alexander
777a1ad916
[ticket/14945] Parse signature preview with generate_text_for_display()
...
PHPBB3-14945
2017-01-04 22:04:07 +01:00
Marc Alexander
13d0549e59
Merge branch '3.2.x'
2017-01-04 21:50:47 +01:00
Marc Alexander
cfa2bc534b
Merge branch '3.1.x' into 3.2.x
2017-01-04 21:50:25 +01:00
Marc Alexander
a0abb1e10e
Merge pull request #4600 from hubaishan/ticket/14549
...
[ticket/14549] fix mcp page redirect back after topic merge and rised warning
2017-01-04 21:47:21 +01:00
Marc Alexander
c6746ab3cd
[ticket/14946] Make sure to pass integers to max()
...
PHPBB3-14946
2017-01-04 21:40:46 +01:00
Marc Alexander
ee3cf0af0f
Merge branch '3.2.x'
2017-01-04 21:07:36 +01:00
Marc Alexander
24b02ad4d6
Merge pull request #4443 from Crizz0/ticket/14780
...
[ticket/14780] Correction to let group setting overwrite global PM setting
2017-01-04 21:07:32 +01:00
Marc Alexander
0f19c507e2
Merge branch '3.2.x'
2017-01-04 20:31:50 +01:00
Marc Alexander
cae30929ea
Merge branch '3.1.x' into 3.2.x
2017-01-04 20:31:45 +01:00
Marc Alexander
2f6993fa81
Merge pull request #4595 from DavidIQ/ticket/14941
...
[ticket/14941] Apply changes individually for MySQL fulltext search
2017-01-04 20:31:41 +01:00
Marc Alexander
ac1bf79904
Merge branch '3.2.x'
2017-01-04 20:12:03 +01:00
Marc Alexander
655d40679d
Merge pull request #4614 from marc1706/ticket/14838
...
[ticket/14838] Add missing method to mock'ed feed
2017-01-04 20:11:58 +01:00
Marc Alexander
b582a19039
[ticket/14838] Correctly instantiate language object
...
PHPBB3-14838
2017-01-04 19:47:10 +01:00
Marc Alexander
1db7aa712a
[ticket/14838] Add missing method to mock'ed feed
...
PHPBB3-14838
2017-01-04 19:19:02 +01:00
rxu
49c19a267f
[ticket/14958] Optimize Twig extension lang() function
...
PHPBB3-14958
2017-01-05 00:42:27 +07:00
Marc Alexander
3fef34a541
Merge branch '3.2.x'
2017-01-04 17:48:56 +01:00
Marc Alexander
c5ce0cd3c4
Merge pull request #4599 from VSEphpbb/ticket/14945
...
[ticket/14945] Fix bbcode flags in user sig previews
2017-01-04 17:48:52 +01:00
Marc Alexander
e5cc7b6631
Merge branch '3.2.x'
2017-01-04 17:44:15 +01:00
Marc Alexander
03be94c1f7
Merge branch '3.1.x' into 3.2.x
2017-01-04 17:44:11 +01:00
Marc Alexander
3d93fd40ed
Merge pull request #4611 from marc1706/ticket/14838
...
[icket/14838] Do not query full attachments table in feeds
2017-01-04 17:44:07 +01:00
Marc Alexander
5c2b9e0e37
Merge branch '3.2.x'
2017-01-04 17:30:05 +01:00
Marc Alexander
0da910df94
Merge branch '3.1.x' into 3.2.x
2017-01-04 17:29:56 +01:00
Marc Alexander
0926b360f7
Merge pull request #4610 from marc1706/ticket/14957-rhea
...
[ticket/14957] Do not cache database config entries -- Rhea version
2017-01-04 17:29:56 +01:00
Marc Alexander
f2c4bf176d
Merge pull request #4609 from marc1706/ticket/14957
...
[ticket/14957] Do not cache database config entries
2017-01-04 17:29:50 +01:00
Marc Alexander
dd89a369f3
[ticket/14838] Remove obsolete overriding method
...
PHPBB3-14838
2017-01-04 17:16:36 +01:00
javiexin
92708b2905
[ticket/14950] Add possibility to delete a template block
...
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables. The selection method is the
same as for the other modes for alter_block_array. The passed in
vararray is ignored, and an out of bounds index is considered an error.
PHPBB3-14944
2017-01-04 00:36:23 +01:00
Marc Alexander
c0882c1d34
[ticket/14838] Add simple test for fetch_attachments method
...
PHPBB3-14838
2017-01-03 22:57:14 +01:00
Marc Alexander
7cad25e4cb
[ticket/14838] Do not query full attachments table in feeds
...
The fetch_attachments() will also now throw a runtime exception if a feed
tries to do this nonetheless.
PHPBB3-14838
2017-01-03 22:56:42 +01:00
Marc Alexander
a4d67c55d9
[ticket/14957] Make sure config_php_file is set before injecting
...
PHPBB3-14957
2017-01-03 22:53:18 +01:00
Marc Alexander
9f149e345b
Merge branch 'ticket/14957' into ticket/14957-rhea
2017-01-03 22:22:46 +01:00
Marc Alexander
ff411ee81b
[ticket/14957] Do not use method return in write context
...
Fix for PHP 5.3.x compatibility.
PHPBB3-14957
2017-01-03 21:53:14 +01:00
Marc Alexander
072bf470fc
Merge branch 'ticket/14957' into ticket/14957-rhea
2017-01-03 21:41:36 +01:00
