1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

2942 Commits

Author SHA1 Message Date
4db229ff6c Merge pull request #4199 from VSEphpbb/ticket/12684
[ticket/12684] Add console command user:add

* VSEphpbb/ticket/12684: (26 commits)
  [ticket/12684] Use a switch statement for readability
  [ticket/12684] Refactor a test
  [ticket/12684] Use interactive method correctly
  [ticket/12684] Extract interactivity to a method
  [ticket/12684] Update option help
  [ticket/12684] Add extended help for the user:add command
  [ticket/12684] Add shorthand alternates to the options
  [ticket/12684] Remove whitespace
  [ticket/12684] Add an error on user creation failure
  [ticket/12684] Remove unnecessary null arguments
  [ticket/12684] Additional clean up
  [ticket/12684] Allowed to use $this in enclosure
  [ticket/12684] Move all lang keys to cli
  [ticket/12684] Fix a few mistakes and clean it up
  [ticket/12684] Some code clean up
  [ticket/12684] Another little fix
  [ticket/12684] Fix tests
  [ticket/12684] Update to use non-deprecated methods
  [ticket/12684] Add send email option
  [ticket/12684] Add input validation
  ...
2016-03-26 19:38:58 +01:00
e873ed6944 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14241] Log fatal captcha error to error log
  [ticket/14241] Prevent empty q&a as a result of improper settings
2016-03-25 11:43:05 +01:00
6774c5077d Merge pull request #4214 from marc1706/ticket/14241
[ticket/14241] Prevent empty q&a as a result of improper settings

* marc1706/ticket/14241:
  [ticket/14241] Log fatal captcha error to error log
  [ticket/14241] Prevent empty q&a as a result of improper settings
2016-03-25 11:43:05 +01:00
f6cc30cbfe Merge pull request #4245 from JoshyPHP/ticket/14381
[ticket/14381] Set the mode in message parser to "reparse"

* JoshyPHP/ticket/14381:
  [ticket/14381] Set the mode in message parser to "reparse"
  [ticket/14495] Updates the version to 3.3.0-a1-dev
2016-03-25 11:03:27 +01:00
23be4d8af2 Merge pull request #4237 from Nicofuma/ticket/14555
[ticket/14555] Uniformize cache directory usages
2016-03-24 21:15:13 +01:00
0ff4a6b6a4 [ticket/14381] Set the mode in message parser to "reparse"
The default mode is "post". By setting it to something else,
all limits pertaining to posts (min/max length, etc...) should
be disabled.

PHPBB3-14381
2016-03-24 19:49:23 +01:00
a9b6a537c5 Merge pull request #4243 from marc1706/ticket/14136-3.2.x
[ticket/14136] Add back X-UA-Compatible meta tag

* marc1706/ticket/14136-3.2.x:
  [ticket/14136] Add back X-UA-Compatible meta tag
2016-03-24 18:00:42 +01:00
3a23068d89 Merge pull request #4242 from marc1706/ticket/14136
[ticket/14136] Add back X-UA-Compatible meta tag

* marc1706/ticket/14136:
  [ticket/14136] Add back X-UA-Compatible meta tag
2016-03-24 18:00:15 +01:00
7e2c8f1885 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14536] Force unix time stamps to be integer
2016-03-24 17:53:57 +01:00
dcb6154be7 Merge pull request #4222 from marc1706/ticket/14536
[ticket/14536] Force unix time stamps to be integer

* marc1706/ticket/14536:
  [ticket/14536] Force unix time stamps to be integer
2016-03-24 17:53:34 +01:00
d817da6049 Merge pull request #4227 from Senky/ticket/14318
[ticket/14318] Fix SQL error in Notifications Board migration
2016-03-24 16:33:15 +01:00
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
2016-03-24 16:12:56 +01:00
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
2016-03-24 16:07:07 +01:00
2a6e8f3668 Merge branch '3.1.x' into 3.2.x 2016-03-24 11:49:31 +01:00
1bb4e3621e Merge pull request #4175 from Senky/ticket/14471
[ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event
2016-03-24 11:49:24 +01:00
56c2caf6c0 [ticket/14555] Uniformize cache directory usages
PHPBB3-14555
2016-03-24 09:15:34 +01:00
10d4093561 [ticket/14536] Force unix time stamps to be integer
This will ensure to prevent PHP fatal errors in case the passed timestamp
is an empty string or does not evaluate to an integer (i.e. strings like
foobar).

PHPBB3-14536
2016-03-23 14:44:31 +01:00
5b3b0edd80 [ticket/12684] Use a switch statement for readability
PHPBB3-12684
2016-03-21 13:54:50 -07:00
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration
PHPBB3-14318
2016-03-18 11:04:01 +01:00
04450e1fae Merge branch '3.2.x'
* 3.2.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
2016-03-16 19:10:45 +01:00
eca4726f3c Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
2016-03-16 19:10:34 +01:00
rxu
e610b23916 [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
Swapping conditions in the function accept() of the class
\phpbb\recursive_dot_prefix_filter_iterator saves a lot of isDir() calls which
is more expensive than $filename[0] checks.

PHPBB3-14540
2016-03-17 00:50:08 +07:00
cc212f680d Merge branch '3.2.x' 2016-03-13 20:24:50 +01:00
186c5f4f83 Merge branch '3.1.x' into 3.2.x 2016-03-13 20:24:41 +01:00
3e278bcf0a [ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL
PHPBB3-14533
2016-03-12 20:53:42 +01:00
215fad420f [ticket/14241] Log fatal captcha error to error log
PHPBB3-14241
2016-03-12 10:24:07 +01:00
4c5c289f75 [ticket/14241] Prevent empty q&a as a result of improper settings
Improper setup of the q&a captcha in combination with the admin choosing a
default language that does not have any questions and answers set might
result in the user being presented empty questions and answers. This
change will try to fall back to any question in case the admin incorrectly
set the default language and has no questions & answers set. If that does
not work, the captcha will not allow passing it and suggest to contact the
board admin to resolve this issue.

PHPBB3-14241
2016-03-11 10:51:07 +01:00
795ce6ccf1 [ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event
PHPBB3-14471
2016-03-10 13:25:43 +01:00
5917a8e72e [ticket/12684] Use interactive method correctly
PHPBB3-12684
2016-03-09 17:40:58 -08:00
693664f278 [ticket/12684] Extract interactivity to a method
PHPBB3-12684
2016-03-09 15:16:23 -08:00
6c814ef641 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14132] Use transaction for adding notifications to type table
  [ticket/14519] Skip query if all unread notifications are retrieved
  [ticket/14483] Do not send headers by default on access via controller
2016-03-08 22:19:54 +01:00
a01e3a0ffa Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14132] Use transaction for adding notifications to type table
  [ticket/14519] Skip query if all unread notifications are retrieved
  [ticket/14483] Do not send headers by default on access via controller

Conflicts:
	phpBB/phpbb/notification/manager.php
2016-03-08 22:18:42 +01:00
7c45ed0733 Merge pull request #4206 from marc1706/ticket/14519
[ticket/14519] Skip query if all unread notifications are retrieved
2016-03-08 22:09:02 +01:00
a0fa396901 Merge pull request #4207 from marc1706/ticket/14132
[ticket/14132] Use transaction for adding notifications to type table
2016-03-08 22:07:33 +01:00
05ccbc512d Merge pull request #4204 from marc1706/ticket/14483
[ticket/14483] Do not send headers by default on access via controller
2016-03-08 22:07:11 +01:00
10004c4032 [ticket/14132] Use transaction for adding notifications to type table
This will prevent a race condition that might occur by two posts being
submitted at the same time with the notification type IDs not being
cached.

PHPBB3-14132
2016-03-08 12:36:29 +01:00
9fcd0b116b [ticket/14519] Skip query if all unread notifications are retrieved
PHPBB3-14519
2016-03-08 12:15:21 +01:00
0f8790dd2e [ticket/12684] Add extended help for the user:add command
PHPBB3-12684
2016-03-08 00:34:27 -08:00
0c1e7c2f9c [ticket/12684] Add shorthand alternates to the options
PHPBB3-12684
2016-03-08 00:34:27 -08:00
a1b7a5aedc Merge branch '3.2.x' 2016-03-07 09:52:36 +01:00
c00e45d30e Merge branch '3.1.x' into 3.2.x 2016-03-07 09:52:30 +01:00
62a2619300 [ticket/14483] Do not send headers by default on access via controller
PHPBB3-14483
2016-03-06 21:10:42 +01:00
b77856a903 [ticket/14514] Don't skip users when converting passwords
PHPBB3-14514
2016-03-06 16:11:29 +01:00
cc941e6e05 [ticket/12684] Remove whitespace
PHPBB3-12684
2016-03-05 10:41:35 -08:00
8c5d6efad5 [ticket/12684] Add an error on user creation failure
PHPBB3-12684
2016-03-05 09:20:04 -08:00
0e6bcd166c Merge branch '3.2.x'
* 3.2.x:
  [ticket/14510] Prevent infinite loop in add_bots task
2016-03-02 21:51:37 +01:00
fa2ae3a14b [ticket/14510] Prevent infinite loop in add_bots task
PHPBB3-14510
2016-03-02 21:48:10 +01:00
43ffffca5f Merge branch '3.2.x' 2016-03-01 21:52:29 +01:00
a38a6ec7f5 Merge pull request #4196 from CHItA/ticket/14487
[ticket/14487] Try to handle connection timeouts
2016-03-01 21:52:05 +01:00
7b0452e53a [ticket/12684] Remove unnecessary null arguments
PHPBB3-12684
2016-02-29 23:24:01 -08:00