aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-1/+1
| |\ | | | | | | | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
| | * [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | This should help users trying to figure out why their mail config is not working when they forgot to use a protocol prefix. PHPBB3-14184
* | | Merge pull request #4357 from rxu/ticket/14660Marc Alexander2016-06-191-0/+3
|\ \ \ | | | | | | | | | | | | [ticket/14660] Fix parsing board email messages through template engine.
| * | | [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-181-0/+3
| | | | | | | | | | | | | | | | PHPBB3-14660
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-192-0/+18
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: phpBB/language/en/install.php
| * | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-1/+1
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-052-0/+19
| |/ | | | | | | | | | | | | | | Display a warning in the ACP if the version constant (files) does not match the phpbb_config version (often indicating that the database updates hasn't been run) PHPBB3-13716
* | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-022-2/+2
|\ \ | |/ | | | | | | Conflicts: phpBB/includes/acp/acp_modules.php
| * [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-023-3/+3
| | | | | | | | | | | | | | For loops that modify the size of the looped arrays were obviously not changed. PHPBB3-14577
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-274-6/+25
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-274-8/+25
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+16
| | | | | | | | | | | | PHPBB3-14272
| * | [ticket/14272] Make sure phpbb_avatar_manager was definedMarc Alexander2015-12-032-2/+5
| | | | | | | | | | | | 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-062-4/+4
| | | | | | | | | | | | PHPBB3-14272
* | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-241-1/+4
| | | | | | | | | | | | PHPBB3-14530
* | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-161-0/+24
| | | | | | | | | | | | | | | | | | | | | The javascript will hide the old select and show the version using the span and showing the tooltips. PHPBB3-14315
* | | [ticket/14315] Apply roles options format for multiple forums tooMarc Alexander2016-02-161-4/+5
| | | | | | | | | | | | PHPBB3-14315
* | | [ticket/14315] Build role options for each permission groupMarc Alexander2016-02-161-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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-161-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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/+1
| | | | | | | | | | | | PHPBB3-14315
* | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-041-0/+1
| | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
* | | Merge branch '3.1.x'Marc Alexander2016-01-311-2/+6
|\ \ \ | | |/ | |/|
| * | [ticket/14439] Do not call avatar manager if avatars are disabledrxu2016-01-311-2/+6
| | | | | | | | | | | | PHPBB3-14439
* | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '3.1.x'Marc Alexander2016-01-161-1/+1
|\ \ \ | |/ /
| * | [ticket/14412] Comment fixes for PHPDoc in the eventslavigor2016-01-151-1/+1
| | | | | | | | | | | | PHPBB3-14412
* | | Merge branch '3.1.x'Marc Alexander2016-01-121-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3929 from kilianr/ticket/12618Marc Alexander2016-01-121-1/+1
| |\ \ | | | | | | | | | | | | [ticket/12618] Allow extension author to use SSL for version-check.
| | * | [ticket/12618] Minor fix: Don't cast bool to int anymoreKilian2015-09-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12618
| | * | [ticket/12618] Allow extension author to use SSL for version-checkKilian2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For version-check a new parameter 'ssl' is introduced. If set to true, it will use 443 as port for the file_downloader. In file_downloader, the host parameter of fsockopen is appended with 'ssl://' in case the port is 443 in order to use SSL. PHPBB3-12618
* | | | Merge branch '3.1.x'Joas Schilling2016-01-092-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php
| * | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2016-01-092-2/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * \ \ Merge pull request #24 from phpbb/ticket/security-188Joas Schilling2016-01-092-2/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/security-188] Check form key in acp_bbcodes
| | | * | | [ticket/security-188] Remove unused form key from acp_extensionsMarc Alexander2015-12-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-188
| | | * | | [ticket/security-188] Check form key in acp_bbcodesMarc Alexander2015-12-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-188
* | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-0929-112/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13454] Remove unused variables, globals, and parameters * marc1706/ticket/13454: [ticket/13454] Add excessively removed code back [ticket/13454] Remove more unused variables [ticket/13454] Remove double semi-colons [ticket/13454] Remove unused variables [ticket/13454] Fix code sniffer complaints [ticket/13454] Fix a few issues introduced by overdeleting stuff [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables
| * | | | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-062-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be the last part. Off to checking if the changes were correct. PHPBB3-13454
| * | | | | | [ticket/13454] Remove double semi-colonsMarc Alexander2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-068-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454
| * | | | | | [ticket/13454] Fix code sniffer complaintsMarc Alexander2016-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-067-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 4 PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-069-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0624-53/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html