1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:01:48 +02:00
Commit Graph

3388 Commits

Author SHA1 Message Date
Marc Alexander
4e0e52d2f8 Merge branch '3.2.x' 2017-01-28 11:09:30 +01:00
David Colón
2416a743f5 [ticket/15047] Reinstate length check for MSSQL 2000 2017-01-26 18:44:18 -05:00
David Colón
fae78b4c01 [ticket/15047] Do not set default for identity cols 2017-01-26 08:43:39 -05:00
David Colón
c53054f2b7 [ticket/15047] Use brackets due to keyword usage 2017-01-26 08:43:39 -05:00
David Colón
b52ee87df8 [ticket/15047] Don't attempt to drop primary keys 2017-01-26 08:43:39 -05:00
David Colón
66b0fe3b5d [ticket/15047] No index name length check for mssql 2017-01-26 08:43:06 -05:00
Tristan Darricau
51be7891e2 Merge branch '3.2.x'
* 3.2.x:
  Use SSL in version check for extension
2017-01-22 23:32:13 +01:00
tas2580
9df6ef5735 Use SSL in version check for extension
PHPBB3-15025
2017-01-22 23:31:41 +01:00
Tristan Darricau
7f82d28f6f Merge branch '3.2.x'
* 3.2.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:16:23 +01:00
Tristan Darricau
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
Tristan Darricau
34866b2db1 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15015] Use correct explain string for enable email settings
2017-01-22 23:06:53 +01:00
Marc Alexander
0238d850dd [ticket/15015] Use correct explain string for enable email settings
PHPBB3-15015
2017-01-22 20:58:53 +01:00
Marc Alexander
20a4d095de [ticket/14968] Update docblock and ensure method returns array
PHPBB3-14968
2017-01-22 16:58:37 +01:00
Marc Alexander
0572d6e33a [ticket/14968] Add method for retrieving updates on current branch
PHPBB3-14968
2017-01-22 16:09:51 +01:00
Tristan Darricau
3d61d2b370 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15011] Output meaningful errors when validating all metadata
  [ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:16:45 +01:00
Tristan Darricau
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
Marc Alexander
a0bd23b747 [ticket/15011] Output meaningful errors when validating all metadata
PHPBB3-15011
2017-01-15 17:56:12 +01:00
Tristan Darricau
6fe1605137 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14985] Added functional tests for BBCodes and smilies
  [ticket/14985] Decode HTML special chars in plain text columns
2017-01-15 12:08:06 +01:00
Tristan Darricau
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
Tristan Darricau
567034e306 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15011] Fix 3.2.x merge
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 12:01:26 +01:00
Tristan Darricau
d6e42ec63b [ticket/15011] Fix 3.2.x merge
PHPBB3-15011
2017-01-15 12:00:36 +01:00
Tristan Darricau
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
Tristan Darricau
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
Tristan Darricau
891fa43442 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15012] Use valid constructor in ftp_file_updater
2017-01-15 11:25:59 +01:00
Tristan Darricau
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
Marc Alexander
d882911bf5 Merge branch '3.2.x' 2017-01-15 00:25:32 +01:00
Marc Alexander
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
Marc Alexander
605fd40914 Merge branch '3.2.x' 2017-01-15 00:13:50 +01:00
Marc Alexander
abf7a4f663 [ticket/15012] Use valid constructor in ftp_file_updater
PHPBB3-15012
2017-01-14 22:48:24 +01:00
javiexin
b9189ec325 [ticket/15011] Error not checked on metadata load failure
PHPBB3-15011
2017-01-14 18:08:23 +01:00
Richard McGirr
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
JoshyPHP
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
JoshyPHP
ef215f573e [ticket/14985] Decode HTML special chars in plain text columns
PHPBB3-14985
2017-01-12 09:30:52 +01:00
Marc Alexander
6b2e277a27 Merge branch '3.2.x' 2017-01-08 20:53:56 +01:00
Marc Alexander
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
Tristan Darricau
fb5f33f190 Merge branch '3.2.x'
* 3.2.x:
  [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:29 +01:00
Tristan Darricau
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
Tristan Darricau
42cf311b2f [ticket/14973] Add BC layer for \phpbb\db\tools
PHPBB3-14973
2017-01-08 18:31:10 +01:00
Tristan Darricau
118824fd26 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14967] Add cookie notice migration fixing invalid previous one
2017-01-08 18:06:22 +01:00
rxu
c98193a799 [ticket/14971] Fix pagination PHP warning on PHP 7.1
PHPBB3-14971
2017-01-08 22:16:40 +07:00
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
8d58d1814f Merge branch '3.2.x' 2017-01-07 17:08:30 +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
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