aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-311-1/+1
|\ \ \ | |/ /
| * | [ticket/14643] Offer latest backup to restore by defaultJakub Senko2016-05-291-1/+1
| |/ | | | | | | PHPBB3-14643
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2711-29/+29
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
* | \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-2711-29/+29
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Allow input of floats for filesizeMarc Alexander2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | This might be needed while switching the default input from KiB to MiB or similar changes to settings. PHPBB3-14272
| * | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-012-4/+4
| | | | | | | | | | | | 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-0611-29/+29
| | | | | | | | | | | | PHPBB3-14272
* | | Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-243-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-244-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/14315] Add functional tests for permission roles and fix non-jsMarc Alexander2016-02-172-2/+9
| | | | | | | | | | | | | | | | | | Without JS the settings were not applied due to duplicate input names. PHPBB3-14315
* | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-163-1/+6
| | | | | | | | | | | | | | | | | | | | | The javascript will hide the old select and show the version using the span and showing the tooltips. PHPBB3-14315
* | | [ticket/14315] Tweak location of drop-downMarc Alexander2016-02-161-1/+1
| | | | | | | | | | | | PHPBB3-14315
* | | [ticket/14315] Build role options for each permission groupMarc Alexander2016-02-161-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Previously all role options were put into one array. This required filtering the options. Instead, these are now passed to the template via template loops. PHPBB3-14315
* | | [ticket/14315] Correctly set default values and reset valuesMarc Alexander2016-02-162-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | The permissions tooltip javascript failed at correctly passing the default values to the page. The same applied to the display_mask() method in includes/acp/auth.php. PHPBB3-14315
* | | [ticket/14315] Only add role options specified for each groupMarc Alexander2016-02-161-0/+2
| | | | | | | | | | | | PHPBB3-14315
* | | [ticket/14462] Make timeout error translateableOliver Schramm2016-02-141-0/+9
| | | | | | | | | | | | PHPBB3-14462
* | | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-021-0/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14262] Move convertor to controller * CHItA/ticket/14262: [ticket/14262] Add error handling and small CS fixes [ticket/14262] Remove converter template duplicate [ticket/14262] Fix stage navigation [ticket/14262] Move convertor to controller
| * | | [ticket/14262] Add error handling and small CS fixesMate Bartus2016-02-021-0/+8
| | | | | | | | | | | | | | | | PHPBB3-14262
| * | | [ticket/14262] Remove converter template duplicateMate Bartus2016-01-291-134/+0
| | | | | | | | | | | | | | | | PHPBB3-14262
| * | | [ticket/14262] Move convertor to controllerMate Bartus2016-01-292-0/+213
| | | | | | | | | | | | | | | | PHPBB3-14262
* | | | [ticket/14438] Allign progressbar text to centerMate Bartus2016-01-291-4/+9
| | | | | | | | | | | | | | | | PHPBB3-14438
* | | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-3/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty, you need to open each existing group in ACP to know if there are pending group requests or not. Doing so is really boring and annoying... :/ This patch displays the number of pending group requests at the ACP groups summary page. PHPBB3-14253
* | | [ticket/14306] Improves Error displayTristan Darricau2016-01-091-1/+1
| | | | | | | | | | | | PHPBB3-14306
* | | [ticket/14306] CS and correctly handle exception loopTristan Darricau2016-01-091-4/+4
| | | | | | | | | | | | PHPBB3-14306
* | | [ticket/14306] Update the error messageTristan Darricau2016-01-091-2/+1
| | | | | | | | | | | | PHPBB3-14306
* | | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-091-6/+14
| | | | | | | | | | | | PHPBB3-14306
* | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13180] Increase dateformat field size change field size to 64 in these files add new migration file to update the database schema PHPBB3-13180
* | | [ticket/14380] Maintain consistent template var paths in 3.2 installerMate Bartus2015-12-222-2/+2
| | | | | | | | | | | | PHPBB3-14380
* | | [ticket/14378] Use consistent template variable pathsMarc Alexander2015-12-223-7/+7
| | | | | | | | | | | | PHPBB3-14378
* | | Merge branch '3.1.x'Marc Alexander2015-12-223-3/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/adm/style/installer_footer.html
| * | [ticket/14374] Update dynamic fallback jquery CDN script tagMatt Friedman2015-12-223-3/+3
| | | | | | | | | | | | PHPBB3-14374
* | | Merge branch '3.1.x'Tristan Darricau2015-12-071-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14346] Do not turn version red if update status is unknown
| * | [ticket/14346] Do not turn version red if update status is unknownMarc Alexander2015-12-071-1/+1
| | | | | | | | | | | | PHPBB3-14346
* | | [ticket/14310] Put progress percentage inside span and make more visibleMarc Alexander2015-12-071-0/+1
| | | | | | | | | | | | PHPBB3-14310
* | | Merge branch '3.1.x'Marc Alexander2015-11-1011-14/+26
|\ \ \ | |/ /
| * | Merge pull request #3930 from rxu/ticket/14201Marc Alexander2015-11-1011-14/+26
| |\ \ | | | | | | | | | | | | [ticket/14201] Add multiple ACP template events
| | * | [ticket/14201] Add events.md descriptions, fix accidentally swapped eventsrxu2015-10-129-16/+16
| | | | | | | | | | | | | | | | PHPBB3-14201
| | * | [ticket/14201] Add more template events to ACPrxu2015-09-268-7/+15
| | | | | | | | | | | | | | | | PHPBB3-14201
| | * | [ticket/14201] Add events to acp_users.html, permission_forum_copy.htmlrxu2015-09-262-2/+4
| | | | | | | | | | | | | | | | PHPBB3-14201
| | * | [ticket/14201] Add template events to acp_permissions.htmlrxu2015-09-261-5/+7
| | | | | | | | | | | | | | | | PHPBB3-14201
* | | | Merge branch '3.1.x'Oliver Schramm2015-11-061-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_captcha.php
| * | | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-0/+7
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/11971] Validate "Spambot countermeasures" settings before saving
| | * | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-0/+7
| | | | | | | | | | | | | | | | PHPBB3-11971
* | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-228-1044/+0
| | | | | | | | | | | | | | | | PHPBB3-14044
* | | | Merge pull request #3794 from CHItA/ticket/14039Tristan Darricau2015-10-197-15/+131
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14039] Refactoring the updater * CHItA/ticket/14039: [ticket/14039] Use update helper to include files in container factory [ticket/14039] Fix inclusion logic in update helper [ticket/14039] Fix folder creation and deleted binary file issue [ticket/14039] Fix file check for deleted files [ticket/14039] Fix acp link [ticket/14039] Fix ACP link generation [ticket/14039] Fix constants for the updater [ticket/14039] Include phpBB constants on startup [ticket/14039] Fix migrator's language calls [ticket/14039] Fix misunderstandable comment in the archive file updater [ticket/14039] Use shared language service in the container factory [ticket/14039] Fix filesystem file updater's mkdir usage [ticket/14039] Only show log container when it has content [ticket/14039] Use compatibility globals from the update package [ticket/14039] Use http_exception instead of die() [ticket/14039] Fix T_TEMPLATE_PATH constant [ticket/14039] Fix language constants and comments [ticket/14039] Revamp updater
| * | | | [ticket/14039] Only show log container when it has contentMate Bartus2015-10-181-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix T_TEMPLATE_PATH constantMate Bartus2015-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Revamp updaterMate Bartus2015-10-176-14/+128
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039