aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-021-0/+2
|\ | | | | | | | | * 3.1.x: [ticket/14786] Add mcp_forum_actions_before/after events
| * [ticket/14786] Add mcp_forum_actions_before/after eventsJakub Senko2016-09-262-0/+4
| | | | | | | | PHPBB3-14786
| * [prep-release-3.1.10] Update version to 3.1.10-RC1Marc Alexander2016-09-242-4/+4
| |
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-0/+2
|\ \ | |/
| * [ticket/14785] Add template event overall_header_headerbar_after/beforeGerB2016-09-241-0/+2
| | | | | | | | PHPBB3-14785
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-111-1/+5
|\ \ | |/ | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * Merge pull request #4371 from imkingdavid/ticket/14695Marc Alexander2016-09-112-2/+10
| |\ | | | | | | | | | [ticket/14695] Add posting_editor_subject_prepend/append template events
| | * [ticket/14695] Added posting_editor_subject_append/prepend events to subsilverDavid King2016-08-091-1/+5
| | | | | | | | | | | | | | | As per request in PR. PHPBB3-14695
| | * [ticket/14695] Put posting_editor_subject_append/prepend events on newlinesDavid King2016-08-091-1/+5
| | | | | | | | | | | | | | | As per request in the PR. PHPBB3-14695
| | * [ticket/14695] Add posting_editor_subject_prepend/append template eventsDavid King2016-06-251-1/+1
| | | | | | | | | | | | PHPBB3-14695
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-071-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html
| * | Merge pull request #4428 from rmcgirr83/ticket/14755Marc Alexander2016-09-072-2/+2
| |\ \ | | | | | | | | | | | | [ticket/14755] Fix max length in mcp topic html file
| | * | [ticket/14755] Fix subsilver2Richard McGirr2016-08-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14755
| | * | [ticket/14755] Fix max length in mcp topic html fileRMcGirr832016-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move posts does not accept a topic number greater than 999999 topic_id set in both posts table and topics table accepts 10 digits https://tracker.phpbb.com/browse/PHPBB3-14755 PHPBB3-14755
* | | | [ticket/14588] fix header search rtlMichael Miday2016-08-291-0/+1
| | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14588#add-comment PHPBB3-14588
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-281-1/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #4338 from Senky/ticket/14469Marc Alexander2016-08-282-2/+6
| |\ \ \ | | | | | | | | | | | | | | | Add viewforum_body_topicrow_before template event
| | * | | [ticket/14469] Add viewforum_body_topicrow_before template eventJakub Senko2016-08-112-2/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-14469
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-282-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4389 from kasimi/ticket/14715-3.1.xMarc Alexander2016-08-284-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14715] Add template events in posting_topic_review & mcp_topic
| | * | | | [ticket/14715] Add template events in posting_topic_review & mcp_topickasimi2016-07-214-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The events will allow adding content before and after the post details in topic review and topic moderation. PHPBB3-14715
* | | | | | [ticket/14753] Fix mcp_postRichard McGirr2016-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14753
* | | | | | [ticket/14753] Fix language suffixRichard McGirr2016-08-276-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing L parameter in language strings https://tracker.phpbb.com/browse/PHPBB3-14753 PHPBB3-14753
* | | | | | Merge pull request #4423 from Crizz0/ticket/14749Andreas Fischer2016-08-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14749] Adds missing } in mcp_forum.html to {TOPIC_DELETED * Crizz0/ticket/14749: [ticket/14749] Adds missing } in mcp_forum.html to TOPIC_DELETED
| * | | | | | [ticket/14749] Adds missing } in mcp_forum.html to TOPIC_DELETEDCrizzo2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14749
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-211-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4411 from Senky/ticket/12925Marc Alexander2016-08-211-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | [ticket/12925] Pluralize permanent delete checkbox label
| | * | | | | [ticket/12925] Pluralize permanent delete checkbox labelJakub Senko2016-08-151-2/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-12925
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-031-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
| * | | | Merge pull request #4324 from Senky/ticket/14516Marc Alexander2016-08-032-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/14516] Add memberlist_email_before event
| | * | | [ticket/14516] Add memberlist_email_before eventJakub Senko2016-07-172-0/+4
| | |/ / | | | | | | | | | | | | PHPBB3-14516
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-161-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_move.html
| * | | Merge pull request #4337 from Senky/ticket/14506Marc Alexander2016-07-162-4/+8
| |\ \ \ | | |_|/ | |/| | | | | | Add mcp_move_before template event
| | * | [ticket/14506] Add mcp_move_before template eventJakub Senko2016-05-292-4/+8
| | |/ | | | | | | | | | PHPBB3-14506
* | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.xTristan Darricau2016-06-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/prep-release-3.2.0-RC1: [prep-release-3.2.0-RC1] Update changelog [prep-release-3.2.0-RC1] Add migration [prep-release-3.2.0-RC1] Update schema.json [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
| * | | [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1Tristan Darricau2016-06-191-2/+2
| | | |
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-193-1/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html phpBB/styles/subsilver2/template/mcp_forum.html phpBB/styles/subsilver2/template/search_results.html phpBB/styles/subsilver2/template/viewforum_body.html
| * | [ticket/14672] Change event name add to events.mdRichard McGirr2016-06-136-2/+6
| | | | | | | | | | | | PHPBB3-14672
| * | [ticket/14672] Add template event after topic titleRichard McGirr2016-06-121-1/+1
| |/ | | | | | | PHPBB3-14672
| * [prep-release-3.1.9] Update version to 3.1.9-RC1Joas Schilling2016-04-092-4/+4
| |
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2712-19/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14272] Use html5 valid input elements * marc1706/ticket/14272: [ticket/14272] Allow input of floats for filesize [ticket/14272] Use input type number instead of text in avatars [ticket/14272] Assign min and max values for avatar driver settings [ticket/14272] Define min and max values for avatar width and height [ticket/14272] Disable not toggled form elements [ticket/14272] Make sure phpbb_avatar_manager was defined [ticket/14272] Remove useless check [ticket/14272] Fix invalid or missing min/max settings [ticket/14272] Assign min/max for all allowed types [ticket/14272] Only use maxlength and size for allowed input elements
* | | [ticket/14612] Fix incorrect class for fieldset in mcp_approve.htmlcyberalien2016-04-231-1/+1
| | | | | | | | | | | | PHPBB3-14612
* | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | DO NOT apply these changes into master when merging it. This means that you'll have to checkout the latest files from upstream after merging this into master (possibly while resolving likely merge conflicts). PHPBB3-14495
* | | Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-276-10/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/acp_icons.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_acp.php phpBB/includes/ucp/ucp_groups.php phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html phpBB/styles/prosilver/template/ucp_avatar_options_remote.html phpBB/styles/subsilver2/template/mcp_topic.html phpBB/styles/subsilver2/template/posting_attach_body.html phpBB/styles/subsilver2/template/posting_body.html phpBB/styles/subsilver2/template/posting_poll_body.html phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
| * | [ticket/14272] Use input type number instead of text in avatarsMarc Alexander2016-01-013-5/+5
| | | | | | | | | | | | PHPBB3-14272
| * | [ticket/14272] Define min and max values for avatar width and heightMarc Alexander2015-12-271-2/+2
| | | | | | | | | | | | PHPBB3-14272
| * | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-1/+1
| | | | | | | | | | | | PHPBB3-14272
| * | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-068-12/+12
| | | | | | | | | | | | PHPBB3-14272
* | | Merge pull request #4245 from JoshyPHP/ticket/14381Tristan Darricau2016-03-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14381] Set the mode in message parser to "reparse" * JoshyPHP/ticket/14381: [ticket/14381] Set the mode in message parser to "reparse" [ticket/14495] Updates the version to 3.3.0-a1-dev
| * \ \ Merge branch '3.2.x'Tristan Darricau2016-03-141-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14528] Add back itemprop definitions to breadcrumbs [ticket/14528] Update navbar_header.html for valid microdata