aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | [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
| * \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-271-0/+6
| |\ \ \ \
| * | | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14495
* | | | | | Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-244-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/install_update_diff.html phpBB/adm/style/installer_header.html phpBB/install/database_update.php phpBB/install/index.php 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
| * | | | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-248-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously removed without needing to. Adding it back to force users to not emulate the page for previous versions of IE. The imagetoolbar http-equiv tag was not restored as IE does not contain that anymore since IE7. Also, the chome=1 has been removed from the X-UA-Compatible content as ChromeFrame does not receive any further updates since 2014 and is potentially broken. PHPBB3-14136
* | | | | [ticket/14528] Add back itemprop definitions to breadcrumbsMarc Alexander2016-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14528
* | | | | [ticket/14528] Update navbar_header.html for valid microdataC1n2016-03-131-1/+1
| |_|/ / |/| | | | | | | | | | | PHPBB3-14528
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-271-0/+6
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | Conflicts: phpBB/docs/events.md phpBB/styles/subsilver2/template/memberlist_view.html
| * | Merge pull request #4049 from rxu/ticket/14316Marc Alexander2016-02-272-0/+12
| |\ \ | | | | | | | | | | | | [ticket/14316] Add events before/after the custom/zebra fields in pfile view
| | * | [ticket/14316] Add events before/after the custom/zebra fields in profile viewrxu2016-02-272-0/+12
| | | | | | | | | | | | | | | | PHPBB3-14316
| * | | [prep-release-3.1.8] Update version to 3.1.8-RC1Joas Schilling2016-02-132-4/+4
| | | |
* | | | Merge pull request #4127 from RMcGirr83/ticket_14416Marc Alexander2016-02-181-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14416] footer nav links have incorrect tooltip styling applied
| * | | | [ticket/14416] Revert changes and use twig spacelessRichard McGirr2016-02-031-2/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-14416
| * | | | [ticket/14416] footer nav links have incorrect tooltip styling appliedRichard McGirr2016-01-171-10/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14416
* | | | | Merge pull request #4157 from VSEphpbb/ticket/14447Tristan Darricau2016-02-1550-144/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14447] Remove trailing white spaces in Prosilver * VSEphpbb/ticket/14447: [ticket/14447] Remove trailing white spaces in Prosilver
| * | | | | [ticket/14447] Remove trailing white spaces in ProsilverMatt Friedman2016-02-0250-144/+144
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14447
* | | | | | [prep-release-3.2.0-b1] Update version to 3.2.0-b1Tristan Darricau2016-02-031-2/+2
|/ / / / /
* | | | | Merge branch '3.1.x'Marc Alexander2016-01-271-0/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4029 from RMcGirr83/ticket_14289Marc Alexander2016-01-271-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14289] Add events to navbar header
| | * | | | [ticket/14289] Change to 3.1.8-RC1 and rename eventRichard McGirr2016-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14289
| | * | | | [ticket/14289] Add events to navbar headerRichard McGirr2015-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14289
* | | | | | [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixedCrizzo2016-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In viewtopic_topic_tools.html was used the language variable L_PM_TOOLS it had to be changed to L_TOPIC_TOOLS to display the right title in the moderation wrench in viewtopic.php PHPBB3-14418
* | | | | | [ticket/14420] Fix up search results topic listsMatt Friedman2016-01-182-24/+32
| |_|/ / / |/| | | | | | | | | | | | | | PHPBB3-14420