makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 11:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
30350 commits 18 branches 192 tags 207 MiB
Commit graph

30350 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
5ee6c216e5 [prep-release-3.1.9] Add migration for 3.1.9-RC1 2016-04-09 08:13:31 +02:00
Joas Schilling
15e22af266 [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
Joas Schilling
c03d9d9acc
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14587] Remove sectionGroup from web.config
 2016-04-08 16:35:18 +02:00
Joas Schilling
45a3e4d04f
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14587] Remove sectionGroup from web.config
 2016-04-08 16:35:00 +02:00
Joas Schilling
2ae17d6caf
Merge pull request #4283 from DavidIQ/ticket/14587 
[ticket/14587] Remove sectionGroup from web.config

* DavidIQ/ticket/14587:
  [ticket/14587] Remove sectionGroup from web.config
 2016-04-08 16:34:43 +02:00
David Colón
ebbedf29e0 [ticket/14587] Remove sectionGroup from web.config 
Causes errors on some IIS installations.

PHPBB3-14587
 2016-04-07 17:20:34 -04:00
Marc Alexander
662fbc7cde Merge branch '3.2.x' 2016-04-07 21:59:44 +02:00
Marc Alexander
4e8981ee37 Merge branch '3.1.x' into 3.2.x 2016-04-07 21:59:36 +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
9ad5c577f5 Merge pull request #4256 from Nicofuma/ticket/13683 
[ticket/13683] Respects force_server_vars settings when generating URLs
 2016-04-07 21:59:26 +02:00
Marc Alexander
76af1c608c Merge branch '3.2.x' 2016-04-06 21:00:41 +02:00
Marc Alexander
c53eae7abc Merge pull request #4280 from Nicofuma/ticket/14198 
[ticket/14198] Use the build option to calculate the container cache filename
 2016-04-06 21:00:36 +02:00
Marc Alexander
a6c90643fd Merge branch '3.2.x' 2016-04-06 20:54:57 +02:00
Marc Alexander
cdc7f1722d Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/database_update.php
 2016-04-06 20:54:35 +02:00
Marc Alexander
12f5c0405e Merge pull request #4279 from RMcGirr83/ticket_14408 
[ticket/14408] Remove span tags from file
 2016-04-06 20:54:07 +02:00
Richard McGirr
e80f79fc9a [ticket/13716] Fix grammar and href title tags 
PHPBB3-13716
 2016-04-06 06:18:26 -04:00
RMcGirr83
920219dc56 [ticket/13716] Remove extraneous blank line 
PHPBB3-13716
 2016-04-05 14:55:42 -04:00
Richard McGirr
04f320cb01 [ticket/13716] Check phpBB version against config version 
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
 2016-04-05 07:09:12 -04: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
Richard McGirr
68eba86309 [ticket/14408] Remove span tags from file 
PHPBB3-14408
 2016-04-04 07:18:21 -04: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
5754cbfec4 [ticket/13616] Fix CS + constant in the core extension 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
6d2acb5ba3 [ticket/13616] Fix UI tests 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
bffd963c50 [ticket/13616] Cleanup globals after installing the board in func tests 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
663e3bc642 [ticket/13616] Updates direct call to twig environment constructor 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
4070d1e06f [ticket/13616] Uses a php 5.4 compatible version 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
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