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

28226 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
kasimi
621b958b1c [ticket/14562] Language fallback for extension permissions 
PHPBB3-14562
 2016-04-01 18:06:19 +02: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
Marc Alexander
7d5e052e97 Merge branch '3.2.x' 2016-03-31 12:30:20 +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
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
00dcbb3992 [ticket/14565] Workaround for php 5.3.3 
PHPBB3-14565
 2016-03-29 21:13:45 +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