Marc Alexander
e2431502d1
Merge branch '3.2.x'
2016-09-24 21:45:36 +02:00
Marc Alexander
164f0e031d
Merge branch '3.1.x' into 3.2.x
2016-09-24 21:45:17 +02:00
Marc Alexander
51d830a6d3
[3.1.x] Increase version for 3.1.11 development
2016-09-24 21:39:47 +02:00
Marc Alexander
32d9efff47
Merge branch 'prep-release-3.1.10' into 3.1.x
2016-09-24 21:35:42 +02:00
Marc Alexander
7d73d1ff83
[prep-release-3.1.10] Add changelog for 3.1.10-RC1
2016-09-24 14:57:23 +02:00
Marc Alexander
c958ba13e8
[prep-release-3.1.10] Add migration for 3.1.10-RC1
2016-09-24 14:50:46 +02:00
Marc Alexander
2f17757f4e
[prep-release-3.1.10] Update version to 3.1.10-RC1
2016-09-24 14:50:46 +02:00
Marc Alexander
531d23935a
Merge branch '3.2.x'
2016-09-24 13:04:27 +02:00
Marc Alexander
187c6df18a
Merge branch '3.1.x' into 3.2.x
2016-09-24 13:04:24 +02:00
Marc Alexander
b8bbf9db03
Merge pull request #4461 from marc1706/ticket/14785
...
[ticket/14785] Add template event overall_header_headerbar_after/before
2016-09-24 13:04:21 +02:00
Marc Alexander
62e288bc90
Merge branch '3.2.x'
2016-09-24 11:50:20 +02:00
Marc Alexander
713f25e552
Merge branch '3.1.x' into 3.2.x
2016-09-24 11:50:17 +02:00
Marc Alexander
4267cc3a43
Merge pull request #4462 from marc1706/ticket/14796
...
[ticket/14796] Use log_table class member instead of table constant
2016-09-24 11:50:15 +02:00
GerB
90e9d5c462
[ticket/14785] Add template event overall_header_headerbar_after/before
...
PHPBB3-14785
2016-09-24 11:04:23 +02:00
Tristan Darricau
f9b7bbafac
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14484] Remove duplicate methods and no longer needed calls
[ticket/14484] Remove invalid code caused by merge conflict
[ticket/14484] Properly enable extensions in UI tests
[ticket/14484] Move facebook/webdriver back to tests dir composer.json
[ticket/14484] Move facebook webdriver to main composer.json
2016-09-24 10:31:48 +02:00
Tristan Darricau
b59e41d289
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
2016-09-24 10:31:30 +02:00
Tristan Darricau
fdd4f68aea
Merge pull request #4455 from marc1706/ticket/14484-rhea
...
[ticket/14484] Add possibility to use extensions in UI tests
* marc1706/ticket/14484-rhea:
[ticket/14484] Remove duplicate methods and no longer needed calls
[ticket/14484] Remove invalid code caused by merge conflict
[ticket/14484] Properly enable extensions in UI tests
[ticket/14484] Move facebook/webdriver back to tests dir composer.json
[ticket/14484] Move facebook webdriver to main composer.json
2016-09-24 10:31:27 +02:00
Tristan Darricau
cdd56c0505
Merge pull request #4394 from marc1706/ticket/14484
...
[ticket/14484] Add possibility to use extensions in UI tests
* marc1706/ticket/14484:
[ticket/14484] Properly enable extensions in UI tests
[ticket/14484] Move facebook/webdriver back to tests dir composer.json
[ticket/14484] Move facebook webdriver to main composer.json
2016-09-24 10:31:06 +02:00
Marc Alexander
1b57fed387
Merge branch '3.2.x'
2016-09-24 10:28:42 +02:00
Marc Alexander
1fff455862
Merge branch '3.1.x' into 3.2.x
2016-09-24 10:28:39 +02:00
Marc Alexander
18f9c9f6e2
Merge pull request #3527 from Elsensee/ticket/13709
...
[ticket/13709] Add fallback for email templates used by extensions
2016-09-24 10:28:37 +02:00
Forumhulp.com
97040dc6ff
[ticket/14796] Use log_table class member instead of table constant
...
Was still using the old LOG_TABLE constant in the delete method.
PHPBB3-14796
2016-09-24 10:19:12 +02:00
Marc Alexander
8b17274d7f
Merge branch '3.2.x'
2016-09-24 10:04:38 +02:00
Marc Alexander
e02dc7a9c1
Merge branch '3.1.x' into 3.2.x
2016-09-24 10:03:58 +02:00
Marc Alexander
931582aad9
Merge pull request #4432 from Senky/ticket/14762
...
[ticket/14762] Add core event to session.php
2016-09-24 10:02:41 +02:00
Marc Alexander
173adc1053
Merge branch '3.2.x'
2016-09-24 09:56:33 +02:00
Marc Alexander
4db52518a9
Merge branch '3.1.x' into 3.2.x
2016-09-24 09:56:30 +02:00
Marc Alexander
3910387ee5
Merge pull request #4433 from Senky/ticket/14747
...
[ticket/14747] Add post_data to core.modify_posting_auth
2016-09-24 09:56:25 +02:00
Marc Alexander
4fffe2eb4d
Merge branch '3.2.x'
2016-09-24 09:42:21 +02:00
Marc Alexander
73d150db80
Merge branch '3.1.x' into 3.2.x
2016-09-24 09:41:54 +02:00
Marc Alexander
d2f95ef875
Merge pull request #4460 from marc1706/ticket/14784
...
[ticket/14784] missing rewrite for lighttpd
2016-09-24 09:39:01 +02:00
Marc Alexander
f79aabb866
Merge branch '3.2.x'
2016-09-24 09:36:08 +02:00
Marc Alexander
dcc7118c0d
Merge pull request #4460 from marc1706/ticket/14784
...
[ticket/14784] missing rewrite for lighttpd
2016-09-24 09:36:04 +02:00
Tobi Schäfer
537dca0892
[ticket/14784] missing rewrite for lighttpd
...
PHPBB3-14784
2016-09-24 08:21:27 +02:00
Marc Alexander
b15517e700
Merge branch '3.2.x'
2016-09-23 21:10:29 +02:00
Marc Alexander
9a64bffd68
Merge pull request #4459 from rxu/ticket/14794
...
[ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
2016-09-23 21:10:26 +02:00
Marc Alexander
bbb1ff325b
Merge branch '3.2.x'
2016-09-23 20:55:24 +02:00
Marc Alexander
77e14c3030
Merge pull request #4457 from rxu/ticket/14793
...
[ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
2016-09-23 20:55:21 +02:00
rxu
a5ccdc7997
[ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
...
PHPBB3-14794
2016-09-23 19:47:05 +07:00
rxu
becb1e1fff
[ticket/14793] Merge branch 'ticket/14748' of https://github.com/marc1706/phpbb
...
PHPBB3-14793
2016-09-23 05:52:47 +07:00
Marc Alexander
1b82a9d608
Merge branch '3.2.x'
2016-09-22 21:26:38 +02:00
Marc Alexander
bc6dc9f173
Merge branch '3.1.x' into 3.2.x
2016-09-22 21:26:35 +02:00
Marc Alexander
2436af94e3
Merge pull request #4392 from ErnadoO/PHPBB3-14592
...
[ticket/14592] [PHP] core.search_backend_search_after
2016-09-22 21:26:31 +02:00
Marc Alexander
8c53b369d4
Merge branch '3.2.x'
2016-09-22 21:24:02 +02:00
Marc Alexander
430c266eb2
Merge branch '3.1.x' into 3.2.x
2016-09-22 21:23:58 +02:00
Marc Alexander
75f57fa407
Merge pull request #4454 from rxu/tcket/14787-1
...
[ticket/14787] Add more parameters to the core.search_modify_url_parameters
2016-09-22 21:23:55 +02:00
rxu
35c62d1e74
[ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
...
PHPBB3-14793
2016-09-22 22:29:18 +07:00
Máté Bartus
a94c4ce0dd
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14791] Get form tokens from correct button in search test base
2016-09-22 10:16:22 +02:00
Máté Bartus
6ae405f743
Merge pull request #4456 from marc1706/ticket/14791
...
[ticket/14791] Get form tokens from correct button in search test base
2016-09-22 10:15:28 +02:00
Marc Alexander
65ef56ed71
[ticket/14791] Get form tokens from correct button in search test base
...
PHPBB3-14791
2016-09-21 21:36:03 +02:00
