29469 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
javiexin	fe79705e99	[ticket/14918] Simplify access to extension version metadata information ... PHPBB3-14918	2016-12-16 13:46:42 +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
Jakub Senko	7e2d544016	[ticket/14874] Increase size of emotion ... PHPBB3-14874	2016-12-12 19:44:41 +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
Tristan Darricau	27df2278ef	Merge pull request #4570 from Derky/ticket/14901 ... [ticket/14901] Remove notice for extension without version check * Derky/ticket/14901: [ticket/14901] Remove notice for extension without version check	2016-12-11 20:09:16 +01:00
Tristan Darricau	5374acd04c	Merge branch '3.2.x' ... * 3.2.x: [ticket/14906] Delete redundant sig key in user_cache_data array	2016-12-11 19:51:59 +01:00
Tristan Darricau	3ba8e7bda3	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14906] Delete redundant sig key in user_cache_data array	2016-12-11 19:51:56 +01:00
Tristan Darricau	ad3b7830b4	Merge pull request #4573 from rxu/ticket/14906 ... [ticket/14906] Delete redundant sig key in user_cache_data array * rxu/ticket/14906: [ticket/14906] Delete redundant sig key in user_cache_data array	2016-12-11 19:51:53 +01:00
Tristan Darricau	31dbdfe6b6	Merge branch '3.2.x' ... * 3.2.x: [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED	2016-12-11 19:49:40 +01:00
Tristan Darricau	bd6e5144dd	Merge pull request #4576 from Crizz0/ticket/14910 ... [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED * Crizz0/ticket/14910: [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED	2016-12-11 19:49:37 +01:00
Christian Schnegelberger	3a4f1bc061	[ticket/14877] Replaces "mono" with "monospace" to avoid bad behaviour ... PHPBB3-14877	2016-12-11 18:02:20 +01:00
Marc Alexander	e1b62c5f72	Merge branch '3.2.x'	2016-12-11 15:59:22 +01:00
Marc Alexander	dbd003a0d1	Merge branch '3.1.x' into 3.2.x	2016-12-11 15:59:08 +01:00
Marc Alexander	96adf7f0d6	Merge pull request #4514 from senky/ticket/14759 ... [ticket/14759] Add core.mcp_main_modify_shadow_sql event	2016-12-11 15:58:12 +01:00
Christian Schnegelberger	a0adf07453	[ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED ... PHPBB3-14910	2016-12-11 14:11:55 +01:00
Marc Alexander	ad4a61dcd5	Merge branch '3.2.x'	2016-12-10 23:02:14 +01:00
Marc Alexander	04e68c092b	Merge pull request #4574 from Crizz0/ticket/14908 ... [ticket/14908] Uses lang-variable instead of english text	2016-12-10 23:02:11 +01:00
Christian Schnegelberger	28296af248	[ticket/14909] Increases CSS specifity of .header-image to avoid underline ... PHPBB3-14909	2016-12-10 22:07:47 +01:00
Christian Schnegelberger	dfe42e9603	[ticket/14908] Uses lang-variable instead of english text ... PHPBB3-14908	2016-12-10 21:50:09 +01:00
rxu	7d5d5b0f06	[ticket/14906] Delete redundant sig key in user_cache_data array ... PHPBB3-14906	2016-12-11 00:52:32 +07:00
javiexin	daae2147c8	[ticket/14855] Update notification and PM alert bubbles ... Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). Fix tests better. PHPBB3-14855	2016-12-10 18:09:31 +01:00
Marc Alexander	5ac8059bad	Merge branch '3.2.x'	2016-12-10 13:38:05 +01:00
Marc Alexander	f7049bd0dc	Merge branch '3.1.x' into 3.2.x	2016-12-10 13:37:56 +01:00
Marc Alexander	c084990a68	Merge pull request #4513 from senky/ticket/14760 ... [ticket/14760] Add core.mcp_main_modify_fork_sql event	2016-12-10 13:37:52 +01:00