28869 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marc Alexander	1c567daf39	Merge branch '3.1.x' into 3.2.x	2016-12-01 11:41:21 +01:00
Marc Alexander	365489a317	Merge pull request #4548 from nicebb/ticket/13757 ... [ticket/13757] Prevents the count of unread PMs from being negative	2016-12-01 11:41:17 +01:00
Victor A. Safronov	10753454bf	[ticket/13757] Prevents the count of unread PMs from being negative ... Sometimes the user_unread_privmsg flag in users table can become negative. It happens when the unread message is requested by simultaneous concurrent requests. Both requests will decrement the value of the flag. This commit prevents updating the flag if the message already marked as read. PHPBB3-13757	2016-11-30 23:59:36 +04:00
Marc Alexander	d894472866	Merge branch '3.1.x' into 3.2.x	2016-11-27 20:49:22 +01:00
Marc Alexander	a3faf1fefc	Merge pull request #4503 from rxu/ticket/14853 ... [ticket/14853] Add core event to allow modifying PM attachments download auth	2016-11-27 20:49:19 +01:00
Marc Alexander	0e8a573a71	Merge branch '3.1.x' into 3.2.x	2016-11-27 20:45:12 +01:00
Marc Alexander	642bfe9a39	Merge pull request #4512 from senky/ticket/14863 ... [ticket/14863] Properly treat plural rules in confirmation box title	2016-11-27 20:45:08 +01:00
Marc Alexander	9432662c37	Merge branch '3.1.x' into 3.2.x	2016-11-26 16:41:31 +01:00
Marc Alexander	997bdc7778	Merge pull request #4540 from nicebb/ticket/14876 ... [ticket/14876] Allows multibyte strings for exception messages	2016-11-26 16:41:27 +01:00
Victor A. Safronov	390a37492d	[ticket/14876] Allows multibyte strings for exception messages ... All exception messages are sanitized via type_caster::set_var() which is called with $multibyte = false. This commit allows to pass multibyte messages as well. PHPBB3-14876	2016-11-25 19:56:41 +04:00
Tristan Darricau	145ba85d98	Merge pull request #4516 from marc1706/ticket/14867 ... [ticket/14867] Revert back to twig 1.26.* and update dependencies * marc1706/ticket/14867: [ticket/14867] Revert back to twig 1.26.* and update dependencies	2016-11-24 14:18:41 +01:00
Tristan Darricau	3e1f9c4201	Merge pull request #4508 from marc1706/ticket/9211 ... [ticket/9211] Use different icon for link subforum in forum legend * marc1706/ticket/9211: [ticket/9211] Use different icon for link subforum in forum legend	2016-11-24 14:16:37 +01:00
Tristan Darricau	592ef2eff4	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14750] Remove html5 invalid attributes from attachment file input	2016-11-24 14:15:12 +01:00
Tristan Darricau	16620ea3d2	Merge pull request #4483 from marc1706/ticket/14750 ... [ticket/14750] Remove html5 invalid attributes from attachment file input * marc1706/ticket/14750: [ticket/14750] Remove html5 invalid attributes from attachment file input	2016-11-24 14:12:13 +01:00
Marc Alexander	453d9113f1	Merge branch '3.1.x' into 3.2.x	2016-11-20 15:23:20 +01:00
Marc Alexander	dbd9c1f242	Merge pull request #4502 from rxu/ticket/14852 ... [ticket/14852] Add core event to modify email headers	2016-11-20 15:23:16 +01:00
Marc Alexander	c3108d44ce	Merge branch '3.1.x' into 3.2.x	2016-11-20 13:18:31 +01:00
Marc Alexander	d98fd7868b	Merge pull request #4511 from senky/ticket/14842 ... [ticket/14842] Don't display filesize limit if there is none	2016-11-20 13:18:27 +01:00
Marc Alexander	20771271ca	Merge branch '3.1.x' into 3.2.x	2016-11-20 12:57:31 +01:00
Marc Alexander	6d58c4a4b5	Merge branch 'ticket/14850' into 3.1.x	2016-11-20 12:57:17 +01:00
Jmz	0d15a95f97	[ticket/14850] Add core.generate_smilies_before ... Allows changing root_path of smilies to use CDN for example PHPBB3-14850	2016-11-20 12:56:12 +01:00
Jmz	6bbc18fa40	[ticket/14850] Add core.smiley_text_root_path ... Allows changing root_path of smilies to use CDN for example PHPBB3-14850	2016-11-20 12:56:11 +01:00
Marc Alexander	8f19d16b2a	Merge branch '3.1.x' into 3.2.x	2016-11-20 09:46:32 +01:00
Marc Alexander	16c3b40b4e	Merge pull request #4519 from michaelcullum/ticket/14872 ... [ticket/14872] Remove sizeof/count restriction	2016-11-20 09:46:27 +01:00
Michael Cullum	ad4889be4b	[ticket/14872] Remove sizeof/count restriction ... PHPBB3-14872	2016-11-19 22:11:09 -05: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	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	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	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	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	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	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	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	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	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