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
upstrocker
f991a99a14
[ticket/15139] Assigned 'topics_per_page' before template included
...
The element $config['topics_per_page'] was assigned a value after the
template was included, which led to incorrect page number display in the
header when pagination.
Now this var is assigned the correct value before the template is included
PHPBB3-15139
2017-03-28 20:41:38 +02:00
Marc Alexander
798dda2cbc
Merge branch '3.2.x'
2017-03-28 19:42:59 +02:00
Marc Alexander
33a050ade9
Merge pull request #4775 from hanakin/ticket/15157
...
[ticket/15157] Add proper google font call
2017-03-28 19:42:55 +02:00
hanakin
b30e775bf1
[ticket/15157] simple header
...
PHPBB3-15157
2017-03-28 10:55:54 -04:00
hanakin
64b863728b
[ticket/15157] Add proper google font call
...
PHPBB3-15157
2017-03-28 09:56:41 -04:00
Marc Alexander
c95a4820b5
Merge pull request #4772 from VSEphpbb/ticket/15153
...
[ticket/15153] Update to newer homestead for vagrant
2017-03-27 08:14:09 +02:00
Matt Friedman
c6321fc61b
[ticket/15153] Update to newer homestead for vagrant
...
PHPBB3-15153
2017-03-26 16:31:59 -07:00
Marc Alexander
835d8f429d
Merge pull request #4727 from hanakin/ticket/15116
...
[ticket/15116] Fix admin errors
2017-03-26 22:39:45 +02:00
Marc Alexander
e2a746c644
Merge branch '3.2.x'
2017-03-26 17:12:43 +02:00
Marc Alexander
ecef296bee
Merge pull request #4530 from senky/ticket/14557
...
[ticket/14557] Simplify updating overloaded events for extensions
2017-03-26 17:12:39 +02:00
hanakin
75e4b235b4
[ticket/15116] turn on adm tests
...
PHPBB3-15116
2017-03-25 17:41:05 -04:00
hanakin
6dc1bdc1ca
[ticket/15116] fix new errors after rc update
...
PHPBB3-15116
2017-03-25 17:40:15 -04:00
hanakin
f0e07ceb90
[ticket/15116] Fix admin errors
...
PHPBB3-15116
2017-03-25 17:37:58 -04:00
Marc Alexander
f36d5691c8
Merge pull request #4726 from hanakin/ticket/15115
...
[ticket/15115] Update CSS error checking Stylelintrc file
2017-03-25 16:48:05 +01:00
Michael Miday
84fdd1a5d4
[ticket/15115] Fix typo
...
PHPBB3-15115
2017-03-25 16:47:51 +01:00
Marc Alexander
f23ff335c7
Merge branch '3.2.x'
2017-03-25 16:37:37 +01:00
