makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
28278 commits 18 branches 192 tags 206 MiB
Commit graph

23954 commits

Author SHA1 Message Date
Marc Alexander
662fbc7cde Merge branch '3.2.x' 2016-04-07 21:59:44 +02:00
Marc Alexander
901f36e982 Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x 
[ticket/13683] Respects force_server_vars settings when generating URLs
 2016-04-07 21:59:36 +02:00
Marc Alexander
76af1c608c Merge branch '3.2.x' 2016-04-06 21:00:41 +02:00
Tristan Darricau
7bf8006b67 [ticket/14198] Use the build option to calculate the container cache filename 
PHPBB3-14198
 2016-04-04 21:32:46 +02:00
Tristan Darricau
4ded3864cd Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14559] Remove attachment BBCode tags from the quoted message
 2016-04-03 16:34:46 +02:00
Tristan Darricau
a319d58d03 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14559] Remove attachment BBCode tags from the quoted message
 2016-04-03 16:34:43 +02:00
Tristan Darricau
d0f5b39f11 Merge pull request #4253 from rxu/ticket/14559 
[ticket/14559] Remove attachment BBCode tags from the quoted message

* rxu/ticket/14559:
  [ticket/14559] Remove attachment BBCode tags from the quoted message
 2016-04-03 16:34:43 +02:00
Tristan Darricau
b1085b7dcb Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14561] Remove requires for functions in tests
  [ticket/14561] Small change to progress bar output
  [ticket/14561] Fix function docblock in activate command
  [ticket/14561] Add a progress bar to reclean command
  [ticket/14561] Use the user loader where appropriate
  [ticket/14561] Add extra help explaining reclean command
  [ticket/14561] Import classes with use statements
  [ticket/14561] Remove unused use statements
  [ticket/14561] Refactor tests
  [ticket/14561] Reclean usernames command
  [ticket/14561] User activate command
  [ticket/14561] User delete command
 2016-04-03 16:32:25 +02:00
Tristan Darricau
f929db6190 Merge pull request #4248 from VSEphpbb/ticket/14561 
[ticket/14561] Add more user commands

* VSEphpbb/ticket/14561:
  [ticket/14561] Remove requires for functions in tests
  [ticket/14561] Small change to progress bar output
  [ticket/14561] Fix function docblock in activate command
  [ticket/14561] Add a progress bar to reclean command
  [ticket/14561] Use the user loader where appropriate
  [ticket/14561] Add extra help explaining reclean command
  [ticket/14561] Import classes with use statements
  [ticket/14561] Remove unused use statements
  [ticket/14561] Refactor tests
  [ticket/14561] Reclean usernames command
  [ticket/14561] User activate command
  [ticket/14561] User delete command
 2016-04-03 16:32:25 +02:00
Tristan Darricau
02469d4691 Merge branch 'ticket/13683' into ticket/13683-3.2.x 
* ticket/13683:
  [ticket/13683] Fix CS
 2016-04-03 16:27:08 +02:00
Tristan Darricau
d747ac146e [ticket/13683] Fix CS 
PHPBB3-13683
 2016-04-03 16:25:54 +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
Marc Alexander
0eefec86a5 Merge branch '3.2.x' 2016-04-03 10:28:19 +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
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
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
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
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
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 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
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
bfc09e2b39 [ticket/13683] Removes extra / in script_path 
PHPBB3-13683
 2016-03-30 22:22:38 +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