1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

3299 Commits

Author SHA1 Message Date
f66594bf93 [ticket/15050] Use new file when new file already exists
Instead of trying to diff the new file against a pre-existing file,
we're just going to use the new file. It's impossible to know whether
the pre-existing file is newer or older than the new file. As the
system will rely on the files being in the "new" state it's better
to simply use the file in "new" state.

PHPBB3-15050
2017-01-25 22:18:29 +01:00
9df6ef5735 Use SSL in version check for extension
PHPBB3-15025
2017-01-22 23:31:41 +01:00
7c77e33313 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14968] Use earlier version as written in comment
  [ticket/14968] Update docblock and ensure method returns array
  [ticket/14968] Display possible upgrade on acp index and update page
  [ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:15:26 +01:00
0238d850dd [ticket/15015] Use correct explain string for enable email settings
PHPBB3-15015
2017-01-22 20:58:53 +01:00
20a4d095de [ticket/14968] Update docblock and ensure method returns array
PHPBB3-14968
2017-01-22 16:58:37 +01:00
0572d6e33a [ticket/14968] Add method for retrieving updates on current branch
PHPBB3-14968
2017-01-22 16:09:51 +01:00
43ba6783c5 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15011] Output meaningful errors when validating all metadata
2017-01-15 18:16:36 +01:00
a0bd23b747 [ticket/15011] Output meaningful errors when validating all metadata
PHPBB3-15011
2017-01-15 17:56:12 +01:00
2637606ae1 Merge pull request #4631 from JoshyPHP/ticket/14985
[ticket/14985] Decode HTML special chars in plain text columns

* JoshyPHP/ticket/14985:
  [ticket/14985] Added functional tests for BBCodes and smilies
  [ticket/14985] Decode HTML special chars in plain text columns
2017-01-15 12:08:01 +01:00
d6e42ec63b [ticket/15011] Fix 3.2.x merge
PHPBB3-15011
2017-01-15 12:00:36 +01:00
935da1ed2b Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 11:58:04 +01:00
c3b7332ea8 Merge pull request #4646 from javiexin/ticket/15011
[ticket/15011] Error not checked on metadata load failure

* javiexin/ticket/15011:
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 11:58:00 +01:00
0b5218cec1 Merge pull request #4647 from marc1706/ticket/15012
[ticket/15012] Use valid constructor in ftp_file_updater

* marc1706/ticket/15012:
  [ticket/15012] Use valid constructor in ftp_file_updater
2017-01-15 11:25:55 +01:00
42e78004fb Merge pull request #4643 from JoshyPHP/ticket/15008
[ticket/15008] Disable emoji when smilies are disabled
2017-01-15 00:25:28 +01:00
abf7a4f663 [ticket/15012] Use valid constructor in ftp_file_updater
PHPBB3-15012
2017-01-14 22:48:24 +01:00
b9189ec325 [ticket/15011] Error not checked on metadata load failure
PHPBB3-15011
2017-01-14 18:08:23 +01:00
02b5873442 [ticket/15010] Fix incorrect use of request
https://tracker.phpbb.com/browse/PHPBB3-15010

PHPBB3-15010
2017-01-14 09:18:55 -05:00
15315ac87a [ticket/15008] Disable emoji when smilies are disabled
Will effectively disable emoji shortname and won't replace emoji
with images but will not prevent a browser or OS from displaying
emoji as images.

PHPBB3-15008
2017-01-14 14:27:38 +01:00
ef215f573e [ticket/14985] Decode HTML special chars in plain text columns
PHPBB3-14985
2017-01-12 09:30:52 +01:00
26c6cb819e Merge pull request #4625 from Nicofuma/ticket/14973
[ticket/14973] Add BC layer for \phpbb\db\tools
2017-01-08 20:53:53 +01:00
aaee7c7db9 Merge pull request #4623 from rxu/ticket/14971
[ticket/14971] Fix pagination PHP warning on PHP 7.1

* rxu/ticket/14971:
  [ticket/14971] Add on_page test with the string arguments
  [ticket/14971] Fix pagination PHP warning on PHP 7.1
2017-01-08 18:35:22 +01:00
42cf311b2f [ticket/14973] Add BC layer for \phpbb\db\tools
PHPBB3-14973
2017-01-08 18:31:10 +01:00
rxu
c98193a799 [ticket/14971] Fix pagination PHP warning on PHP 7.1
PHPBB3-14971
2017-01-08 22:16:40 +07:00
40985de245 [ticket/14967] Add cookie notice migration fixing invalid previous one
PHPBB3-14967
2017-01-08 10:48:30 +01:00
9bbd034a4e [prep-release-3.2.0] Correctly compare extensions version 2017-01-07 14:44:04 +01:00
da8ec61ab2 [prep-release-3.2.0] Update version numbers and add 3.2.0 migration 2017-01-07 11:48:15 +01:00
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
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
f82299b8e4 [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
PHPBB3-14962
2017-01-06 21:40:31 +01:00
166320ef9e Merge branch '3.1.x' into 3.2.x 2017-01-06 15:29:40 +01:00
9d7acd1897 Merge pull request #4613 from rxu/ticket/14958
[ticket/14958] Optimize Twig extension lang() function
2017-01-06 15:29:35 +01:00
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
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
0a68593dd2 [ticket/14949] Pass full notification array and post data for updating
PHPBB3-14949
2017-01-05 23:39:30 +01:00
c6746ab3cd [ticket/14946] Make sure to pass integers to max()
PHPBB3-14946
2017-01-04 21:40:46 +01:00
cae30929ea Merge branch '3.1.x' into 3.2.x 2017-01-04 20:31:45 +01:00
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
03be94c1f7 Merge branch '3.1.x' into 3.2.x 2017-01-04 17:44:11 +01:00
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
dd89a369f3 [ticket/14838] Remove obsolete overriding method
PHPBB3-14838
2017-01-04 17:16:36 +01:00
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
a4d67c55d9 [ticket/14957] Make sure config_php_file is set before injecting
PHPBB3-14957
2017-01-03 22:53:18 +01:00
9f149e345b Merge branch 'ticket/14957' into ticket/14957-rhea 2017-01-03 22:22:46 +01:00
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
072bf470fc Merge branch 'ticket/14957' into ticket/14957-rhea 2017-01-03 21:41:36 +01:00
14fd750b08 [ticket/14957] Do not cache database config entries
PHPBB3-14957
2017-01-03 21:29:30 +01:00
739081b045 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:04:35 +01:00
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
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