Commit graph

3097 commits

Author SHA1 Message Date
Scout4all
3f4dcc6920 [ticket/13463] Correctly position notification mark read icon in RTL.
PHPBB3-13463
2015-02-19 19:07:07 -08: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
Jakub Senko
bf86553daa [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
PHPBB3-9457
2015-02-16 18:02:16 +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
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
b9289340d9 [ticket/12567] wrap to top
PHPBB3-12567
2014-11-22 12:37:31 +01:00
Joas Schilling
8ce736ad8a Merge branch 'develop-ascraeus' into develop 2014-11-22 12:19:09 +01:00
Joas Schilling
ea101f7932 Merge pull request #3160 from PayBas/ticket/13228
[ticket/13228] Fix codebox "select all" font-size in UCP and MCP
2014-11-22 12:18:00 +01:00
Jakub Senko
a609c9db82 [ticket/12924] Make meta tags self-closing
PHPBB3-12924
2014-11-22 12:12:13 +01:00
Joas Schilling
b15ea672fd Merge branch 'develop-ascraeus' into develop 2014-11-22 11:31:50 +01:00
Joas Schilling
8489e0bdc2 Merge branch 'develop-olympus' into develop-ascraeus 2014-11-22 11:31:41 +01:00
PayBas
2c15388520 [ticket/13228] Gotta use !important after all. Too bad
PHPBB3-13228
2014-11-22 02:42:25 +01:00
Crizzo
867bfa3f9e [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctness
PHPBB3-10442
2014-11-22 01:08:14 +01:00
PayBas
16c43b6a7d [ticket/13228] Fix codebox "select all" font-size in UCP and MCP
PHPBB3-13228
2014-11-21 23:35:33 +01:00
Joas Schilling
dd3e440cef Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
2014-11-21 23:26:51 +01:00
Joas Schilling
0017fad554 Merge pull request #3108 from Elsensee/ticket/13284
[ticket/13284] Message body not included in email
2014-11-21 23:10:00 +01:00
Joas Schilling
1104f788c3 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/confirm_delete_body.html
2014-11-21 21:00:00 +01:00
Joas Schilling
d56da0d68f Merge pull request #3044 from Elsensee/ticket/13100
[ticket/13100] Display only confirmation buttons when deleting shadow topic
2014-11-21 20:59:22 +01:00
Joas Schilling
ac33ee2290 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
2014-11-21 19:54:44 +01:00
Joas Schilling
2d6734cb0a Merge pull request #3126 from VSEphpbb/ticket/13290
[ticket/13290] Add EVENT index_body_forumlist_body_after
2014-11-21 19:53:15 +01:00
Joas Schilling
987bd7b3a7 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_search.html
2014-11-21 19:25:32 +01:00
Joas Schilling
c31b53942d Merge pull request #3071 from rxu/ticket/13220
[ticket/13220] Add template events to memberlist_search.html
2014-11-21 19:23:10 +01:00
Marc Alexander
1e03dddcfe Merge branch 'develop-ascraeus' into develop 2014-11-18 15:01:02 +01:00
cyberalien
795fd75d60 [ticket/13349] Fix breadcrumb arrow entity
PHPBB3-13349
2014-11-18 14:13:07 +02:00