Marc Alexander
82960414f7
Merge branch '3.2.x'
2016-11-17 09:56:59 +01:00
Marc Alexander
9343317121
Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x
2016-11-17 09:56:51 +01:00
Marc Alexander
32667f6290
Merge branch '3.2.x'
2016-11-16 21:57:49 +01:00
Marc Alexander
c6bed98cf5
Merge branch '3.1.x' into 3.2.x
2016-11-16 21:57:10 +01:00
Marc Alexander
34ebbbc7c3
Merge pull request #4497 from senky/ticket/14849
...
[ticket/14849] Add core.acp_extensions_run_action
2016-11-16 21:56:15 +01:00
Marc Alexander
d5a6ae7290
Merge branch '3.2.x'
2016-11-16 21:53:33 +01:00
Marc Alexander
4844370c26
Merge branch '3.1.x' into 3.2.x
2016-11-16 21:53:30 +01:00
Marc Alexander
1ff01d722a
Merge pull request #4510 from senky/ticket/14864
...
[ticket/14864] Set maxlength=64 to dateformat in ACP
2016-11-16 21:53:27 +01:00
Marc Alexander
5a82061c3a
[ticket/9211] Use different icon for link subforum in forum legend
...
PHPBB3-9211
2016-11-16 21:51:58 +01:00
Marc Alexander
a96fc3d87f
[ticket/14867] Revert back to twig 1.26.* and update dependencies
...
The revert of twig back to 1.26.* is necessary due to a breaking
change in the way the Filesystem loader returns the paths to
template files.
PHPBB3-14867
2016-11-16 21:39:29 +01:00
Jakub Senko
e974f338af
[ticket/14739] Remove SQLite 2.8.x database driver
...
PHPBB3-14739
2016-11-16 17:59:28 +01:00
Jakub Senko
ba5243ba76
[ticket/14842] Don't display filesize limit if there is none
...
PHPBB3-14842
2016-11-15 14:22:42 +01:00
Tristan Darricau
462fb7b296
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14716] Update dependencies to latest versions
2016-11-14 21:36:34 +01:00
Tristan Darricau
da428b1fd3
Merge pull request #4501 from marc1706/ticket/14716
...
[ticket/14716] Update dependencies to latest versions
* marc1706/ticket/14716:
[ticket/14716] Update dependencies to latest versions
2016-11-14 21:23:58 +01:00
Tristan Darricau
361ec09956
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14831] Rename migration and replace preg_replace() with simpler methods
[ticket/14831] Compare depends_on for migrations and remove prefixless names
[ticket/14831] Add migration for deduplicating entries and fix typo
[ticket/14831] Add method for getting valid migration name
[ticket/14831] Fall back to possible migration names instead of adding prefix
[ticket/14831] Make sure migrations always start with backslash
2016-11-14 21:22:16 +01:00
Tristan Darricau
edaa36205f
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14831] Rename migration and replace preg_replace() with simpler methods
[ticket/14831] Compare depends_on for migrations and remove prefixless names
[ticket/14831] Add migration for deduplicating entries and fix typo
[ticket/14831] Add method for getting valid migration name
[ticket/14831] Fall back to possible migration names instead of adding prefix
[ticket/14831] Make sure migrations always start with backslash
2016-11-14 21:22:14 +01:00
Tristan Darricau
8323de331e
Merge pull request #4492 from marc1706/ticket/14831
...
[ticket/14831] Make sure migrations always start with backslash
* marc1706/ticket/14831:
[ticket/14831] Rename migration and replace preg_replace() with simpler methods
[ticket/14831] Compare depends_on for migrations and remove prefixless names
[ticket/14831] Add migration for deduplicating entries and fix typo
[ticket/14831] Add method for getting valid migration name
[ticket/14831] Fall back to possible migration names instead of adding prefix
[ticket/14831] Make sure migrations always start with backslash
2016-11-14 21:22:11 +01:00
Jakub Senko
b80b624551
[ticket/14849] Add core.acp_extensions_run_action
...
PHPBB3-14849
2016-11-13 22:34:28 +01:00
Marc Alexander
3bde3cf45a
Merge branch '3.2.x'
2016-11-13 21:29:38 +01:00
Marc Alexander
8a3147faf8
Merge branch '3.1.x' into 3.2.x
2016-11-13 21:29:14 +01:00
Marc Alexander
6e6a2c5df8
Merge pull request #4488 from senky/ticket/14825
...
Add core.auth_oauth_login_after and core.auth_oauth_link_after
2016-11-13 21:27:51 +01:00
Jakub Senko
df0388ccc5
[ticket/14825] Add core.auth_oauth_(login/link)_after
...
PHPBB3-14825
2016-11-13 18:19:21 +01:00
Jakub Senko
114cfe2c27
[ticket/14760] Add core.mcp_main_modify_fork_sql event
...
PHPBB3-14760
2016-11-13 18:15:07 +01:00
Jakub Senko
36d4169768
[ticket/14759] Add core.mcp_main_modify_shadow_sql event
...
PHPBB3-14759
2016-11-13 17:48:53 +01:00
Jakub Senko
260dc5ed7c
[ticket/14863] Properly treat plural rules in confirmation box title
...
PHPBB3-14863
2016-11-13 17:21:41 +01:00
Jakub Senko
f8fb3e0f9f
[ticket/14864] Set maxlength=64 to dateformat in ACP
...
PHPBB3-14864
2016-11-13 15:12:23 +01:00
Marc Alexander
fa9182c133
Merge branch '3.2.x'
2016-11-12 19:41:20 +01:00
Marc Alexander
9c7e8c2dc5
Merge branch '3.1.x' into 3.2.x
2016-11-12 19:41:10 +01:00
Marc Alexander
372324cead
Merge pull request #4504 from VSEphpbb/ticket/14855
...
[ticket/14855] Update notification and PM alert bubbles
2016-11-12 19:30:34 +01:00
Marc Alexander
ccf06c25a5
Merge branch '3.2.x'
2016-11-12 19:27:12 +01:00
Marc Alexander
2319748c08
Merge branch '3.1.x' into 3.2.x
2016-11-12 19:27:09 +01:00
Marc Alexander
39f5b82bc3
Merge pull request #4505 from JimMH/patch-1
...
[ticket/14859] Send notifications for PM reports to all users with correct permissions
2016-11-12 19:27:06 +01:00
Matt Friedman
55f7438187
[ticket/14855] Bump font size to 10px
...
PHPBB3-14855
2016-11-12 09:32:57 -08:00
Marc Alexander
221a8beb07
Merge branch '3.2.x'
2016-11-12 17:14:42 +01:00
Marc Alexander
4a1e5df654
Merge branch '3.1.x' into 3.2.x
2016-11-12 17:14:39 +01:00
Marc Alexander
c77798b1a3
Merge pull request #4496 from senky/ticket/14848
...
[ticket/14848] Add acp_ext_list_disabled/enabled_title_after
2016-11-12 17:14:35 +01:00
Marc Alexander
5451c7fea9
Merge branch '3.2.x'
2016-11-12 17:10:39 +01:00
Marc Alexander
ef77852aff
Merge branch '3.1.x' into 3.2.x
2016-11-12 17:10:14 +01:00
Marc Alexander
221cd3eb68
Merge pull request #4495 from senky/ticket/14847
...
[ticket/14847] Add core.acp_attachments_config_edit_add
2016-11-12 17:08:28 +01:00
Marc Alexander
90cd9fc18f
Merge branch '3.2.x'
2016-11-12 16:17:34 +01:00
Marc Alexander
728335820c
Merge branch '3.1.x' into 3.2.x
2016-11-12 16:17:31 +01:00
Marc Alexander
bc4c82bae5
Merge pull request #4481 from senky/ticket/14819
...
[ticket/14819] Hide soft-deleted posts in topic review
2016-11-12 16:17:27 +01:00
Marc Alexander
577fb0c39c
Merge branch '3.2.x'
2016-11-12 13:55:53 +01:00
Marc Alexander
78db28286e
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:54:59 +01:00
Marc Alexander
577d669ba7
Merge pull request #4472 from dsinn/ticket/14804
...
[ticket/14804] Add core event to MCP after merging topics
2016-11-12 13:53:24 +01:00
Marc Alexander
0759b591fb
Merge branch '3.2.x'
2016-11-12 13:47:46 +01:00
Marc Alexander
dd561ec275
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:47:42 +01:00
Marc Alexander
a298ed1a66
Merge pull request #4507 from nickvergessen/ticket-14788
...
[ticket/14788] Farewell my friendz
2016-11-12 13:47:39 +01:00
Marc Alexander
6b6b740dcb
Merge branch '3.2.x'
2016-11-12 13:44:36 +01:00
Marc Alexander
8d3d396f1b
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:44:32 +01:00
