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

29713 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
be5175d451 Merge branch '3.2.x' 2016-03-30 21:04:14 +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
073cf35422 Merge branch '3.2.x' 2016-03-30 19:01:12 +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
4ddf69f0f1 Merge branch '3.2.x' 2016-03-30 10:04:57 +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
646c2e40a2 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14568] Update the repository readme
 2016-03-28 19:27:21 +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
d298e7f5a1 Merge branch '3.2.x' 2016-03-28 00:28:36 +02: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
32c7209887 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14329] Add missing ACP language vars
 2016-03-27 16:41:38 +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
1fba54ab2e Merge branch '3.2.x' 
* 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:57 +02: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
c13c7c28ad Merge branch '3.2.x' 
* 3.2.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:06 +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
Marc Alexander
475b92e28e Merge branch '3.2.x' 2016-03-27 12:40:41 +02:00
Marc Alexander
7d5a853b21 Merge pull request #4228 from Senky/ticket/9435 
[ticket/9435] Replace BBcode magic numbers with constants
 2016-03-27 12:40:38 +02:00
Marc Alexander
4924e225d7 Merge branch '3.2.x' 2016-03-27 12:37:32 +02:00
Marc Alexander
a7950bd8ce Merge branch '3.1.x' into 3.2.x 2016-03-27 12:37:27 +02:00
Marc Alexander
50737da051 Merge pull request #4246 from RMcGirr83/ticket_13625 
[ticket/13625] Fix types of properties
 2016-03-27 12:37:25 +02:00
Marc Alexander
42c923ba5a Merge branch '3.2.x' 2016-03-27 12:35:08 +02:00
Marc Alexander
465eabbc65 Merge branch '3.1.x' into 3.2.x 2016-03-27 12:34:49 +02:00
Marc Alexander
5e96738ca1 Merge pull request #4230 from Senky/ticket/13028 
[ticket/13028] Rename unanswered search label
 2016-03-27 12:33:48 +02:00