30854 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Alexander	052b55624b	Merge pull request #4626 from hanakin/ticket/14976 ... [ticket/14976] Convert all ems to px	2017-10-15 10:06:39 +02:00
Marc Alexander	c3939580b3	Merge branch '3.2.x'	2017-10-13 19:39:46 +02:00
Marc Alexander	e1966c3476	Merge pull request #4888 from javiexin/ticket/15306 ... [ticket/15306] Error and missing data in core.acp_users_profile_validate	2017-10-13 19:39:42 +02:00
Michael Miday	b7c3318541	[ticket/14976] fix error ... PHPBB3-14976	2017-10-13 00:16:48 -04:00
Michael Miday	dbcd54d523	[ticket/14976] refactor fieldset.fields1 dd ... PHPBB3-14976	2017-10-13 00:16:30 -04:00
Marc Alexander	d64ce15ecf	Merge branch '3.2.x'	2017-10-11 21:00:38 +02:00
Marc Alexander	2c01fe67e9	Merge pull request #4942 from rubencm/ticket/15172 ... [ticket/15172] Fix redirection to wrong port	2017-10-11 21:00:33 +02:00
hanakin	a408180c4a	[ticket/14976] fix errors ... PHPBB3-14976	2017-10-11 14:51:16 -04:00
hanakin	f7baa94d44	[ticket/14976] Fix content.css ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	4ddc9a89fe	[ticket/14976] more fixes in content.css ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	8a312b01fb	[ticket/14976] fix errors ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	f268e07935	[ticket/14976] fix common.css and ignore normalize ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	c51b613015	[ticket/14976] Allow px line-heights for prosilver ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	a3372e628a	[ticket/14976] Fix linting ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	036d00f872	[ticket/14976] Some cleanup ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	3652a9cae6	[ticket/14976] More conversions ... PHPBB3-14976	2017-10-11 14:50:32 -04:00
hanakin	3b5fa30bb5	[ticket/14976] Fix icon line-height ... PHPBB3-14976	2017-10-11 14:49:49 -04:00
hanakin	dbf1987bb3	[ticket/14976] more em converstions and size fixes ... PHPBB3-14976	2017-10-11 14:49:49 -04:00
hanakin	725805e7ed	[ticket/14976] Some more em conversions ... PHPBB3-14976	2017-10-11 14:48:33 -04:00
hanakin	980a9a6f69	[ticket/14976] Start converting ems ... PHPBB3-14976	2017-10-11 14:48:33 -04:00
Marc Alexander	0e6a0aae8f	Merge pull request #4987 from hanakin/ticket/14336 ... [ticket/14336] add title text to online status icon	2017-10-11 19:13:18 +02:00
Marc Alexander	5fb7029692	Merge branch '3.2.x'	2017-10-11 19:06:52 +02:00
Marc Alexander	2f799fa993	Merge pull request #4994 from hanakin/ticket/15391 ... [ticket/15391] image-rendering not needed for Topic/Forum imgs	2017-10-11 19:06:48 +02:00
Michael Miday	e213b8264d	[ticket/15391] image-rendering no longer needed ... PHPBB3-15391	2017-10-11 10:11:10 -04:00
Marc Alexander	7998aa8381	Merge branch '3.2.x'	2017-10-11 13:29:06 +02:00
Marc Alexander	f6d1dd8b33	Merge pull request #4995 from senky/ticket/15394 ... [ticket/15394] Add $user_cache	2017-10-11 13:29:00 +02:00
Máté Bartus	68b3da2df0	Merge pull request #4990 from rubencm/ticket/15377 ... [ticket/15377] Fix INCLUDECSS and INCLUDEJS	2017-10-09 21:12:08 +02:00
Jakub Senko	5c16ef0657	[ticket/15394] Add $post_edit_list ... PHPBB3-15394	2017-10-09 19:08:16 +02:00
Jakub Senko	bad711e0d9	[ticket/15394] Add $user_cache ... PHPBB3-15394	2017-10-09 17:55:47 +02:00
Máté Bartus	eb0122b8ee	Merge pull request #4685 from hanakin/ticket/15071 ... [ticket/15071] Consolidate all media queries	2017-10-09 16:15:33 +02:00
Rubén Calvo	eaeec9b50b	[ticket/15377] Use __DIR__ constant ... PHPBB3-15377	2017-10-09 12:31:57 +02:00
Rubén Calvo	c2d3322e82	[ticket/15377] Add test ... PHPBB3-15377	2017-10-07 00:20:20 +02:00
Rubén Calvo	18c5f5c6e8	[ticket/15377] Fix INCLUDECSS and INCLUDEJS ... PHPBB3-15377	2017-10-05 20:54:01 +02:00
Máté Bartus	f4ffbd5506	Merge branch '3.2.x'	2017-10-05 20:46:10 +02:00
Máté Bartus	cfba5613b7	Merge pull request #4989 from Elsensee/ticket/15361 ... [ticket/15361] Fix paths and names of graphics	2017-10-05 20:45:57 +02:00
Oliver Schramm	69985f9b0c	[ticket/15361] Fix paths and names of graphics ... PHPBB3-15361	2017-10-05 17:58:57 +02:00
Oliver Schramm	bba4b4fc30	Merge branch '3.2.x'	2017-10-05 15:40:28 +02:00
Oliver Schramm	9c91bc4976	Merge pull request #4967 from Leinad4Mind/3.2.x ... [PHPBB3-14629] round() the log() explicitly to a proper integer	2017-10-05 15:40:24 +02:00
Oliver Schramm	8e62ea225e	Merge branch '3.2.x' ... Conflicts: phpBB/includes/ucp/ucp_notifications.php	2017-10-05 15:14:58 +02:00
Oliver Schramm	e1ae3236b2	Merge pull request #4981 from senky/ticket/15362 ... [ticket/15362] Fix colspan in notification options table	2017-10-05 15:13:41 +02:00
Oliver Schramm	5d3cac71d5	Merge branch '3.2.x'	2017-10-05 15:00:55 +02:00
Oliver Schramm	5c33c852ae	Merge pull request #4961 from hanakin/ticket/15361 ... [ticket/15361] Topic / Forum Icon rendering across all browsers	2017-10-05 15:00:50 +02:00
Oliver Schramm	92f25a6edc	Merge branch '3.2.x'	2017-10-05 14:55:00 +02:00
Oliver Schramm	16159f20f6	Merge branch '3.1.x' into 3.2.x	2017-10-05 14:54:52 +02:00
Oliver Schramm	5514b10699	Merge pull request #4960 from rxu/ticket/15367 ... [ticket/15367] Escape special characters in Sphinx search backend	2017-10-05 14:54:47 +02:00
Michael Miday	7d464aa0ea	[ticket/14336] add title ... PHPBB3-14336	2017-10-04 10:07:43 -04:00
Jakub Senko	2cdb27a0d1	[ticket/15362] Fix colspan in notification options table ... PHPBB3-15362	2017-10-02 12:24:33 +02:00
Marc Alexander	ff52857b1e	Merge branch '3.2.x'	2017-09-28 21:33:24 +02:00
Marc Alexander	fc3d3a83db	Merge pull request #4974 from Elsensee/ticket/15379 ... [ticket/15379] Fix assignments in reparser cron job	2017-09-28 21:33:19 +02:00
Oliver Schramm	6de10bd75e	Merge branch '3.2.x'	2017-09-28 18:57:57 +02:00