Marc Alexander
1ccc214afb
Merge branch '3.2.x'
2016-12-18 19:34:19 +01:00
Marc Alexander
fd19ef7598
Merge pull request #4585 from VSEphpbb/ticket/14925
...
[ticket/14925] Set reparser names in service definitions
2016-12-18 19:33:42 +01:00
Máté Bartus
afd511674e
Merge branch '3.2.x'
2016-12-18 19:09:12 +01:00
Máté Bartus
f84c3687cc
Merge branch '3.1.x' into 3.2.x
2016-12-18 19:08:26 +01:00
Máté Bartus
aa6c2fae5c
Merge pull request #4587 from marc1706/ticket/14922
...
[ticket/14922] Make sure to pass hidden input on ajax form submissions
2016-12-18 19:06:56 +01:00
Matt Friedman
76e9f4dd2d
[ticket/14925] Prefix modes from reparser with text_reparser
...
PHPBB3-14925
2016-12-18 09:12:26 -08:00
Marc Alexander
a56d25b437
Merge branch '3.2.x'
2016-12-18 16:23:04 +01:00
Marc Alexander
909aef0ed3
Merge branch '3.1.x' into 3.2.x
2016-12-18 16:22:59 +01:00
Marc Alexander
0e68c35cfd
Merge pull request #4577 from Crizz0/ticket/14877
...
[ticket/14877] Replaces "mono" with "monospace" to avoid bad behaviour
2016-12-18 16:22:54 +01:00
Marc Alexander
33f8ace91c
Merge branch '3.2.x'
2016-12-18 15:46:57 +01:00
Marc Alexander
7ec24ec0f6
Merge pull request #4575 from Crizz0/ticket/14909
...
[ticket/14909] Increases CSS specifity of .header-image to avoid unde…
2016-12-18 15:46:52 +01:00
Marc Alexander
573507e6a5
[ticket/14922] Make sure to pass hidden input on ajax form submissions
...
PHPBB3-14922
2016-12-18 15:18:52 +01:00
Marc Alexander
3848c7e8e6
Merge branch '3.2.x'
2016-12-18 10:44:21 +01:00
Marc Alexander
a73c7398f3
Merge pull request #4583 from marc1706/ticket/14921
...
[ticket/14921] Use phpbb.com URL to prevent test failures for remote URLs
2016-12-18 10:44:14 +01:00
Matt Friedman
b4748a5d1e
[ticket/14925] Set reparser names in service definitions
...
PHPBB3-14925
2016-12-18 01:28:51 -08:00
Marc Alexander
84d7371167
Merge branch '3.2.x'
2016-12-17 23:39:09 +01:00
Marc Alexander
5ecd9fb775
Merge branch '3.1.x' into 3.2.x
2016-12-17 23:39:03 +01:00
Marc Alexander
b6ea338309
Merge pull request #4529 from senky/ticket/14520
...
[ticket/14520] Add ucp_pm_viewmessage_options_before
2016-12-17 23:38:56 +01:00
Marc Alexander
de6942e117
[ticket/14921] Use phpbb.com URL to prevent test failures for remote URLs
...
PHPBB3-14921
2016-12-17 23:29:19 +01:00
Marc Alexander
20752848ff
Merge branch '3.2.x'
2016-12-17 16:41:59 +01:00
Marc Alexander
544c7c4e08
Merge branch '3.1.x' into 3.2.x
2016-12-17 16:41:38 +01:00
Marc Alexander
fadec0d2b9
Merge pull request #4527 from senky/ticket/14390
...
[ticket/14390] Add ucp_main_front_user_activity_append/prepend
2016-12-17 16:40:17 +01:00
Marc Alexander
36c6c1fa55
Merge branch '3.2.x'
2016-12-17 16:27:07 +01:00
Marc Alexander
b1e4b232b9
Merge branch '3.1.x' into 3.2.x
2016-12-17 16:26:44 +01:00
Marc Alexander
3c223b3a5d
Merge pull request #4526 from senky/ticket/14239
...
[ticket/14239] Add core.ucp_remind_modify_select_sql
2016-12-17 16:20:29 +01:00
Marc Alexander
2ddaf5dc2d
Merge branch '3.2.x'
2016-12-17 15:58:19 +01:00
Marc Alexander
63f222ca90
Merge branch '3.1.x' into 3.2.x
2016-12-17 15:57:51 +01:00
Marc Alexander
daee389e53
Merge pull request #4518 from senky/ticket/14870
...
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
2016-12-17 15:55:24 +01:00
Jakub Senko
90b7d1fbda
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
...
PHPBB3-14870
2016-12-16 12:23:21 +01:00
Jakub Senko
df96351244
[ticket/14239] Add core.ucp_remind_modify_select_sql
...
PHPBB3-14239
2016-12-13 11:26:45 +01:00
Marc Alexander
5dc31fd03d
Merge branch '3.2.x'
2016-12-12 22:09:40 +01:00
Marc Alexander
37eb22a61d
Merge branch '3.1.x' into 3.2.x
2016-12-12 22:09:21 +01:00
Marc Alexander
5235e6de53
Merge pull request #4520 from senky/ticket/14868
...
[ticket/14868] Add mcp_forum_actions_options template event
2016-12-12 22:07:59 +01:00
Tristan Darricau
d1959cb731
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14887] ACP profile step one lang specific event
2016-12-11 20:43:42 +01:00
Tristan Darricau
b7597a347b
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14887] ACP profile step one lang specific event
2016-12-11 20:43:39 +01:00
Tristan Darricau
8eda17f430
Merge pull request #4567 from javiexin/ticket/14887
...
[ticket/14887] ACP profile step one lang specific event
* javiexin/ticket/14887:
[ticket/14887] ACP profile step one lang specific event
2016-12-11 20:43:37 +01:00
Tristan Darricau
41f4de72f5
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14889] Missing method in profile fields type interface
2016-12-11 20:41:45 +01:00
Tristan Darricau
809d73ca5e
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14889] Missing method in profile fields type interface
2016-12-11 20:41:42 +01:00
Tristan Darricau
230e737790
Merge pull request #4558 from javiexin/ticket/14889
...
[ticket/14889] Missing method in profile fields type interface
* javiexin/ticket/14889:
[ticket/14889] Missing method in profile fields type interface
2016-12-11 20:41:39 +01:00
Tristan Darricau
84d6f2fafb
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14893] Fix undefined variable on reporting PM notification
2016-12-11 20:28:26 +01:00
Tristan Darricau
7d7aa9d119
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14893] Fix undefined variable on reporting PM notification
2016-12-11 20:28:24 +01:00
Tristan Darricau
08d169c109
Merge pull request #4561 from rxu/ticket/14893
...
[ticket/14893] Fix undefined variable on reporting PM notification
* rxu/ticket/14893:
[ticket/14893] Fix undefined variable on reporting PM notification
2016-12-11 20:28:21 +01:00
Tristan Darricau
9744352053
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14893] Fix undefined variable on reporting PM notification
2016-12-11 20:26:45 +01:00
Tristan Darricau
3ed1104467
Merge pull request #4562 from rxu/ticket/14893-3.2.x
...
[ticket/14893] Fix undefined variable on reporting PM notification
* rxu/ticket/14893-3.2.x:
[ticket/14893] Fix undefined variable on reporting PM notification
2016-12-11 20:26:43 +01:00
Tristan Darricau
58734f960d
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14895] Fix broken tests
[ticket/14895] Fix issues in CLI classes
[ticket/14895] Use SymfonyStyle in all CLI
[ticket/14895] Use SymfonyIO styling
[ticket/14895] CLI reparser:list should display proper list
2016-12-11 20:25:12 +01:00
Tristan Darricau
8c9d6add2e
Merge pull request #4564 from VSEphpbb/ticket/14895
...
[ticket/14895] CLI should use SymfonyStyle
* VSEphpbb/ticket/14895:
[ticket/14895] Fix broken tests
[ticket/14895] Fix issues in CLI classes
[ticket/14895] Use SymfonyStyle in all CLI
[ticket/14895] Use SymfonyIO styling
[ticket/14895] CLI reparser:list should display proper list
2016-12-11 20:25:09 +01:00
Tristan Darricau
37f786b3b7
erge branch '3.2.x'
...
* 3.2.x:
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
2016-12-11 20:16:35 +01:00
Tristan Darricau
0cf85c047e
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
2016-12-11 20:16:25 +01:00
Tristan Darricau
e40afd8cd1
Merge pull request #4572 from javiexin/ticket/14855
...
[ticket/14855] Update notification and PM alert bubbles
* javiexin/ticket/14855:
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
2016-12-11 20:11:17 +01:00
Tristan Darricau
cb3dd0bce5
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14901] Remove notice for extension without version check
2016-12-11 20:09:18 +01:00