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

3404 Commits

Author SHA1 Message Date
f11fd2b726 Merge branch '3.2.x'
* 3.2.x:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:28 +01:00
59ad9401d9 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:22 +01:00
1470985ff2 Merge pull request #4660 from marc1706/ticket/13250
[ticket/13250] Replace slashes in cache file names

* marc1706/ticket/13250:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:16 +01:00
95ad20c994 Merge branch '3.2.x'
* 3.2.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:06:04 +01:00
4eb72a4e7b Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:59 +01:00
c3896c8b5d Merge pull request #4673 from senky/ticket/13601
[ticket/13601] Add core.acl_clear_prefetch_after event

* senky/ticket/13601:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:53 +01:00
e906b2c609 Merge branch '3.2.x' 2017-01-29 14:43:15 +01:00
16e79d00d1 Merge pull request #4675 from marc1706/ticket/15044
[ticket/15044] Create search index during installation
2017-01-29 14:42:41 +01:00
cd4ceb2487 Merge pull request #4677 from marc1706/ticket/15050
[ticket/15050] Use new file when new file already exists
2017-01-29 14:40:02 +01:00
4e0e52d2f8 Merge branch '3.2.x' 2017-01-28 11:09:30 +01:00
b5ed02d03c [ticket/15050] Remove extra whitespace
PHPBB3-15050
2017-01-27 08:40:35 +01:00
2416a743f5 [ticket/15047] Reinstate length check for MSSQL 2000 2017-01-26 18:44:18 -05:00
fae78b4c01 [ticket/15047] Do not set default for identity cols 2017-01-26 08:43:39 -05:00
c53054f2b7 [ticket/15047] Use brackets due to keyword usage 2017-01-26 08:43:39 -05:00
b52ee87df8 [ticket/15047] Don't attempt to drop primary keys 2017-01-26 08:43:39 -05:00
66b0fe3b5d [ticket/15047] No index name length check for mssql 2017-01-26 08:43:06 -05:00
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
10dee52c18 [ticket/15044] Make sure fulltext native min and max are numbers
PHPBB3-15044
2017-01-24 21:47:37 +01:00
a03047da5b [ticket/15044] Add module task for creating search index during install
PHPBB3-15044
2017-01-24 21:47:20 +01:00
d1df78604b [ticket/13601] Add core.acl_clear_prefetch_after event
PHPBB3-13601
2017-01-23 15:00:59 +01:00
51be7891e2 Merge branch '3.2.x'
* 3.2.x:
  Use SSL in version check for extension
2017-01-22 23:32:13 +01:00
9df6ef5735 Use SSL in version check for extension
PHPBB3-15025
2017-01-22 23:31:41 +01:00
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
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
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
0238d850dd [ticket/15015] Use correct explain string for enable email settings
PHPBB3-15015
2017-01-22 20:58:53 +01:00
fbff3b77bd [ticket/13250] Use faster str_replace() instead of preg_replace()
PHPBB3-13250
2017-01-22 17:22:28 +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
6c09910c10 [ticket/13250] Replace slashes in cache file names
PHPBB3-13250
2017-01-21 11:21:38 +01:00
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
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
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
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
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
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
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
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
d882911bf5 Merge branch '3.2.x' 2017-01-15 00:25:32 +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
605fd40914 Merge branch '3.2.x' 2017-01-15 00:13:50 +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
6b2e277a27 Merge branch '3.2.x' 2017-01-08 20:53:56 +01:00