1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00
Commit Graph

3518 Commits

Author SHA1 Message Date
f9b6086302 Merge pull request #4255 from CHItA/ticket/14393
[ticket/14393] Fix updater behaviour

* CHItA/ticket/14393:
  [ticket/14393] Fix db update progress bar
  [ticket/14393] Fix init for conflict archive
  [ticket/14393] Fix updater behaviour
2016-03-31 22:49:54 +02:00
48283d7c62 [ticket/14532] Do not escape column default in mssql
The column default shouldn't be escaped for mssql. This is a regression
from 743d816631. Prior to that commit, the
default value for the column was not escaped. Escaping it will cause SQL
errors while altering columns.

PHPBB3-14532
2016-03-31 16:07:05 +02:00
c9ffef2c57 Merge branch '3.1.x' into 3.2.x 2016-03-31 12:30:14 +02:00
3f5a873e4c Merge pull request #4264 from VSEphpbb/ticket/14570
[ticket/14570] Add effectively installed to 3.1.x versions
2016-03-31 12:30:07 +02:00
ff9632261e [ticket/13683] Removes extra / in script_path
PHPBB3-13683
2016-03-30 22:28:20 +02:00
bfc09e2b39 [ticket/13683] Removes extra / in script_path
PHPBB3-13683
2016-03-30 22:22:38 +02:00
a643d04b05 [ticket/14572] Fix quote notification deletion
Some array_key calls were incorrect in the
notification checks for quotes. Two calls were
being made in a row, resulting in incorrect arrays.

PHPBB3-14572
2016-03-30 12:53:44 -04:00
9fc01a42e6 [ticket/14393] Fix db update progress bar
PHPBB3-14393
2016-03-30 11:05:45 +02:00
a5f1ff8563 [ticket/13683] Fix merge into 3.2.x
PHPBB3-13683
2016-03-29 21:15:50 +02:00
0647eea742 [ticket/13683] Updates tests
PHPBB3-13683
2016-03-29 19:13:09 +02:00
0b1ed8dbbb [ticket/13683] Fix more cases
PHPBB3-13683
2016-03-29 19:06:37 +02:00
1a5fbd4bd0 [ticket/13683] Respects force_server_vars settings when generating URLs
PHPBB3-13683
2016-03-29 19:06:30 +02:00
39de59e65f [ticket/14570] Use phpbb_version_compare
PHPBB3-14570
2016-03-29 10:01:03 -07:00
b8dd3ef43a [ticket/14570] Add effectively installed to 3.1.x versions
PHPBB3-14570
2016-03-29 09:54:22 -07:00
c44a01fd9d [ticket/14393] Fix init for conflict archive
PHPBB3-14393
2016-03-27 20:10:45 +02:00
99196a42f2 [ticket/14564] Fix cookie domain calculation
PHPBB3-14564
2016-03-27 19:25:00 +02:00
3278ff03e7 [ticket/14393] Fix updater behaviour
PHPBB3-14393
2016-03-27 18:25:06 +02:00
a9090ecb0e Merge pull request #4251 from marc1706/ticket/14272-3.2.x
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272-3.2.x:
  [ticket/14272] Allow input of floats for filesize
  [ticket/14272] Use input type number instead of text in avatars
  [ticket/14272] Assign min and max values for avatar driver settings
  [ticket/14272] Define min and max values for avatar width and height
  [ticket/14272] Disable not toggled form elements
  [ticket/14272] Make sure phpbb_avatar_manager was defined
  [ticket/14272] Remove useless check
  [ticket/14272] Fix invalid or missing min/max settings
  [ticket/14272] Assign min/max for all allowed types
  [ticket/14272] Only use maxlength and size for allowed input elements
2016-03-27 13:34:54 +02:00
2bfbc07b7d Merge pull request #4021 from marc1706/ticket/14272
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272:
  [ticket/14272] Allow input of floats for filesize
  [ticket/14272] Use input type number instead of text in avatars
  [ticket/14272] Assign min and max values for avatar driver settings
  [ticket/14272] Define min and max values for avatar width and height
  [ticket/14272] Disable not toggled form elements
  [ticket/14272] Make sure phpbb_avatar_manager was defined
  [ticket/14272] Remove useless check
  [ticket/14272] Fix invalid or missing min/max settings
  [ticket/14272] Assign min/max for all allowed types
  [ticket/14272] Only use maxlength and size for allowed input elements
2016-03-27 13:34:17 +02:00
386d31ec63 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14481] Add tests for x_forwarded_proto header
  [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
  [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
2016-03-27 12:56:03 +02:00
5442a25967 Merge pull request #4182 from marc1706/ticket/14481
[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https

* marc1706/ticket/14481:
  [ticket/14481] Add tests for x_forwarded_proto header
  [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
  [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
2016-03-27 12:56:03 +02:00
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
2016-03-27 09:59:25 +02:00
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
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
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
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