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,470 Commits 17 Branches 190 Tags
Commit Graph

28470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Alexander
01d5667388 [ticket/13502] Also cover passing object to resolver in tests 
PHPBB3-13502
 2016-04-01 21:35:11 +02:00
Marc Alexander
91045879df [ticket/13502] Test getArguments() method of controller resolver 
PHPBB3-13502
 2016-04-01 21:35:11 +02:00
Marc Alexander
3f4cf72872 [ticket/13502] Fix coding style 
PHPBB3-13502
 2016-04-01 21:33:14 +02:00
RFD
ada90d3b0a [ticket/13502] Controller resolver should handle callable functions and objects 
PHPBB3-13502
 2016-04-01 21:33:14 +02:00
kasimi
621b958b1c [ticket/14562] Language fallback for extension permissions 
PHPBB3-14562
 2016-04-01 18:06:19 +02:00
Matt Friedman
1641fd18c1 [ticket/14561] Remove requires for functions in tests 
PHPBB3-14561
 2016-03-31 15:14:41 -07:00
Matt Friedman
2b90591a31 [ticket/14561] Small change to progress bar output 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
e81bf76dea [ticket/14561] Fix function docblock in activate command 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
afb69d7cd2 [ticket/14561] Add a progress bar to reclean command 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
4b789c0418 [ticket/14561] Use the user loader where appropriate 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
ed0f151d86 [ticket/14561] Add extra help explaining reclean command 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
aee3eec439 [ticket/14561] Import classes with use statements 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
13f365916c [ticket/14561] Remove unused use statements 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
6291bfaca9 [ticket/14561] Refactor tests 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
16f9b4630c [ticket/14561] Reclean usernames command 
PHPBB3-14561
 2016-03-31 15:07:43 -07:00
Matt Friedman
91f1116e04 [ticket/14561] User activate command 
PHPBB3-14561
 2016-03-31 15:07:43 -07:00
Matt Friedman
8a9429efa4 [ticket/14561] User delete command 
PHPBB3-14561
 2016-03-31 15:07:43 -07: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
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
Tristan Darricau
ff9632261e [ticket/13683] Removes extra / in script_path 
PHPBB3-13683
 2016-03-30 22:28:20 +02:00
Tristan Darricau
842d6f7815 Merge branch 'ticket/13683' into ticket/13683-3.2.x 
* ticket/13683:
  [ticket/13683] Removes extra / in script_path
 2016-03-30 22:25:48 +02:00
Tristan Darricau
bfc09e2b39 [ticket/13683] Removes extra / in script_path 
PHPBB3-13683
 2016-03-30 22:22:38 +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
a5f1ff8563 [ticket/13683] Fix merge into 3.2.x 
PHPBB3-13683
 2016-03-29 21:15:50 +02:00
Tristan Darricau
00dcbb3992 [ticket/14565] Workaround for php 5.3.3 
PHPBB3-14565
 2016-03-29 21:13:45 +02:00
Tristan Darricau
4205450c9d Merge branch 'ticket/13683' into ticket/13683-3.2.x 
* ticket/13683:
  [ticket/13683] Updates tests
  [ticket/13683] Fix more cases
  [ticket/13683] Respects force_server_vars settings when generating URLs
 2016-03-29 19:16:51 +02:00