30641 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Joas Schilling	05851e2b4b	Merge branch '3.1.x' ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg	2015-08-23 18:27:30 +02:00
Joas Schilling	335452b1c1	[3.1.x] Update version to 3.1.7-dev	2015-08-23 18:24:12 +02:00
Joas Schilling	4be255ef9f	Merge branch 'prep-release-3.1.6' into 3.1.x	2015-08-23 18:22:33 +02:00
Joas Schilling	5be06ec66a	[prep-release-3.1.6] Add changelog for 3.1.6-RC1	2015-08-23 17:20:22 +02:00
Joas Schilling	623a8f2d0f	[prep-release-3.1.6] Add migration for 3.1.6-RC1	2015-08-23 16:54:43 +02:00
Joas Schilling	819eca99a8	[prep-release-3.1.6] Update version to 3.1.6-RC1	2015-08-23 16:50:43 +02:00
Joas Schilling	eb53e51e36	Merge branch '3.1.x'	2015-08-23 16:33:11 +02:00
Joas Schilling	96fe2666f7	Merge pull request #3854 from Nicofuma/ticket/14099-master ... [ticket/14099] Update twig/twig to 1.20.0 - master version	2015-08-23 16:33:04 +02:00
Joas Schilling	a7272fec97	Merge pull request #3829 from Nicofuma/ticket/14099 ... [ticket/14099] Update Twig to 1.20.0	2015-08-23 16:30:26 +02:00
Tristan Darricau	e0be660e16	Merge branch '3.1.x' ... * 3.1.x: [ticket/14099] Fix the assets [ticket/14099] Make composer.phar executable again [ticket/14099] Fix tests [ticket/14099] Update twig/twig to 1.20.0 [ticket/14099] Update composer.phar	2015-08-23 15:21:40 +02:00
Zoddo	0caaf86158	[ticket/14089] Add posting_topic_title_after template event ... Allows to add some information after the topic title in the posting form PHPBB3-14089	2015-08-23 14:12:44 +02:00
Marc Alexander	c96c6877bf	Merge branch '3.1.x' ... Conflicts: phpBB/includes/ucp/ucp_activate.php	2015-08-22 10:41:46 +02:00
Marc Alexander	f585f48aca	Merge pull request #3823 from lavigor/ticket/14087 ... [ticket/14087] Add an event to ucp_activate.php.	2015-08-22 10:40:33 +02:00
Marc Alexander	f2edec90b0	Merge branch '3.1.x'	2015-08-22 10:37:53 +02:00
Marc Alexander	d8dd6bad6b	Merge pull request #3834 from brunoais/ticket/14104 ... [ticket/14104] Fix missing variables from previous commit	2015-08-22 10:37:48 +02:00
Marc Alexander	eb168913d9	Merge branch '3.1.x'	2015-08-22 10:36:15 +02:00
Marc Alexander	f2a0fe39a5	Merge pull request #3831 from rxu/ticket/14101 ... [ticket/14101] Add core event to the download/file.php	2015-08-22 10:36:09 +02:00
Marc Alexander	fdca5532e6	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html	2015-08-22 10:32:41 +02:00
Marc Alexander	b09e1ad26d	Merge pull request #3852 from marc1706/ticket/14068 ... [ticket/14068] Add template events before and after poll panel in viewtopic	2015-08-22 10:32:09 +02:00
Marc Alexander	1cc3d24cd8	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html	2015-08-22 09:09:08 +02:00
Marc Alexander	583068da9d	Merge pull request #3771 from Zoddo/ticket/14025 ... [ticket/14091] Add mcp_topic_subject_* template events Conflicts: phpBB/docs/events.md	2015-08-22 09:08:11 +02:00
javiexin	f153342fb3	[ticket/14075] Add template event after poll preview panel ... PHPBB3-14075	2015-08-22 08:57:26 +02:00
Marc Alexander	1a9bc8a7ad	Merge branch '3.1.x' ... Conflicts: phpBB/includes/message_parser.php	2015-08-22 08:51:09 +02:00
Marc Alexander	2d24b9b61f	Merge pull request #3813 from rxu/ticket/14072 ... [ticket/14072] Add core event to the function format_display()	2015-08-22 08:49:21 +02:00
javiexin	04b0ba9f6d	[ticket/14068] Add template events before and after poll panel ... In viewtopic. PHPBB3-14068	2015-08-22 08:28:33 +02:00
Marc Alexander	6cdb61e68c	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_pm_history.html	2015-08-22 08:18:21 +02:00
Marc Alexander	ccd1e1eebb	Merge pull request #3803 from rxu/ticket/14064 ... [ticket/14064] Add template events to ucp_pm_history.html	2015-08-22 08:17:50 +02:00
Marc Alexander	c8db7ae7c4	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/overall_header.html	2015-08-22 08:14:18 +02:00
Marc Alexander	a959e5f4cc	Merge pull request #3806 from rxu/ticket/14067 ... [ticket/14067] Add template events to overall_header.html around feeds	2015-08-22 08:13:39 +02:00
Marc Alexander	d30b5207b8	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/attachment.html	2015-08-22 08:11:15 +02:00
Marc Alexander	697ccd41c4	Merge pull request #3804 from rxu/ticket/14065 ... [ticket/14065] Add template events to attachment.html	2015-08-22 08:10:27 +02:00
Mate Bartus	dd1b777ca7	[ticket/14097] Remove auto refresh on install failure ... PHPBB3-14097	2015-08-21 18:03:36 +02:00
Tristan Darricau	b802732167	Merge branch 'ticket/14099' into 3.1.x ... * ticket/14099: [ticket/14099] Fix the assets [ticket/14099] Make composer.phar executable again [ticket/14099] Fix tests [ticket/14099] Update twig/twig to 1.20.0 [ticket/14099] Update composer.phar	2015-08-21 09:34:26 +02:00
Marc Alexander	942705e6c6	Merge branch '3.1.x'	2015-08-20 15:48:18 +02:00
Marc Alexander	6c98b01ad1	Merge pull request #3849 from marc1706/ticket/14037 ... [ticket/14037] Allows adapting memberlist profile fields headline	2015-08-20 15:48:12 +02:00
Marc Alexander	648389af6f	Merge branch '3.1.x' ... Conflicts: phpBB/docs/events.md phpBB/styles/subsilver2/template/mcp_forum.html	2015-08-20 10:23:56 +02:00
Marc Alexander	ffe72e500c	Merge pull request #3797 from RMcGirr83/ticket/13863 ... [ticket/13863] Add topic_row_append/prepend to mcp_forum.html	2015-08-20 10:22:42 +02:00
Marc Alexander	7cdaa03e20	Merge branch '3.1.x'	2015-08-20 10:17:50 +02:00
Marc Alexander	6f1d848087	Merge pull request #3783 from Zoddo/ticket/14041 ... [ticket/14041] Add viewtopic_dropdown_*_custom template event	2015-08-20 10:17:45 +02:00
Marc Alexander	897b9f333b	[ticket/14037] Minor coding style improvements to event ... PHPBB3-14037	2015-08-20 10:14:07 +02:00
javiexin	cf0170d5e3	[ticket/14037] Allows adapting memberlist profile fields headline ... Adds an event to allow modifying the profile fields headline in line with modifications to profile fields data. PHPBB3-14037	2015-08-20 10:12:59 +02:00
Marc Alexander	5ae821ee28	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html	2015-08-20 10:08:47 +02:00
Marc Alexander	00aab15f7c	Merge pull request #3769 from Zoddo/ticket/14023 ... [ticket/14090] Add mcp_topic_topic_title_* template events	2015-08-20 10:08:06 +02:00
Marc Alexander	aaa13be1ec	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/breadcrumbs.html	2015-08-20 08:56:45 +02:00
Marc Alexander	11a0516739	Merge pull request #3846 from rxu/ticket/14115 ... [ticket/14115] Fix breadcrumbs microdata to make it valid	2015-08-20 08:51:42 +02:00
Andreas Fischer	0a5f7d2e51	Merge branch '3.1.x' ... * 3.1.x: [ticket/14116] sql_affectedrows method has no arguments	2015-08-20 03:52:34 +02:00
Andreas Fischer	ef3de412b7	Merge pull request #3848 from VSEphpbb/ticket/14116 ... [ticket/14116] sql_affectedrows method has no arguments * VSEphpbb/ticket/14116: [ticket/14116] sql_affectedrows method has no arguments	2015-08-20 03:52:34 +02:00
Michael Miday	53ef8815b1	[ticket/12719] Fix hamburger menu icon	2015-08-20 02:36:16 +02:00
Michael Miday	6105f98219	[ticket/12719] Fix pagination	2015-08-20 02:36:16 +02:00
Michael Miday	922f631a46	[ticket/12719] Fix Buttons	2015-08-20 02:36:15 +02:00