1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Commit Graph

3506 Commits

Author SHA1 Message Date
Marc Alexander
8b8f693d00 [ticket/14831] Make sure migrations always start with backslash
The migration system expects every migration to start with a backslash.
If depends on definitions do not supply that leading backslash, we should
make sure it's added manually before calling the depends on migration.

PHPBB3-14831
2016-10-22 19:19:36 +02:00
Máté Bartus
e030ddc1b2 Merge branch '3.2.x' 2016-10-20 18:35:40 +02:00
Máté Bartus
fd7244c892 Merge branch '3.1.x' into 3.2.x 2016-10-20 18:34:59 +02:00
Marc Alexander
d98a1c4bc4 [ticket/14821] Simplify regex for converting <strong> tags back to HTML
PHPBB3-14821
2016-10-18 22:07:54 +02:00
Marc Alexander
1f0c616974 [ticket/14821] Replace escaped strong tags with actual tags
Everything else will still be escaped. This will however add back support for
bold text in exception messages.

PHPBB3-14821
2016-10-14 22:47:43 +02:00
Marc Alexander
47b6e7edf4 Merge branch '3.2.x' 2016-10-12 21:44:07 +02:00
Marc Alexander
84a8cf00ad Merge branch '3.1.x' into 3.2.x 2016-10-12 21:43:35 +02:00
Marc Alexander
8f4ea4c495 Merge branch '3.2.x' 2016-10-10 21:39:21 +02:00
Tristan Darricau
b2711371f1 [ticket/14807] s9e/textformatter 0.8.1
PHPBB3-14807
2016-10-10 20:07:33 +02:00
Marc Alexander
380be9f1fd [ticket/14733] Make sure detect_algorithm() works correctly and add tests
detect_algorithm() returned array() if an algorithm prefix was more than 2
characters long. This might have been invalid for other prefixes. In order
to correctly cope with other prefixes, another check for a backslash in the
prefix definitino has been added.
This was discovered while writing the tests for the newly added interface.

PHPBB3-14733
2016-10-03 22:09:28 +02:00
Marc Alexander
722639a0e2 [ticket/14733] Extend passwords driver_interface in rehashable_driver_interface
PHPBB3-14733
2016-10-03 22:09:22 +02:00
Marc Alexander
d15269950d [ticket/14733] Use new interface to preserve backwards compatibility
PHPBB3-14733
2016-10-03 22:09:16 +02:00
Marc Alexander
297376ee94 [ticket/14733] Use default cost factor in bcrypt constructor
PHPBB3-14733
2016-10-03 22:09:12 +02:00
Marc Alexander
1d40c0f43b [ticket/14733] Support increasing hashing cost factor
PHPBB3-14733
2016-10-03 22:09:07 +02:00
Marc Alexander
40354f1f90 Merge pull request #27 from phpbb/ticket/security-196
[ticket/security-196] Escapes the exception messages before displaying them
2016-10-02 22:25:30 +01:00
Marc Alexander
71e632b9f0 [prep-release-3.1.10] Add 3.1.10 migration 2016-10-02 21:07:18 +01:00
Tristan Darricau
7a5fbd0257 [ticket/14807] Updates Twig
PHPBB3-14807
2016-10-02 19:24:45 +02:00
Marc Alexander
89f3e5d29e Merge branch '3.2.x' 2016-10-01 11:07:46 +01:00
Marc Alexander
57fc321c4d Merge branch '3.1.x' into 3.2.x 2016-10-01 11:07:43 +01:00
Marc Alexander
f1eda6868f Merge pull request #4465 from Senky/ticket/8301
[ticket/8301] Add log_time index
2016-10-01 11:07:40 +01:00
Marc Alexander
0b1d7cc53f Merge branch '3.2.x' 2016-09-30 21:49:41 +01:00
rxu
5b32019ad6 [ticket/14799] Remove accidentally added whitespaces into 3.2.x and master
PHPBB3-14799
2016-10-01 02:59:17 +07:00
Tristan Darricau
ab84605991 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
2016-09-28 20:58:39 +02:00
Tristan Darricau
737ef92a1e Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
2016-09-28 20:56:51 +02:00
markshawtoronto
06c980f1ec [ticket/14799] purge_notifications() should not leave open transactions.
When running purge_notifications(), if a notification type does not exist
then a db transaction is started but never completed.

On an error in get_notification_type_id(), end the transaction.

PHPBB3-14799
2016-09-27 11:45:23 -04:00
Jakub Senko
ec24f739e8 [ticket/8301] Add log_time index
PHPBB3-8301
2016-09-25 19:51:37 +02:00
Tristan Darricau
a713f5159a Merge branch '3.2.x'
* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:18 +02:00
Tristan Darricau
de2c70127f Merge pull request #4265 from Senky/ticket/10809
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:13 +02:00
Marc Alexander
e2431502d1 Merge branch '3.2.x' 2016-09-24 21:45:36 +02:00
Marc Alexander
164f0e031d Merge branch '3.1.x' into 3.2.x 2016-09-24 21:45:17 +02:00
Marc Alexander
c958ba13e8 [prep-release-3.1.10] Add migration for 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
62e288bc90 Merge branch '3.2.x' 2016-09-24 11:50:20 +02:00
Marc Alexander
713f25e552 Merge branch '3.1.x' into 3.2.x 2016-09-24 11:50:17 +02:00
Forumhulp.com
97040dc6ff [ticket/14796] Use log_table class member instead of table constant
Was still using the old LOG_TABLE constant in the delete method.

PHPBB3-14796
2016-09-24 10:19:12 +02:00
Marc Alexander
8b17274d7f Merge branch '3.2.x' 2016-09-24 10:04:38 +02:00
Marc Alexander
e02dc7a9c1 Merge branch '3.1.x' into 3.2.x 2016-09-24 10:03:58 +02:00
Marc Alexander
931582aad9 Merge pull request #4432 from Senky/ticket/14762
[ticket/14762] Add core event to session.php
2016-09-24 10:02:41 +02:00
Marc Alexander
bbb1ff325b Merge branch '3.2.x' 2016-09-23 20:55:24 +02:00
rxu
35c62d1e74 [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
PHPBB3-14793
2016-09-22 22:29:18 +07:00
Jakub Senko
abb01946bd [ticket/14762] Add core event to session.php
PHPBB3-14762
2016-09-18 13:32:10 +02:00
Marc Alexander
d21d2bca87 Merge branch '3.2.x' 2016-09-17 08:54:08 +02:00
Marc Alexander
aa95636a4d Merge branch '3.1.x' into 3.2.x 2016-09-17 08:54:04 +02:00
Marc Alexander
bd59241110 Merge pull request #4406 from rmcgirr83/ticket/14581
[ticket/14581] Add core events to content_visibility
2016-09-17 08:54:00 +02:00
Marc Alexander
ca7fdf4e5b Merge branch '3.2.x' 2016-09-17 00:05:13 +02:00
Marc Alexander
2dbc9e1016 Merge branch '3.1.x' into 3.2.x 2016-09-17 00:05:09 +02:00
DavidIQ
2ae08dc3ba [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS' 2016-09-16 17:05:20 -04:00
Andreas Fischer
4c54237e3e Merge branch '3.2.x'
* 3.2.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
2016-09-15 19:30:55 +02:00
Andreas Fischer
271e8b43f9 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
2016-09-15 19:30:44 +02:00
DavidIQ
6d589a8bb9 [ticket/14782] Use the $select variable in "Your Posts" search 2016-09-13 14:10:50 -04:00
Tristan Darricau
b8260cadf0 [ticket/14769] Fix CLI installer configuration compatibility with SF 3
PHPBB3-14769
2016-09-11 13:41:33 +02:00