1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 05:36:30 +02:00
Commit Graph

3518 Commits

Author SHA1 Message Date
9d4c51f8ba Merge pull request #4553 from DavidIQ/ticket/14885
[ticket/14885] Add a line break when writing to the migrator output file

* DavidIQ/ticket/14885:
  [ticket/14885] Use \n instead of \r for output_handler messages
  [ticket/14885] Add a line break when writing to the migrator output file
2016-12-03 12:36:20 +01:00
74f49387e1 Merge pull request #4539 from marc1706/ticket/14875
[ticket/14875] Add method for untrimmed input to ajax iohandler

* marc1706/ticket/14875:
  [ticket/14875] Add raw_variable() to request mock
  [ticket/14875] Move raw_variable() method to request_interface
  [ticket/14875] Use raw_variable() method in _variable() to get raw data
  [ticket/14875] Add method for raw input to request and add to installer
  [ticket/14875] Add method for untrimmed input to ajax iohandler
2016-12-03 12:32:57 +01:00
c3caa3d9dc [ticket/14885] Use \n instead of \r for output_handler messages 2016-12-02 16:50:55 +01:00
a99cb31a52 [ticket/14885] Add a line break when writing to the migrator output file 2016-12-02 14:23:44 +01:00
9bdd002f58 [ticket/14875] Move raw_variable() method to request_interface
PHPBB3-14875
2016-12-02 11:36:07 +01:00
88c921be23 [ticket/14873] Added width/height attributes to smilies
PHPBB3-14873
2016-11-27 13:30:15 +01:00
9432662c37 Merge branch '3.1.x' into 3.2.x 2016-11-26 16:41:31 +01:00
08bf8812d3 [ticket/14875] Use raw_variable() method in _variable() to get raw data
The raw_variable() method uses the same exact code the _variable method
has been using until now.

PHPBB3-14875
2016-11-25 22:58:18 +01:00
9aa017d0f7 [ticket/14875] Add method for raw input to request and add to installer
A method for retrieving raw input has been added to the request class.
This will be used in the installer to retrieve the datatabase password
while also allowing utf8 characters. Not escaping the input is ok in
this case as it won't be put anywhere in this raw form and only be
used to populate the entry for the password field in config.php.

PHPBB3-14875
2016-11-25 22:15:13 +01:00
390a37492d [ticket/14876] Allows multibyte strings for exception messages
All exception messages are sanitized via type_caster::set_var()
which is called with $multibyte = false.
This commit allows to pass multibyte messages as well.

PHPBB3-14876
2016-11-25 19:56:41 +04:00
23f5b6debd [ticket/14875] Add method for untrimmed input to ajax iohandler
Due to the pre-encoded input and the escaping of the input, the
string has to be decoded twice for the password.

PHPBB3-14875
2016-11-24 22:22:38 +01:00
145ba85d98 Merge pull request #4516 from marc1706/ticket/14867
[ticket/14867] Revert back to twig 1.26.* and update dependencies

* marc1706/ticket/14867:
  [ticket/14867] Revert back to twig 1.26.* and update dependencies
2016-11-24 14:18:41 +01:00
2df3703b2a [ticket/13149] Add core.phpbb_log_get_topic_auth_sql_before
PHPBB3-13149
2016-11-20 18:42:36 +01:00
c2836725f9 [ticket/13429] Replace @changed with @change in event docblocks
PHPBB3-13429
2016-11-20 17:58:59 +01:00
9343317121 Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x 2016-11-17 09:56:51 +01:00
a96fc3d87f [ticket/14867] Revert back to twig 1.26.* and update dependencies
The revert of twig back to 1.26.* is necessary due to a breaking
change in the way the Filesystem loader returns the paths to
template files.

PHPBB3-14867
2016-11-16 21:39:29 +01:00
e974f338af [ticket/14739] Remove SQLite 2.8.x database driver
PHPBB3-14739
2016-11-16 17:59:28 +01:00
da428b1fd3 Merge pull request #4501 from marc1706/ticket/14716
[ticket/14716] Update dependencies to latest versions

* marc1706/ticket/14716:
  [ticket/14716] Update dependencies to latest versions
2016-11-14 21:23:58 +01:00
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
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
8a3147faf8 Merge branch '3.1.x' into 3.2.x 2016-11-13 21:29:14 +01:00
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
df0388ccc5 [ticket/14825] Add core.auth_oauth_(login/link)_after
PHPBB3-14825
2016-11-13 18:19:21 +01:00
78c2e31ec2 [ticket/security-181] Add .htaccess to 3.2.x migrations
SECURITY-181
2016-11-13 12:29:31 +01:00
a2953cb10c Merge branch 'ticket/security-181' into ticket/security-181-rhea 2016-11-13 12:29:28 +01:00
61683f895c [ticket/security-181] Deny access to migrations folders
SECURITY-181
2016-11-13 11:43:17 +01:00
2319748c08 Merge branch '3.1.x' into 3.2.x 2016-11-12 19:27:09 +01:00
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
ecb81894cc Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x 2016-11-05 21:35:06 +01:00
4d07f8a134 [ticket/14716] Update dependencies to latest versions
This addresses some issues with symfony that resulted in
issues when open_basedir restrictions were enabled, as well
as issues with JPEG images in fast-image-size.
The phpBB class extending the twig lexer also had to be
modified to ensure compatibility after BC was broken by
the PR https://github.com/twigphp/Twig/pull/2182 for twig
1.27.

PHPBB3-14716
2016-11-03 21:36:12 +01:00
d90afa67d8 [ticket/14814] Fix reparser cron
PHPBB3-14814
2016-11-02 19:38:33 +01:00
ffc6623dd4 [ticket/14831] Rename migration and replace preg_replace() with simpler methods
PHPBB3-14831
2016-10-25 20:25:57 +02:00
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
6f8c0df1c6 [ticket/14831] Compare depends_on for migrations and remove prefixless names
PHPBB3-14831
2016-10-23 22:17:19 +02:00
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
9f2867b115 [ticket/14831] Add method for getting valid migration name
PHPBB3-14831
2016-10-23 11:37:10 +02:00
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
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
fd7244c892 Merge branch '3.1.x' into 3.2.x 2016-10-20 18:34:59 +02:00
d98a1c4bc4 [ticket/14821] Simplify regex for converting <strong> tags back to HTML
PHPBB3-14821
2016-10-18 22:07:54 +02:00
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
84a8cf00ad Merge branch '3.1.x' into 3.2.x 2016-10-12 21:43:35 +02:00
b2711371f1 [ticket/14807] s9e/textformatter 0.8.1
PHPBB3-14807
2016-10-10 20:07:33 +02:00
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
722639a0e2 [ticket/14733] Extend passwords driver_interface in rehashable_driver_interface
PHPBB3-14733
2016-10-03 22:09:22 +02:00
d15269950d [ticket/14733] Use new interface to preserve backwards compatibility
PHPBB3-14733
2016-10-03 22:09:16 +02:00