24139 Commits

Author	SHA1	Message	Date
Andreas Fischer	c2860cbabb	Merge branch '3.2.x' ... * 3.2.x: [ticket/14665] Remove invalid syntax in report_id_auto_increment migration	2016-07-10 20:06:48 +02:00
Andreas Fischer	c1cb59c237	Merge pull request #4349 from marc1706/ticket/14665 ... [ticket/14665] Remove invalid syntax in report_id_auto_increment migration * marc1706/ticket/14665: [ticket/14665] Remove invalid syntax in report_id_auto_increment migration	2016-07-10 20:06:43 +02:00
Marc Alexander	113738fce9	Merge branch '3.2.x'	2016-07-07 19:20:42 +02:00
Marc Alexander	45ba2e9770	Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php	2016-07-07 19:19:40 +02:00
Marc Alexander	55b854906d	Merge pull request #4342 from Senky/ticket/14654 ... [ticket/14654] Change Imagemagick to ImageMagick	2016-07-07 19:15:33 +02:00
Marc Alexander	cd45922186	Merge branch '3.2.x'	2016-07-06 19:30:26 +02:00
Marc Alexander	24b80d6bd7	Merge pull request #4375 from bantu/ticket/14692 ... [ticket/14692] Remove duplicate subexpression in questionnaire.php	2016-07-06 19:30:22 +02:00
Marc Alexander	fc8a7013d6	Merge branch '3.2.x'	2016-07-06 19:24:08 +02:00
Marc Alexander	bb83af0a0a	Merge branch '3.1.x' into 3.2.x	2016-07-06 19:24:02 +02:00
Marc Alexander	cddb884be6	Merge pull request #4354 from Stanzilla/smtp_explain ... [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option	2016-07-06 19:23:54 +02:00
Marc Alexander	983d9a629b	Merge branch '3.2.x'	2016-07-06 19:19:21 +02:00
Sumanai	95520d2ff2	[ticket/14671] Remove schema.json file ... PHPBB3-14671	2016-07-02 20:15:01 +04:00
kilida	8829772631	[ticket/14692] Remove duplicate subexpression in questionnaire.php ... Subexpression `($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')` was repeated. PHPBB3-14692	2016-07-02 10:35:27 +02:00
Tristan Darricau	fe9df5b76b	[Release 3.2.0-RC1] Restore versions in master ... This reverts commit 37cf178c0c.	2016-06-27 21:59:53 +02:00
Tristan Darricau	926d55bc02	Merge branch '3.2.x' ... * 3.2.x: [Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev	2016-06-27 21:58:43 +02:00
Tristan Darricau	37cf178c0c	[Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev	2016-06-27 21:58:31 +02:00
Tristan Darricau	f9d251943b	Merge branch '3.2.x' ... * 3.2.x: [prep-release-3.2.0-RC1] Update changelog [prep-release-3.2.0-RC1] Add migration [prep-release-3.2.0-RC1] Update schema.json [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1	2016-06-27 21:56:21 +02:00
Tristan Darricau	dbf02b4514	Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x ... * upstream/prep-release-3.2.0-RC1: [prep-release-3.2.0-RC1] Update changelog [prep-release-3.2.0-RC1] Add migration [prep-release-3.2.0-RC1] Update schema.json [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1	2016-06-27 21:54:41 +02:00
Marc Alexander	8bdbca3f52	Merge branch '3.2.x'	2016-06-26 10:27:26 +02:00
rxu	1a0e40489f	[ticket/14690] Create email queue cache file in the current env cache folder ... PHPBB3-14690	2016-06-23 01:20:45 +07:00
Marc Alexander	155d24107a	Merge branch '3.2.x' ... Conflicts: phpBB/composer.lock	2016-06-20 21:24:46 +02:00
Marc Alexander	597e7163c0	Merge pull request #4233 from VSEphpbb/ticket/14547 ... [ticket/14547] Add Vagrant support to phpBB	2016-06-20 21:22:34 +02:00
Máté Bartus	1dc622e921	Merge branch '3.2.x' ... * 3.2.x: [ticket/14660] Remove redundant empty line in ucp_profile.php	2016-06-20 10:14:18 +02:00
rxu	fa878f2818	[ticket/14660] Remove redundant empty line in ucp_profile.php ... PHPBB3-14660	2016-06-20 14:28:22 +07:00
Marc Alexander	871a97b4b3	Merge branch '3.2.x'	2016-06-19 22:33:37 +02:00
Marc Alexander	09c602425c	Merge pull request #4357 from rxu/ticket/14660 ... [ticket/14660] Fix parsing board email messages through template engine.	2016-06-19 22:33:29 +02:00
Marc Alexander	9e7f5e9d86	Merge branch '3.2.x'	2016-06-19 22:07:44 +02:00
Marc Alexander	219977ccf3	Merge branch '3.1.x' into 3.2.x	2016-06-19 22:07:42 +02:00
rxu	773a701d62	[ticket/14683] Fix typos in email templates. ... PHPBB3-14683	2016-06-20 00:15:37 +07:00
Marc Alexander	9639f6ad63	Merge pull request #4326 from Crizz0/ticket/14640 ... [ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2	2016-06-19 18:56:04 +02:00
Matt Friedman	d5e342db3a	[ticket/14547] Fix Docs and increase PHP memory limit ... PHPBB3-14547	2016-06-19 09:40:51 -07:00
Marc Alexander	9b748631ed	Merge branch '3.2.x'	2016-06-19 18:38:25 +02:00
Marc Alexander	cc628f06b2	Merge pull request #4356 from markshawtoronto/ticket/14680 ... [ticket/14680] Fix wrong function name being checked in mcp_queue.	2016-06-19 18:38:23 +02:00
Marc Alexander	f8978f23a6	Merge branch '3.2.x'	2016-06-19 18:25:37 +02:00
Marc Alexander	a460aec68c	Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/language/en/install.php	2016-06-19 18:25:16 +02:00
Marc Alexander	c60dbede3e	Merge pull request #4281 from rmcgirr83/ticket_13716 ... [ticket/13716] Check phpBB version against config version	2016-06-19 18:17:33 +02:00
rxu	abe93918b4	[ticket/14660] Fix typos in email templates. ... PHPBB3-14660	2016-06-19 23:08:06 +07:00
Marc Alexander	a6863249a1	Merge branch '3.2.x'	2016-06-19 18:07:55 +02:00
Marc Alexander	450e5b36b8	Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html phpBB/styles/subsilver2/template/mcp_forum.html phpBB/styles/subsilver2/template/search_results.html phpBB/styles/subsilver2/template/viewforum_body.html	2016-06-19 18:07:29 +02:00
Marc Alexander	aaa99b4719	Merge pull request #4351 from rmcgirr83/ticket_14672 ... [ticket/14672] Add template event after topic title	2016-06-19 18:04:22 +02:00
Tristan Darricau	e8c6a3aa0a	[prep-release-3.2.0-RC1] Update changelog	2016-06-19 18:01:48 +02:00
Marc Alexander	2a0c4a8fa9	Merge branch '3.2.x'	2016-06-19 17:55:37 +02:00
Marc Alexander	70b04016eb	Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/includes/ucp/ucp_profile.php	2016-06-19 17:54:55 +02:00
Marc Alexander	804236bce4	Merge pull request #4331 from Senky/ticket/13978 ... [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary	2016-06-19 17:53:23 +02:00
Tristan Darricau	7cbb049572	[prep-release-3.2.0-RC1] Add migration	2016-06-19 17:51:51 +02:00
Tristan Darricau	6145f46bd1	[prep-release-3.2.0-RC1] Update schema.json	2016-06-19 17:51:51 +02:00
Tristan Darricau	2eb8a97f47	[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1	2016-06-19 17:51:51 +02:00
Marc Alexander	74f36bc1c9	Merge branch '3.2.x'	2016-06-19 17:49:10 +02:00
Marc Alexander	63d3b240a4	Merge branch '3.1.x' into 3.2.x	2016-06-19 17:49:07 +02:00
Marc Alexander	cf8c13b04c	Merge pull request #4329 from Senky/ticket/14429 ... [ticket/14429] Add core.obtain_users_online_string_before_modify	2016-06-19 17:49:01 +02:00