1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 02:29:21 +02:00

3141 Commits

Author SHA1 Message Date
Tristan Darricau
edaa36205f
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14831] Rename migration and replace preg_replace() with simpler methods
  [ticket/14831] Compare depends_on for migrations and remove prefixless names
  [ticket/14831] Add migration for deduplicating entries and fix typo
  [ticket/14831] Add method for getting valid migration name
  [ticket/14831] Fall back to possible migration names instead of adding prefix
  [ticket/14831] Make sure migrations always start with backslash
2016-11-14 21:22:14 +01:00
Tristan Darricau
8323de331e
Merge pull request #4492 from marc1706/ticket/14831
[ticket/14831] Make sure migrations always start with backslash

* marc1706/ticket/14831:
  [ticket/14831] Rename migration and replace preg_replace() with simpler methods
  [ticket/14831] Compare depends_on for migrations and remove prefixless names
  [ticket/14831] Add migration for deduplicating entries and fix typo
  [ticket/14831] Add method for getting valid migration name
  [ticket/14831] Fall back to possible migration names instead of adding prefix
  [ticket/14831] Make sure migrations always start with backslash
2016-11-14 21:22:11 +01:00
Marc Alexander
8a3147faf8
Merge branch '3.1.x' into 3.2.x 2016-11-13 21:29:14 +01:00
Marc Alexander
6e6a2c5df8
Merge pull request #4488 from senky/ticket/14825
Add core.auth_oauth_login_after and core.auth_oauth_link_after
2016-11-13 21:27:51 +01:00
Jakub Senko
df0388ccc5 [ticket/14825] Add core.auth_oauth_(login/link)_after
PHPBB3-14825
2016-11-13 18:19:21 +01:00
Marc Alexander
2319748c08
Merge branch '3.1.x' into 3.2.x 2016-11-12 19:27:09 +01:00
Jim Mossing Holsteyn
4533dd9fa0 [ticket/14859] Notifications for PM reports send to users with correct permissions
Tracker ticket (set the ticket ID to your ticket ID):

https://tracker.phpbb.com/browse/PHPBB3-14859

This addresses the problem that notifications of new PM reports were not sent out to moderators that weren't global moderators but did have the permission "Can close/delete PM reports". 

PHPBB3-14859
2016-11-07 16:06:50 +01:00
Marc Alexander
ecb81894cc
Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x 2016-11-05 21:35:06 +01:00
Tristan Darricau
d90afa67d8
[ticket/14814] Fix reparser cron
PHPBB3-14814
2016-11-02 19:38:33 +01:00
Marc Alexander
ffc6623dd4
[ticket/14831] Rename migration and replace preg_replace() with simpler methods
PHPBB3-14831
2016-10-25 20:25:57 +02:00
Tristan Darricau
b13910ee45
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
2016-10-24 22:24:26 +02:00
Marc Alexander
6f8c0df1c6
[ticket/14831] Compare depends_on for migrations and remove prefixless names
PHPBB3-14831
2016-10-23 22:17:19 +02:00
Marc Alexander
c891277996
[ticket/14831] Add migration for deduplicating entries and fix typo
PHPBB3-14831
2016-10-23 22:00:02 +02:00
rxu
77f1bac64b [ticket/14831] Optimize code construction
PHPBB3-14831
2016-10-24 01:41:24 +07:00
rxu
51ef1ae346 [ticket/14831] Add more tests, better name for $e placeholder
PHPBB3-14831
2016-10-23 22:44:47 +07:00
rxu
a02b124dd0 [ticket/14831] Do not throw exception on the module existence checking
PHPBB3-14831
2016-10-23 21:58:29 +07:00
Marc Alexander
9f2867b115
[ticket/14831] Add method for getting valid migration name
PHPBB3-14831
2016-10-23 11:37:10 +02:00
Marc Alexander
2059d57c04
[ticket/14831] Fall back to possible migration names instead of adding prefix
Instead of just adding the backslash as prefix if needed, this will take care
of falling back to any possible migration with or without backslash no matter
how the mgiration was saved in the database or called in the migrations file.
This will result in a more robust migrator in regards to naming the migrations
and previously run migrations.

PHPBB3-14831
2016-10-23 10:28:22 +02:00
rxu
0cc0920734 [ticket/14831] Fix module migrator tool
PHPBB3-14831
2016-10-23 00:57:37 +07:00
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
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
84a8cf00ad
Merge branch '3.1.x' into 3.2.x 2016-10-12 21:43:35 +02:00
Tristan Darricau
b2711371f1
[ticket/14807] s9e/textformatter 0.8.1
PHPBB3-14807
2016-10-10 20:07:33 +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
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
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
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
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
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
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
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
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
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
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
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
Marc Alexander
051323dbc6 Merge branch '3.1.x' into 3.2.x 2016-09-06 21:50:25 +02:00