1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-26 02:23:01 +01:00

24755 Commits

Author SHA1 Message Date
Marc Alexander
40985de245
[ticket/14967] Add cookie notice migration fixing invalid previous one
PHPBB3-14967
2017-01-08 10:48:30 +01:00
Marc Alexander
385feb0a5d
[3.2.x] Update development version to 3.2.1-dev 2017-01-07 17:19:35 +01:00
Marc Alexander
830a384988
[prep-release-3.2.0] Fix links to convertor 2017-01-07 16:16:24 +01:00
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
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
e096137537
Merge pull request #4620 from marc1706/ticket/14772
[ticket/14772] Use float to prevent pagination overwriting topic time
2017-01-07 00:18:40 +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
Marc Alexander
ba82dfa49e
[ticket/14772] Add rtl definition for .topic-poster and small margin
PHPBB3-14772
2017-01-06 22:36:35 +01:00
Marc Alexander
89f0e4d54f
[ticket/14772] Use float to prevent pagination overwriting topic time
PHPBB3-14772
2017-01-06 22:27:11 +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
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
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
743d3af3c5
[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
PHPBB3-14961
2017-01-06 12:06:39 +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
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
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
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
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
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
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
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
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
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
Marc Alexander
4c550c221b
[ticket/14954] Properly check if topic has attachments in mcp_queue
PHPBB3-14954
2017-01-02 23:23:53 +01:00
Marc Alexander
56314f4c22
Merge pull request #4602 from Nicofuma/ticket/14947
[ticket/14947] Updates phpunit to 4.8
2017-01-02 22:52:16 +01:00
Tristan Darricau
2251816b10
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
2017-01-02 22:47:47 +01:00
Marc Alexander
7df7cfff33
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
PHPBB3-14953
2017-01-02 22:39:40 +01:00
Tristan Darricau
e88aecd3b4
[ticket/14947] Updates phpunit to 4.8
$ composer update phpunit/phpunit --with-dependencies
Dependency "symfony/yaml" is also a root requirement, but is not explicitly whitelisted. Ignoring.
Loading composer repositories with package information
Updating dependencies (including require-dev)
  - Installing sebastian/global-state (1.1.1)
    Loading from cache

  - Installing doctrine/instantiator (1.0.5)
    Loading from cache

  - Removing phpunit/phpunit-mock-objects (2.1.5)
  - Installing phpunit/phpunit-mock-objects (2.3.8)
    Loading from cache

  - Removing phpunit/php-file-iterator (1.3.4)
  - Installing phpunit/php-file-iterator (1.4.2)
    Loading from cache

  - Installing phpdocumentor/reflection-docblock (2.0.4)
    Downloading: 100%

  - Installing phpspec/prophecy (v1.6.2)
    Loading from cache

  - Removing phpunit/phpunit (4.1.6)
  - Installing phpunit/phpunit (4.8.31)
    Downloading: 100%

sebastian/global-state suggests installing ext-uopz (*)
phpdocumentor/reflection-docblock suggests installing dflydev/markdown (~1.0)
phpdocumentor/reflection-docblock suggests installing erusev/parsedown (~1.0)
Writing lock file
Generating autoload files
> echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.'
You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.

PHPBB3-14947
2016-12-30 21:58:38 +01:00
Tristan Darricau
1f65f85b53 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:21:17 +01:00
Tristan Darricau
4139e4f2b5 Merge pull request #4593 from javiexin/ticket/14940
[ticket/14940] Add ACP template event acp_ext_details_end
2016-12-30 10:21:00 +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