mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
28,189 Commits 17 Branches 190 Tags
Commit Graph

28189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JoshyPHP
753d6dfcae [ticket/14260] Added regression test 
PHPBB3-14260
 2016-04-03 10:45:01 +02:00
Marc Alexander
3281826a51 Merge branch 'ticket/14426' into 3.2.x 2016-04-03 10:27:46 +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
Tristan Darricau
79a8d48c3c Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2016-04-02 12:07:04 +02:00
Tristan Darricau
d603d66eaa Merge pull request #4273 from marc1706/ticket/14577-3.2.x 
[ticket/14577] Do not calculate size of array in for loop

* marc1706/ticket/14577-3.2.x:
  [ticket/14577] Do not calculate size of array in for loop
 2016-04-02 12:07:03 +02:00
Tristan Darricau
0a9c049f76 Merge pull request #4272 from marc1706/ticket/14577 
[ticket/14577] Do not calculate size of array in for loop

* marc1706/ticket/14577:
  [ticket/14577] Do not calculate size of array in for loop
 2016-04-02 12:06:30 +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
Tristan Darricau
65113f222e Merge pull request #4269 from VSEphpbb/ticket/14576 
[ticket/14576] Move common required files to bootstrap in tests

* VSEphpbb/ticket/14576:
  [ticket/14576] Move common required files to bootstrap
 2016-03-31 22:39:27 +02:00
Matt Friedman
14e8113fcf [ticket/14576] Move common required files to bootstrap 
PHPBB3-14576
 2016-03-31 11:06:47 -07: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
Marc Alexander
dfc2168d31 Merge pull request #4267 from GregRyckman/ticket/14572 
[ticket/14572] Fix quote notification deletion
 2016-03-30 21:03:06 +02:00
Marc Alexander
2387fdd599 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	composer.phar
 2016-03-30 19:00:35 +02:00
Marc Alexander
7a1cf2a280 Merge pull request #4259 from Nicofuma/ticket/14565 
[ticket/14565] Updates composer.phar to 1.0.0-beta2
 2016-03-30 18:54: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
Marc Alexander
b22fbc91d1 Merge pull request #4262 from Senky/ticket/10356 
[ticket/10356] Find inactive users in livesearch when having permissions
 2016-03-30 09:29:59 +02:00
Tristan Darricau
00dcbb3992 [ticket/14565] Workaround for php 5.3.3 
PHPBB3-14565
 2016-03-29 21:13:45 +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
a9242bbf7b Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14568] Update the repository readme
 2016-03-28 19:26:47 +02:00
Máté Bartus
28705b54a5 Merge pull request #4260 from VSEphpbb/ticket/14568 
[ticket/14568] Update the repository readme
 2016-03-28 19:22:56 +02:00
Matt Friedman
478c90cb00 [ticket/14568] Update the repository readme 
PHPBB3-14568
 2016-03-28 09:49:42 -07:00
Marc Alexander
fae305073a Merge pull request #4257 from CHItA/ticket/14564 
[ticket/14564] Fix cookie domain calculation
 2016-03-28 00:28:34 +02:00
Tristan Darricau
9a5f420ce8 [ticket/14565] Updates composer.phar to 1.0.0-beta2 
PHPBB3-14565
 2016-03-27 20:27: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
5a9e9029e8 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2016-03-27 13:34:54 +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