aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-201-0/+1
|\ | | | | | | | | * develop-olympus: [ticket/10402] Fixed a formatting issue with report details.
| * Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
| |\ | | | | | | | | | | | | * callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
| | * [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Line returns were being removed and links weren't being made clickable. This commit adds a line (contributed by AmigoJack) to retain the link breaks and make links clickable. PHPBB3-10402
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-3/+6
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| | * | [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| | | | | | | | | | | | | | | | PHPBB3-10239
| | * | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-1/+5
| | | | | | | | | | | | | | | | PHPBB3-10239
* | | | Merge remote-tracking branch 'naderman/feature/extension-manager' into developIgor Wiedler2011-11-1927-432/+1769
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/feature/extension-manager: (67 commits) [feature/extension-manager] Removing now unused acp_search code [feature/extension-manager] Split disabling extensions up into steps as well [feature/extension-manager] Add documentation on caching in ext finder [feature/extension-manager] Reference correct new module basenames in install [feature/extension-manager] Rename default methods to core methods on finder. [feature/extension-manager] Document what the class loader stores in cache [feature/extension-manager] Add docblock to cached paths map in class loader [feature/extension-manager] Clear up docs of extension related template changes [feature/extension-manager] Use "core files" instead of "global files" in docs [feature/extension-manager] Add docblocks to new search backend methods [feature/extension-manager] Add docblocks to new methods in functions_module [feature/extension-manager] Clarify comment on ext meta class instantiator [feature/extension-manager] Add more info on suffixes in extension finder [feature/extension-manager] Clarify is_dir parameter description [feature/extension-manager] Clarify class finding method docblock [feature/extension-manager] Correct default path comment & remove double strlen [feature/extension-manager] Fix "disbale" typo in comment [feature/extension-manager] Properly remove old ACP language loading code [feature/extension-manager] Support extensions in subdirectories of ext/ [feature/extension-manager] Add prefix to extension meta data / install classes ...
| * | | | [feature/extension-manager] Removing now unused acp_search codeNils Adermann2011-11-181-22/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-1827-264/+418
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (93 commits) [ticket/10157] Add notification to update cpfs when installing a language. [ticket/10185] Always set board startdate on conversion [ticket/10419] Reword the language strings [ticket/9361] View correct error messages when editing account information [ticket/10457] Undefined variable $request, when print-viewing PMs [ticket/10452] Fix xHTML errors when print-viewing PMs [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. [ticket/10254] Remove subsilver2 as default style on theme. [ticket/10254] Remove style names from themes and fix some informations on it. [ticket/7138] Allow simple header and footer for trigger_error() messages [ticket/9066] Disallow some database prefix to prevent same errors and problems [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10437] Do not display announcements that are waiting for approval [ticket/10087] Organize bans in acp_baninto optgroups [ticket/8616] Include old U_INBOX var for BC [ticket/10435] Remove global announcement from forums total topic count [ticket/10435] Readd local announcements to total topic count in viewforum ... Conflicts: phpBB/install/database_update.php
| * | | | | [feature/extension-manager] Split disabling extensions up into steps as wellNils Adermann2011-11-183-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add documentation on caching in ext finderNils Adermann2011-11-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Rename default methods to core methods on finder.Nils Adermann2011-11-186-92/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are now extension_ and core_ methods for all finder settings as well as a generic method which overwrites both. PHPBB3-10323
| * | | | | [feature/extension-manager] Document what the class loader stores in cacheNils Adermann2011-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add docblock to cached paths map in class loaderNils Adermann2011-11-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Clear up docs of extension related template changesNils Adermann2011-11-183-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Use "core files" instead of "global files" in docsNils Adermann2011-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add docblocks to new search backend methodsNils Adermann2011-11-182-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add docblocks to new methods in functions_moduleNils Adermann2011-11-181-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Clarify comment on ext meta class instantiatorNils Adermann2011-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add more info on suffixes in extension finderNils Adermann2011-11-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Clarify is_dir parameter descriptionNils Adermann2011-11-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Clarify class finding method docblockNils Adermann2011-11-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Correct default path comment & remove double strlenNils Adermann2011-11-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Fix "disbale" typo in commentNils Adermann2011-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Properly remove old ACP language loading codeNils Adermann2011-10-141-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Support extensions in subdirectories of ext/Nils Adermann2011-10-141-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add prefix to extension meta data / install classesNils Adermann2011-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Support for loading language files from extensionsNils Adermann2011-10-144-18/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The referenced extension needs to be explicitly specified in an add_lang_ext() call. PHPBB3-10323
| * | | | | [feature/extension-manager] extension finder now saves ext it found a file inNils Adermann2011-10-131-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Allow old non-prefix basenames to work for lookupsNils Adermann2011-10-131-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These module basenames are hardcoded in a bunch of places so they need to continue to work unless we want to rewrite all of them. PHPBB3-10323
| * | | | | [feature/extension-manager] Correctly detect and handle directories in finderNils Adermann2011-09-291-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Find dirs with SELF_FIRST setting on iteratorNils Adermann2011-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Make sure the directory pattern matches on windowsNils Adermann2011-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Correctly reset paths in set_templateNils Adermann2011-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Make sure named styles are loaded from root dirNils Adermann2011-09-294-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Fallback template might not always be setNils Adermann2011-09-291-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Reset all template paths after a set_templates callNils Adermann2011-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Refactoring the structure of extension providerNils Adermann2011-09-298-68/+191
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Don't use the extension manager during installNils Adermann2011-09-291-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template needs to be able to work without extensions. PHPBB3-10323
| * | | | | [feature/extension-manager] Add support for templates in extensions.Nils Adermann2011-09-295-85/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a template path provider to separate the process of locating (cached) paths in extensions from the template engine. The locator is supplied with a list of paths from the path provider. Admin templates can now be created in ext/<ext>/adm/style/ and regular templates go into ext/<ext>/styles/<style>/template/. Extension templates override regular templates. So if an extension supplies a file with a name used in phpBB, the extension's file will be used. A side-effect of this commit: Locator and Provider are now able to deal with arbitrary levels of template inheritance. So we can expose this through phpbb_template if we choose to, and allow styles to inherit from inherited styles. PHPBB3-10323
| * | | | | [feature/extension-manager] Don't cache the phpbb_root_path in the ext managerNils Adermann2011-09-292-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the paths are incorrect from e.g. adm/ PHPBB3-10323
| * | | | | [feature/extension-manager] Extract extension provider functionality from cronNils Adermann2011-09-292-46/+69
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Prepend the phpbb_root_path if necessary.Nils Adermann2011-09-291-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Correct formatting of documentationNils Adermann2011-09-291-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Add support for directories to the extension finderNils Adermann2011-09-291-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [feature/extension-manager] Always store the full class name as module basenameNils Adermann2011-09-291-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updater swaps out all basenames. PHPBB3-10323
| * | | | | [feature/extension-manager] Make sure the extension manager works without cacheNils Adermann2011-09-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a test for manager without a cache PHPBB3-10323
| * | | | | [feature/extension-manager] Make the cache variable name for extensions dynamicNils Adermann2011-09-292-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows multiple instances to use cache simultaneously. PHPBB3-10323
| * | | | | [feature/extension-manager] Use _ext for cache - avoids conflict with file extNils Adermann2011-09-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323