1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-20 07:30:16 +01:00

23918 Commits

Author SHA1 Message Date
Tristan Darricau
8769e765a2 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14532] Do not escape column default in mssql
2016-04-03 16:02:50 +02:00
Tristan Darricau
a2f517fb38 Merge pull request #4268 from marc1706/ticket/14532
[ticket/14532] Do not escape column default in mssql

* marc1706/ticket/14532:
  [ticket/14532] Do not escape column default in mssql
2016-04-03 16:00:01 +02:00
JoshyPHP
2505aaa9d6 [ticket/14426] Fixed undefined offset error
PHPBB3-14426
2016-04-03 10:27:23 +02:00
Tristan Darricau
9dad16c5a6 Merge pull request #4271 from kasimi/ticket/14562-3.2.x
[ticket/14562] Language fallback for extension permissions (3.2.x)

* kasimi/ticket/14562-3.2.x:
  [ticket/14562] Language fallback for extension permissions (3.2.x)
2016-04-02 13:11:43 +02:00
Tristan Darricau
a895640245 Revert "[ticket/14562] Language fallback for extension permissions"
This reverts commit 621b958b1ca41e1def6349e07e0e3c8258a9d9f3.
2016-04-02 13:10:55 +02:00
Tristan Darricau
bd91925fe7 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14562] Language fallback for extension permissions
2016-04-02 13:10:34 +02:00
Tristan Darricau
ccdf8e7ee1 Merge pull request #4270 from kasimi/ticket/14562
[ticket/14562] Language fallback for extension permissions

* kasimi/ticket/14562:
  [ticket/14562] Language fallback for extension permissions
2016-04-02 13:02:14 +02:00
Tristan Darricau
28ba2d4494 Merge pull request #4274 from marc1706/ticket/14495
[ticket/14495] Specify correct version numbers in 3.2.x

* marc1706/ticket/14495:
  [ticket/14495] Specify correct version numbers in 3.2.x
2016-04-02 12:09:31 +02:00
Marc Alexander
83b56f7855 [ticket/14495] Specify correct version numbers in 3.2.x
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).

PHPBB3-14495
2016-04-02 10:06:59 +02:00
Marc Alexander
2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x
Conflicts:
	phpBB/includes/acp/acp_modules.php
2016-04-02 09:51:37 +02:00
Marc Alexander
5b61ac06cb [ticket/14577] Do not calculate size of array in for loop
For loops that modify the size of the looped arrays were obviously not
changed.

PHPBB3-14577
2016-04-02 09:46:54 +02:00
kasimi
1819b64046 [ticket/14562] Language fallback for extension permissions (3.2.x)
PHPBB3-14562
2016-04-01 21:58:05 +02:00
kasimi
621b958b1c [ticket/14562] Language fallback for extension permissions
PHPBB3-14562
2016-04-01 18:06:19 +02:00
Tristan Darricau
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
Marc Alexander
48283d7c62 [ticket/14532] Do not escape column default in mssql
The column default shouldn't be escaped for mssql. This is a regression
from 743d816631292a2081af4c5f7fc2fad2aff17c58. 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
Marc Alexander
c9ffef2c57 Merge branch '3.1.x' into 3.2.x 2016-03-31 12:30:14 +02:00
Marc Alexander
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
Greg Ryckman
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
Máté Bartus
9fc01a42e6 [ticket/14393] Fix db update progress bar
PHPBB3-14393
2016-03-30 11:05:45 +02:00
Marc Alexander
27df46040f Merge branch '3.1.x' into 3.2.x 2016-03-30 10:04:33 +02:00
Matt Friedman
39de59e65f [ticket/14570] Use phpbb_version_compare
PHPBB3-14570
2016-03-29 10:01:03 -07:00
Matt Friedman
b8dd3ef43a [ticket/14570] Add effectively installed to 3.1.x versions
PHPBB3-14570
2016-03-29 09:54:22 -07:00
Jakub Senko
4fa47d301f [ticket/10356] Find inactive users in livesearch when having permissions
While original ticket request is already fixed, livesearch did not
reflect it.

PHPBB3-10356
2016-03-29 13:26:17 +02:00
Máté Bartus
c44a01fd9d [ticket/14393] Fix init for conflict archive
PHPBB3-14393
2016-03-27 20:10:45 +02:00
Máté Bartus
99196a42f2 [ticket/14564] Fix cookie domain calculation
PHPBB3-14564
2016-03-27 19:25:00 +02:00
Máté Bartus
3278ff03e7 [ticket/14393] Fix updater behaviour
PHPBB3-14393
2016-03-27 18:25:06 +02:00
Tristan Darricau
7830ac2c9a Merge pull request #4252 from RMcGirr83/ticket_14329
[ticket/14329] Add missing ACP language vars

* RMcGirr83/ticket_14329:
  [ticket/14329] Add missing ACP language vars
2016-03-27 16:41:29 +02:00
Tristan Darricau
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
Tristan Darricau
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
Tristan Darricau
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
Tristan Darricau
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
Richard McGirr
4a14eb8488 [ticket/14329] Add missing ACP language vars
PHPBB3-14329
2016-03-27 06:54:50 -04:00
Marc Alexander
7d5a853b21 Merge pull request #4228 from Senky/ticket/9435
[ticket/9435] Replace BBcode magic numbers with constants
2016-03-27 12:40:38 +02:00
Marc Alexander
a7950bd8ce Merge branch '3.1.x' into 3.2.x 2016-03-27 12:37:27 +02:00
Marc Alexander
50737da051 Merge pull request #4246 from RMcGirr83/ticket_13625
[ticket/13625] Fix types of properties
2016-03-27 12:37:25 +02:00
Marc Alexander
465eabbc65 Merge branch '3.1.x' into 3.2.x 2016-03-27 12:34:49 +02:00
Marc Alexander
5e96738ca1 Merge pull request #4230 from Senky/ticket/13028
[ticket/13028] Rename unanswered search label
2016-03-27 12:33:48 +02:00
Marc Alexander
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
Tristan Darricau
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
Tristan Darricau
1f962dacaf Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13013] Explain to user explicitl what "participate more" means
2016-03-26 19:21:36 +01:00
Jakub Senko
9ef5b126ec [ticket/13013] Explain to user explicitl what "participate more" means
PHPBB3-13013
2016-03-26 19:17:41 +01:00
Tristan Darricau
dedfb317f2 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14134] Fix Okay in a comment.
  [ticket/14134] Fix code comments.
  [ticket/14134] Send warning notification PM in user's language.
2016-03-26 18:59:31 +01:00
Tristan Darricau
640070e133 Merge pull request #3874 from lavigor/ticket/14134
[ticket/14134] Send warning notification PM in user's language.

* lavigor/ticket/14134:
  [ticket/14134] Fix Okay in a comment.
  [ticket/14134] Fix code comments.
  [ticket/14134] Send warning notification PM in user's language.
2016-03-26 18:59:31 +01:00
lavigor
18a4505b23 [ticket/14134] Fix Okay in a comment.
PHPBB3-14134
2016-03-25 23:11:43 +03:00
Tristan Darricau
9f3ee58595 Merge pull request #4188 from marc1706/ticket/13842
[ticket/13842] Prevent internal server errors without rewrite module on IIS

* marc1706/ticket/13842:
  [ticket/13842] Prevent internal server errors without rewrite module on IIS
2016-03-25 11:56:01 +01:00
Tristan Darricau
2a7c514cd0 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
7f9ba9849b Merge pull request #4190 from marc1706/ticket/14437
[ticket/14437] Correctly assume index from attachment display order

* marc1706/ticket/14437:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
3eb6f7176a Merge pull request #4193 from marc1706/ticket/14497
[ticket/14497] Support second app.php script in install folder

* marc1706/ticket/14497:
  [ticket/14497] Do not check for doctype on index and use correct return
  [ticket/14497] Add test for visiting installer
  [ticket/14497] Use nginx sample config in travis tests
  [ticket/14497] Support second app.php script in install folder
2016-03-25 11:46:15 +01:00
Tristan Darricau
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
Tristan Darricau
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