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

30449 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
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
Tristan Darricau
0647eea742 [ticket/13683] Updates tests 
PHPBB3-13683
 2016-03-29 19:13:09 +02:00
Tristan Darricau
0b1ed8dbbb [ticket/13683] Fix more cases 
PHPBB3-13683
 2016-03-29 19:06:37 +02:00
Tristan Darricau
1a5fbd4bd0 [ticket/13683] Respects force_server_vars settings when generating URLs 
PHPBB3-13683
 2016-03-29 19:06:30 +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
rxu
0ca32c41b5 [ticket/14559] Remove attachment BBCode tags from the quoted message 
PHPBB3-14559
 2016-03-27 19:09:06 +07: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