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
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
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> </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
Cesar G
e1865df7dd
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13023] Add template event posting_editor_buttons_custom_tags_before
Conflicts:
phpBB/styles/subsilver2/template/posting_buttons.html
2014-11-18 01:33:13 -08:00
Cesar G
052fdcc8d9
Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus
...
* Nicofuma/ticket/13023:
[ticket/13023] Add template event posting_editor_buttons_custom_tags_before
2014-11-18 01:30:06 -08:00
Tristan Darricau
074b91497b
[ticket/13023] Add template event posting_editor_buttons_custom_tags_before
...
PHPBB3-13023
2014-11-16 11:52:30 +01:00
Matt Friedman
971b30a76d
[ticket/13290] Add EVENT index_body_forumlist_body_after
...
PHPBB3-13290
2014-11-10 13:56:52 -08:00
rxu
70641e701a
[ticket/13220] Add template events to memberlist_search.html
...
PHPBB3-13220
2014-11-08 21:22:59 +07:00
Oliver Schramm
b32dc8c667
[ticket/13284] Fix request name so users can cc themselves
...
PHPBB3-13284
2014-11-04 18:22:46 +01:00
Nils Adermann
29d2a7bc9f
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/memberlist_email.html
2014-11-02 01:29:04 +01:00
