3155 commits

Author	SHA1	Message	Date
Marc Alexander	87ca5ef7e5	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html phpBB/styles/subsilver2/theme/stylesheet.css	2015-03-05 14:23:50 +01:00
Marc Alexander	70f1741331	Merge pull request #3454 from RMcGirr83/ticket/13590 ... [ticket/13590] Headers of remember me login keys are not centered	2015-03-05 13:56:01 +01:00
RMcGirr83	c3720739cb	[ticket/13590] Headers of remember me login keys are not centered ... Corrected a few other files as well PHPBB3-13590	2015-03-04 06:00:27 -05:00
Marc Alexander	5d6f86800f	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html	2015-02-27 22:10:27 +01:00
Marc Alexander	a7b1b71921	Merge pull request #3451 from RMcGirr83/ticket/13510 ... [ticket/13510] Add template even viewtopic_body_pagination_after	2015-02-27 22:08:51 +01:00
RMcGirr83	8c73f63529	[ticket/13510] Add template even viewtopic_body_pagination_after ... PHPBB3-13510	2015-02-26 18:29:02 -05:00
Joas Schilling	e5595ca216	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/forumlist_body.html	2015-02-26 22:53:26 +01:00
Joas Schilling	c814ecc143	Merge pull request #3449 from prototech/ticket/13649 ... [ticket/13649] Fix incorrect subforum tooltip title when unread.	2015-02-26 22:53:06 +01:00
Cesar G	335d88cdbb	[ticket/13649] Fix incorrect subforum tooltip title when unread. ... PHPBB3-13649	2015-02-25 19:36:28 -08:00
Cesar G	37b919142f	[ticket/13563] Remove PM column from subsilver2's memberlist_body.html. ... The PM link was intentionally dropped due to excessive query requirements, thus the column is without purpose now. See PHPBB3-13229 PHPBB3-13563	2015-02-25 19:15:11 -08:00
Joas Schilling	33ea266daf	Merge branch '3.1.x'	2015-02-20 20:55:55 +01:00
Joas Schilling	059790f386	Merge pull request #3425 from dragosvr92/patch-4 ... Update colours.css	2015-02-20 20:55:23 +01:00
Joas Schilling	61fa9dcb9f	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/search_results.html	2015-02-20 20:42:52 +01:00
Joas Schilling	461ce3f892	Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x	2015-02-20 20:41:55 +01:00
Wolfsblvt	cba12aca2a	[ticket/13533] Add template core event to search results ... PHPBB3-13533	2015-02-20 20:41:17 +01:00
Joas Schilling	a1ecb10c5c	Merge branch '3.1.x'	2015-02-20 20:22:18 +01:00
Dragos-Valentin Radulescu	5c3ca7404d	[ticket/13640] Rearrange css in a better order ... PHPBB3-13640	2015-02-20 20:21:31 +01:00
Dragos-Valentin Radulescu	eff928c29b	[ticket/13639] Update colours.css ... The rule is a left over from development. it should be removed from colours.css .icon-search-advanced { background-image: url("./images/icon_search_adv.gif");} Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166 PHPBB3-13639	2015-02-20 20:26:33 +02:00
Marc Alexander	21c6223eb3	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_profile_profile_info.html phpBB/styles/subsilver2/template/ucp_profile_reg_details.html	2015-02-18 17:35:03 +01:00
RMcGirr83	153d1691ae	[ticket/13628] Allow ability for extension to add entries to user's profile ... PHPBB3-13628	2015-02-18 16:35:10 +01:00
kamijoutouma	4398a51dc6	[ticket/13615] Correctly display images for gallery avatar in subsilver2 ... Avatar Gallery shows categories but no images in subsilver2. The ID was not specified in the template. Also, the correct parent template loop is called avatar_local_row and not avatar_local_col. PHPBB3-13615	2015-02-15 18:18:56 +01:00
Joas Schilling	7f8a726702	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html	2015-02-02 23:07:33 +01:00
Joas Schilling	b1336ae016	Merge pull request #3302 from rxu/ticket/13512 ... [ticket/13512] Add template events before/after the post details	2015-02-02 23:05:50 +01:00
Matt Friedman	fc412a97ca	[ticket/10388] Convert LA usages to L when not in javascript context ... PHPBB3-10388	2015-01-29 01:40:54 -08:00
Joas Schilling	acfb9b9539	[prep-release-3.1.3] Update version to 3.1.2-RC1	2015-01-26 19:42:06 +01:00
Joas Schilling	54e3b14583	Merge branch 'develop-ascraeus' into develop	2015-01-19 21:37:25 +01:00
Joas Schilling	ff39ffacf6	Merge pull request #3296 from PayBas/ticket/13431 ... [ticket/13431] Fix responsive RTL media queries for <IE11	2015-01-19 21:37:14 +01:00
Joas Schilling	8e75133d79	Merge branch 'develop-ascraeus' into develop	2015-01-19 21:14:02 +01:00
rxu	10c67fe12a	[ticket/13512] Add template events before/after the post details ... Add template events to viewtopic_body.html to allow extensions adding content before/after the post details. PHPBB3-13512	2015-01-17 16:40:09 +07:00
PayBas	4e5e356555	[ticket/13431] Fix responsive RTL media queries for <IE11 ... PHPBB3-13431	2015-01-16 19:25:45 +01:00
PayBas	9e38e9dc6f	[ticket/13507] Fix horizontal scrollbar for large images in posts ... PHPBB3-13507	2015-01-16 19:10:04 +01:00
Dhruv	54b8c1626e	Merge branch 'develop-ascraeus' into develop	2015-01-11 14:44:11 +05:30
Dhruv Goel	fbf7726642	Merge pull request #3176 from Senky/ticket/13346 ... [ticket/13346] Fix indentation, spacing and missing divs	2015-01-11 14:42:40 +05:30
Jakub Senko	10e72a36a3	[ticket/13346] Remove unnecessary divs ... PHPBB3-13346	2015-01-10 21:05:30 +01:00
Joas Schilling	ba90746ce5	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html	2015-01-06 11:25:26 +01:00
Kailey Truscott	c61fa1aaa1	[ticket/13437] Add template event viewtopic_body_post_author_before/after ... PHPBB3-13437	2015-01-02 10:00:01 -05:00
Joas Schilling	cf8904bc2c	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/mcp_front.html	2014-12-27 14:09:38 +01:00
Joas Schilling	ffbe1d424b	Merge pull request #3224 from prototech/ticket/13427 ... [ticket/13427] Add several before/after template events to mcp_front.html	2014-12-27 14:08:51 +01:00
Joas Schilling	fbe0f04132	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/overall_footer.html	2014-12-27 14:03:34 +01:00
Joas Schilling	fa06c7967e	Merge pull request #3218 from rxu/ticket/13419 ... [ticket/13419] Add the lowermost template event	2014-12-27 14:02:39 +01:00
Joas Schilling	22948127f8	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/index.htm phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html phpBB/styles/subsilver2/theme/images/index.htm	2014-12-27 13:35:23 +01:00
Joas Schilling	d2334ab3e0	Merge pull request #3167 from Senky/ticket/12924 ... [ticket/12924] Make meta tags self-closing	2014-12-27 13:34:48 +01:00
Cesar G	892aa43eee	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12567] wrap to top	2014-12-09 17:59:01 -08:00
Cesar G	61df1ac2b3	Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeus ... * Senky/ticket/12567: [ticket/12567] wrap to top	2014-12-09 17:58:43 -08:00
Cesar G	4dab281da1	[ticket/13427] Add several before/after template events to mcp_front.html. ... PHPBB3-13427	2014-12-09 16:26:32 -08:00
rxu	0a419781c2	[ticket/13419] Add the lowermost template event ... PHPBB3-13419	2014-12-06 16:36:33 +07:00
Prosk8er	a5a18fb6dd	[ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post ... PHPBB3-13391	2014-11-26 14:09:07 -05:00
Jakub Senko	d24fa2e777	[ticket/13346] Fix indentation, spacing and missing divs ... PHPBB3-13346	2014-11-24 20:41:01 +01:00
Joas Schilling	a5b3393bb0	[prep-release-3.1.2] Update version to 3.1.2-RC1	2014-11-22 19:22:40 +01:00
Jakub Senko	595f9c132b	[ticket/12924] Remove newlines at the EOF ... PHPBB3-12924	2014-11-22 19:19:08 +01:00