1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:31:57 +02:00
Commit Graph

3450 Commits

Author SHA1 Message Date
Marc Alexander
9bbd034a4e [prep-release-3.2.0] Correctly compare extensions version 2017-01-07 14:44:04 +01:00
Marc Alexander
da8ec61ab2 [prep-release-3.2.0] Update version numbers and add 3.2.0 migration 2017-01-07 11:48:15 +01:00
Marc Alexander
663bdda53c Merge branch '3.2.x' 2017-01-07 00:20:22 +01:00
Marc Alexander
44f130808f Merge pull request #4618 from marc1706/ticket/14961
[ticket/14961] Add cookie notice as enablable feature
2017-01-07 00:20:18 +01:00
Marc Alexander
c0fb367d0a Merge branch '3.2.x' 2017-01-07 00:16:49 +01:00
Marc Alexander
7074876f32 Merge pull request #4619 from Nicofuma/ticket/14962
[ticket/14962] Introduces a new helper to check emptyness of bbcode texts
2017-01-07 00:16:45 +01:00
Tristan Darricau
f82299b8e4 [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
PHPBB3-14962
2017-01-06 21:40:31 +01:00
Marc Alexander
710d3e921c Merge branch '3.2.x' 2017-01-06 15:29:45 +01:00
Marc Alexander
166320ef9e Merge branch '3.1.x' into 3.2.x 2017-01-06 15:29:40 +01:00
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
839fec4a0c Merge branch '3.2.x' 2017-01-06 01:12:43 +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
c6746ab3cd [ticket/14946] Make sure to pass integers to max()
PHPBB3-14946
2017-01-04 21:40:46 +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
rxu
49c19a267f [ticket/14958] Optimize Twig extension lang() function
PHPBB3-14958
2017-01-05 00:42:27 +07: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
dd89a369f3 [ticket/14838] Remove obsolete overriding method
PHPBB3-14838
2017-01-04 17:16:36 +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
Marc Alexander
14fd750b08 [ticket/14957] Do not cache database config entries
PHPBB3-14957
2017-01-03 21:29:30 +01:00
javiexin
45ea013b11 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.

PHPBB3-14943
2017-01-01 21:22:29 +01:00
javiexin
c656bd60ef [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.

PHPBB3-14944
2016-12-30 18:03:09 +01:00
Tristan Darricau
c12b4320eb Merge branch '3.2.x' 2016-12-30 10:06:29 +01:00
Tristan Darricau
739081b045 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:04:35 +01:00
Tristan Darricau
3489780faa Merge pull request #4597 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
2016-12-30 10:04:13 +01:00
Tristan Darricau
5ff0e4ec7d Merge branch '3.2.x' 2016-12-29 18:27:59 +01:00
Tristan Darricau
1f8f1b6286 Merge pull request #4596 from JoshyPHP/ticket/14914
[ticket/14914] Made emoji scale in size with text
2016-12-29 18:27:58 +01:00
Tristan Darricau
b81aaee17f Merge branch '3.2.x' 2016-12-29 18:18:54 +01:00
Tristan Darricau
d5c063fd80 Merge pull request #4591 from marc1706/ticket/14934
[ticket/14934] Use bare PHP functions for checking for tmp dir
2016-12-29 18:18:53 +01:00
javiexin
cff57f9076 [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code.

PHPBB3-14944
2016-12-28 12:55:26 +01:00
javiexin
d9991bdaf1 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.

PHPBB3-14943
2016-12-28 12:37:53 +01:00
JoshyPHP
f111e70fc3 [ticket/14914] Made emoji scale in size with text
PHPBB3-14914
2016-12-27 21:48:01 +01:00
David Colón
0fc1de279e [ticket/14941] Apply changes individually for MySQL fulltext search 2016-12-27 14:06:23 -05:00
Marc Alexander
97b834c3ef [ticket/14934] Do not rely on open basedir being properly set
PHPBB3-14934
2016-12-25 23:01:28 +01:00
Marc Alexander
27c5997e87 Merge branch '3.2.x' 2016-12-25 15:52:42 +01:00
Marc Alexander
cb406258fe Merge branch '3.1.x' into 3.2.x 2016-12-25 15:52:38 +01:00
Marc Alexander
c6aa4a319d [ticket/14934] Use bare PHP functions for checking for tmp dir
The symfony methods will cause PHP warnings being thrown.

PHPBB3-14934
2016-12-25 15:04:48 +01:00
Marc Alexander
9e6207add3 [ticket/14923] Make sure start for queries is always set in migrations
PHPBB3-14923
2016-12-25 11:51:38 +01:00
Máté Bartus
c0493c2e81 Merge branch '3.2.x' 2016-12-24 12:53:20 +01:00