aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/11768] Invalidate the text_formatter cache whenever a style is installedJoshyPHP2015-04-021-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The acp_styles module purges the cache every time a style is uninstalled, modified or made default, but it does not purge the cache when a new style is installed. Here we invalidate the text_formatter cache (not purge the whole cache) so that new styles take effect immediately. PHPBB3-11768
| * | | | | [ticket/11768] Re-added the code that got lost in rebaseJoshyPHP2015-04-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] This commit integrates s9e\TextFormatters9e2015-04-024-1/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit integrates s9e\TextFormatter as outlined in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467 PHPBB3-11768
* | | | | Merge pull request #3430 from MateBartus/ticket/12466Tristan Darricau2015-04-051-1660/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | [ticket/12466] Move classes from acp_database.php to their own files
| * | | | [ticket/12466] Move classes from acp_database.php to their own filesMateBartus2015-02-271-1660/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving classes from acp_database.php to phpbb/db/extractor namespace, also into separate files * Adding DocBlocks and property visibility to classes * Removing globals from code * Passing former globals to base_extractor's constructor * Adding DB extractor as a service, also implementing the extractor interface as well as the extractor factory. PHPBB3-12466
* | | | | Merge branch '3.1.x'Nicofuma2015-03-291-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-291-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| | * \ \ \ Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-061-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | | * | | | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13527] Escape information received from version server * bantu/ticket/13527: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables.
| | | | * | | | [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13527
| | | | * | | | [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13527
* | | | | | | | Merge branch '3.1.x'Nicofuma2015-03-241-5/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3398 from marc1706/ticket/13612Nicofuma2015-03-241-5/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13612] Run meta refresh until extension is fully enabled
| | * | | | | | | [ticket/13612] Always display success message if extension was enabledMarc Alexander2015-02-141-5/+0
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An error will already be triggered if enable_step() is not successful. Redirecting for no obvious reason will just confuse users. PHPBB3-13612
* | | | | | | | Merge branch '3.1.x'Cesar G2015-03-231-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13719] Remove superfluous $search_options in acp_search.
| * | | | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-061-1/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3473 from RMcGirr83/ticket/13675Marc Alexander2015-03-061-1/+14
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | [ticket/13675] Add validate to acp_profile event and add template events
| | * | | | | | [ticket/13675] Add validate to acp_profile event and add template eventsRichard McGirr2015-03-061-1/+14
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for acp users profile PHPBB3-13675
* | | | | | | Merge pull request #3434 from nickvergessen/ticket/13647Marc Alexander2015-03-052-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13647] Move FAQ page to a controller
| * | | | | | | [ticket/13647] Generate route links for faqJoas Schilling2015-02-222-2/+8
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13647
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-241-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | [ticket/13587] SQL syntax errors in get_prune_users()RMcGirr832015-02-241-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13587
* | | | | [ticket/10748] Fix class type hintingJoas Schilling2015-02-151-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10748
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
| * | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7Marc Alexander2015-02-111-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13597
* | | | [ticket/10748] Replace direct creations of tools();Joas Schilling2015-02-071-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10748
* | | | [ticket/13455] Remove `request_var()` references from commentsGaëtan Muller2015-02-031-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`Gaëtan Muller2015-02-0318-47/+47
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-0326-392/+393
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | Merge pull request #3281 from MGaetan89/ticket/13496Andreas Fischer2015-02-031-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13496] Change set_config_count() calls with $config->increment() * MGaetan89/ticket/13496: [ticket/13496] Update calls to `set_config_count()`
| * | | | [ticket/13496] Update calls to `set_config_count()`Gaëtan Muller2015-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13496
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-0/+26
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | | | Merge pull request #3325 from rxu/ticket/13536Joas Schilling2015-02-021-0/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
| | * | | | [ticket/13536] Add core events to allow modifying user profile data on editingrxu2015-01-231-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744 PHPBB3-13536
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-2/+16
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge pull request #3282 from Elsensee/ticket/13313Joas Schilling2015-02-021-2/+16
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13313] Add event core.acp_email_display
| | * | | [ticket/13313] Update version in @since tag of eventOliver Schramm2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13313
| | * | | [ticket/13313] Add event core.acp_email_displayOliver Schramm2015-01-111-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-13313
* | | | | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-029-33/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-13494
* | | | | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-2724-141/+185
| | | | | | | | | | | | | | | | | | | | PHPBB3-13468
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13519] Correctly validate imagick path as path and not string
| * | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13519] Correctly validate imagick path as path and not string Conflicts: phpBB/includes/acp/acp_attachments.php
| | * | | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-13519
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3226 from prototech/ticket/13420Joas Schilling2015-01-201-2/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
| | * | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13420
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-1/+3
|\ \ \ \ \ | |/ / / /