Tristan Darricau
451a7ce43c
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15097] New 'Installed software' lead section
[ticket/15097] Resolve travis-ci error
[ticket/15097] Resolve travis-ci error
[ticket/15097] Add PHP version to Board statistics
[ticket/15097] Add PHP version to Board statistics
2017-04-18 23:15:10 +02:00
Tristan Darricau
4cbf619fd5
Merge pull request #4705 from nomind60s/ticket/15097
...
[ticket/15097] Add PHP version to Board statistics
* github.com:phpbb/phpbb:
[ticket/15097] New 'Installed software' lead section
[ticket/15097] Resolve travis-ci error
[ticket/15097] Resolve travis-ci error
[ticket/15097] Add PHP version to Board statistics
[ticket/15097] Add PHP version to Board statistics
2017-04-18 23:14:56 +02:00
Tristan Darricau
19cbb8fa9d
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15108] Remove duplicate code in request->context
2017-04-18 23:10:41 +02:00
Tristan Darricau
2b233452c7
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/15108] Remove duplicate code in request->context
2017-04-18 23:10:28 +02:00
Tristan Darricau
2d33b6adc6
Merge pull request #4718 from javiexin/ticket/15108
...
[ticket/15108] Remove duplicate code in request->overwrite
* github.com:phpbb/phpbb:
[ticket/15108] Remove duplicate code in request->context
2017-04-18 23:10:13 +02:00
Tristan Darricau
a4d1c60b00
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15103] Update fast-image-size to 1.1.3
2017-04-18 23:07:41 +02:00
Tristan Darricau
42fbf9d815
Merge pull request #4768 from marc1706/ticket/15103
...
[ticket/15103] Update fast-image-size to 1.1.3
* github.com:phpbb/phpbb:
[ticket/15103] Update fast-image-size to 1.1.3
2017-04-18 23:07:25 +02:00
Tristan Darricau
5e12ca7929
Merge pull request #4773 from VSEphpbb/ticket/15154
...
[ticket/15154] Load compatibility globals into the CLI installer
* github.com:phpbb/phpbb:
[ticket/15154] Load compatibility globals into the CLI installer
2017-04-18 23:05:52 +02:00
Marc Alexander
31e258c8c3
Merge branch '3.2.x'
2017-04-18 21:46:48 +02:00
Marc Alexander
623058b08c
Merge pull request #4800 from Nicofuma/ticket/15180
...
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION
2017-04-18 21:46:44 +02:00
Marc Alexander
38b44ea5fc
Merge branch '3.2.x'
2017-04-18 20:38:46 +02:00
Marc Alexander
0dfe3da9bb
Merge branch 'ticket/15125' into 3.2.x
2017-04-18 20:38:22 +02:00
Rishabh04-02
72f7f6eff9
[ticket/15125] Remove the function play_qt_file in forum_fn.js
...
PHPBB3-15125
2017-04-18 20:38:02 +02:00
Tristan Darricau
e0d13da5f4
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION
...
PHPBB3-15180
2017-04-17 23:06:25 +02:00
Marc Alexander
a87727ba47
Merge branch '3.2.x'
2017-04-17 12:02:22 +02:00
Marc Alexander
2c66867126
Merge pull request #4771 from Crizz0/ticket/15152
...
[ticket/15152] Updates Font Awesome Icons to version 4.7.0
2017-04-17 12:02:17 +02:00
Marc Alexander
4206e25b2a
Merge branch '3.2.x'
2017-04-17 11:51:16 +02:00
Marc Alexander
4946c05937
Merge branch '3.1.x' into 3.2.x
2017-04-17 11:50:55 +02:00
Marc Alexander
8303058ac6
Merge pull request #4689 from javiexin/ticket/15080
...
[ticket/15080] Save unneeded file loads for extension metadata
2017-04-17 10:19:19 +02:00
Marc Alexander
465ceab1e6
Merge branch '3.2.x'
2017-04-16 19:41:19 +02:00
Marc Alexander
515d3b7cd1
Merge pull request #4633 from rxu/ticket/14990
...
[ticket/14990] Add core events to the Twig environment
2017-04-16 19:41:14 +02:00
rxu
fcc8e155ec
[ticket/14990] Move dispatcher object to the front of the options array
...
PHPBB3-14990
2017-04-16 23:40:16 +07:00
rxu
1ea114ca20
[ticket/14990] Fix event name, email parsing, installer and dispatcher calls
...
PHPBB3-14990
2017-04-16 22:43:50 +07:00
rxu
633bbc9c6d
[ticket/14990] Add core events to the Twig environment
...
PHPBB3-14990
2017-04-16 22:43:49 +07:00
Marc Alexander
1b9380040c
Merge branch '3.2.x'
2017-04-16 17:35:48 +02:00
Marc Alexander
c5126af1df
Merge pull request #4795 from marc1706/ticket/14938
...
[ticket/14938] Add missing language class to extension manager mock
2017-04-16 17:35:43 +02:00
Marc Alexander
f39e5424f1
[ticket/14938] Add missing language class to extension manager mock
...
PHPBB3-14938
2017-04-16 16:36:13 +02:00
Marc Alexander
473f8bc0a6
Merge branch '3.2.x'
2017-04-16 15:14:23 +02:00
Marc Alexander
1b63292cc3
Merge branch '3.1.x' into 3.2.x
2017-04-16 15:14:04 +02:00
Marc Alexander
1cbc6dedab
Merge pull request #4592 from javiexin/ticket/14938
...
[ticket/14938] Inconsistency in ext_mgr all_available vs is_available
2017-04-16 15:07:24 +02:00
Marc Alexander
c92c2aa2f4
Merge branch '3.2.x'
2017-04-16 11:42:53 +02:00
Marc Alexander
9d35258532
Merge branch '3.1.x' into 3.2.x
2017-04-16 11:42:31 +02:00
Marc Alexander
d44d1f115f
Merge pull request #4698 from javiexin/ticket/15087
...
[ticket/15087] Optimize creation of metadata objects by caching
2017-04-16 11:15:45 +02:00
Tristan Darricau
905e189c77
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15090] Ensure send stats module exists before removing
2017-04-16 10:22:01 +02:00
Tristan Darricau
3bddf02799
Merge pull request #4793 from marc1706/ticket/15090
...
[ticket/15090] Ensure send stats module exists before removing
* github.com:phpbb/phpbb:
[ticket/15090] Ensure send stats module exists before removing
2017-04-16 10:21:14 +02:00
Marc Alexander
82e1b8fd72
Merge pull request #4581 from javiexin/ticket/14919
...
[ticket/14919] Do not directly use globals in acp_extensions
2017-04-16 09:49:21 +02:00
Marc Alexander
58929bdccd
Merge branch '3.2.x'
2017-04-15 18:19:16 +02:00
Marc Alexander
269150ed40
Merge pull request #4612 from javiexin/ticket/14950
...
[ticket/14950] Add possibility to delete a template block
2017-04-15 18:18:32 +02:00
Marc Alexander
e7dfdbffb5
[ticket/15090] Ensure send stats module exists before removing
...
PHPBB3-15090
2017-04-15 12:06:03 +02:00
Marc Alexander
fba8595421
Merge branch '3.2.x'
2017-04-11 21:28:08 +02:00
Marc Alexander
24f9a41654
Merge branch '3.1.x' into 3.2.x
2017-04-11 21:27:38 +02:00
Marc Alexander
675b98c89f
Merge pull request #4790 from VSEphpbb/ticket/15142-merge32x
...
[ticket/15142] merge32x
2017-04-11 21:27:19 +02:00
Marc Alexander
f9a596c544
Merge pull request #4761 from VSEphpbb/ticket/15142
...
[ticket/15142] Check extension updates on current branch
2017-04-11 21:26:52 +02:00
Matt Friedman
6ce5ef53cb
[ticket/15142] Merge branch 'ticket/15142' into 32x
...
PHPBB3-15142
2017-04-10 15:51:22 -07:00
Marc Alexander
4a657d0732
Merge branch '3.2.x'
2017-04-09 14:11:10 +02:00
Marc Alexander
a26e8a1aa4
Merge branch '3.1.x' into 3.2.x
2017-04-09 14:10:49 +02:00
Marc Alexander
3bf133c96c
Merge pull request #4778 from marc1706/ticket/15139
...
[ticket/15139] Assigned 'topics_per_page' before template included
2017-04-09 14:09:07 +02:00
Matt Friedman
450402ea42
[ticket/15142] Remove duplicate code
...
PHPBB3-15142
2017-04-03 11:34:40 -07:00
Marc Alexander
08b55af93f
Merge pull request #4785 from hanakin/patch-3
...
[ticket/15160] correct path of node_modules
2017-04-02 10:40:07 +02:00
hanakin
bf5d0fc468
[ticket/15160] correct gitignore node_modules path
...
PHPBB3-15160
2017-03-31 17:36:02 -04:00
