makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
30768 commits 18 branches 192 tags 207 MiB
Commit graph

30768 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tristan Darricau
5cdbef860d [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer 
PHPBB3-13616
 2016-04-03 16:22:07 +02:00
Tristan Darricau
71c4ffceec Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13502] Also cover passing object to resolver in tests
  [ticket/13502] Test getArguments() method of controller resolver
  [ticket/13502] Fix coding style
  [ticket/13502] Controller resolver should handle callable functions and objects
 2016-04-03 16:04:59 +02:00
Tristan Darricau
e8762ce3cb Merge pull request #4266 from marc1706/ticket/13502 
[ticket/13502] Handle callable functions/objects in controller resolver

* marc1706/ticket/13502:
  [ticket/13502] Also cover passing object to resolver in tests
  [ticket/13502] Test getArguments() method of controller resolver
  [ticket/13502] Fix coding style
  [ticket/13502] Controller resolver should handle callable functions and objects
 2016-04-03 16:04:59 +02:00
Tristan Darricau
3c89a69701 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14532] Do not escape column default in mssql
 2016-04-03 16:03:07 +02:00
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
Tristan Darricau
e2372b369b Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14260] Added regression test
 2016-04-03 15:51:57 +02:00
Tristan Darricau
5ba5128ae6 Merge pull request #4277 from JoshyPHP/ticket/14260 
[ticket/14260] Added regression test

* JoshyPHP/ticket/14260:
  [ticket/14260] Added regression test
 2016-04-03 15:49:18 +02:00
JoshyPHP
753d6dfcae [ticket/14260] Added regression test 
PHPBB3-14260
 2016-04-03 10:45:01 +02:00
Marc Alexander
0eefec86a5 Merge branch '3.2.x' 2016-04-03 10:28:19 +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
92fdc14208 Merge branch '3.2.x' 
* 3.2.x:
  Revert "[ticket/14562] Language fallback for extension permissions"
  [ticket/14562] Language fallback for extension permissions (3.2.x)
  [ticket/14562] Language fallback for extension permissions
 2016-04-02 13:13:01 +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 621b958b1c.
 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
93f932b80f [ticket/14495] Revert changes in master 
PHPBB3-14495
 2016-04-02 12:12:24 +02:00
Tristan Darricau
2b5037ee96 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14495] Specify correct version numbers in 3.2.x
 2016-04-02 12:09:40 +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
b81be8f71e Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14577] Do not calculate size of array in for loop
 2016-04-02 12:07:15 +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
49c3da0cb9 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14393] Fix db update progress bar
  [ticket/14393] Fix init for conflict archive
  [ticket/14393] Fix updater behaviour
 2016-03-31 22:50:47 +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
cae1e4127a Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14576] Move common required files to bootstrap
 2016-03-31 22:42:55 +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