aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-113-0/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (28) and others # Via Andreas Fischer (9) and others * 'develop' of https://github.com/phpbb/phpbb3: (90 commits) [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver [feature/migrations] Remove default values from necessary parameters [ticket/11201] Revert WLM dropping because it is still used in China. [ticket/11220] Improvement to the info pop-up from "list=" [feature/migrations] Revert unrelated changes to functions.php [ticket/11233] prohibit selecting anonymous user as a PM recipient [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input. [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres. [ticket/10050] removing prosilver edits [ticket/9737] Fix some comments [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. [ticket/11338] Travis CI: Install PHP extension for redis key-value store. [ticket/10050] adding .topicrow to template condition [ticket/9737] Fix a few minor things in migrations ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| * | | | | | | [feature/migrations] Migrations now somewhat worksNathan Guse2013-01-093-39/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9737
| * | | | | | | [feature/migrations] Move migrator to service containerNathan Guse2013-01-092-0/+46
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version numbers 3.1 updates Restore database_update.php file to what it was in develop Get first forum to place global announcements in PHPBB3-9737
* | | | | | | [ticket/11103] Including the set call in the declaration throws errorsNathan Guse2013-01-151-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the set_notification_manager from the load_object function instead. PHPBB3-11103
* | | | | | | [ticket/11103] Fix some various issues, better commentsNathan Guse2013-01-151-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-0/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
| * | | | | | [ticket/11305] Define hook finder as a service on the container.Oleg Pudeyev2013-01-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| * | | | | | [ticket/11037] Update services.yml.Oleg Pudeyev2012-12-261-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-11037
* | | | | | [ticket/11103] Move is_enabled to a separate table for better performanceNathan Guse2012-12-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-12-121-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| | * | | | [feature/template-events] Inject extension manager into template class.Oleg Pudeyev2012-11-171-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template class passes extension manager to template compiler. Template compiler passes extension manager to template filter. Template filter will use extension manager to locate hooks as it is compiling templates. All extension manager arguments are optional. If an extension manager is not given, template hooks will not be invoked. PHPBB3-9550
* | | | | [ticket/11103] Use scope: prototypeNathan Guse2012-12-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us clean up the mess that was in load_object(), but requires scope: prototype to be added to the service definitions for all types or methods! PHPBB3-11103
* | | | | Merge branch 'ticket/11257' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-081-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/11257] Do not require set_name() method to existNathan Guse2012-12-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use Service Collection PHPBB3-11257
* | | | | [ticket/11103] Newlines at end of filesNathan Guse2012-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-9/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | [ticket/11256] Remove unused controller.provider serviceIgor Wiedler2012-12-071-3/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11256
| * | | | [ticket/11256] Remove unused service with non-existent classIgor Wiedler2012-12-071-6/+0
| | |_|/ | |/| | | | | | | | | | PHPBB3-11256
* | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-202-0/+70
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml phpBB/index.php
| * | | [feature/controller] Update routing documentation for using query stringDavid King2012-11-181-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [feature/controller] Separate Kernel listeners into their own classesDavid King2012-11-161-4/+15
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [feature/controller] Undo removal of period in ext.finder service definitionDavid King2012-11-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [feature/controller] Use a dumped url matcher class to improve performanceDavid King2012-11-161-17/+4
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [feature/controller] Update helper service given constructor changeDavid King2012-11-161-3/+6
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [feature/controller] Resolve trivial conflict I missed during rebaseDavid King2012-11-161-3/+0
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [feature/controller] Implement a front controllerDavid King2012-11-162-0/+72
| |/ / | | | | | | | | | PHPBB3-10864
* | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-203-57/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a very basic user loader class to handle querying/storing user data in a centralized location. Use DIC collection service for notification types/methods. Cleanup unused dependencies. Fix some other issues. PHPBB3-11103
* | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-141-11/+8
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/config/services.yml
| * | [ticket/11193] Instantiate a single collection_pass for all collectionsNils Adermann2012-11-111-0/+2
| |/ | | | | | | PHPBB3-11193
| * [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collectionIgor Wiedler2012-11-101-7/+0
| | | | | | | | PHPBB3-11152
| * [ticket/11152] Convert cron_task_collection to generic di_service_collectionIgor Wiedler2012-11-101-1/+1
| | | | | | | | PHPBB3-11152
| * [feature/compiled-dic] Fix cron tasks againDavid King2012-11-101-7/+3
| | | | | | | | PHPBB3-11152
| * [feature/compiled-dic] Fix cron task loadingDavid King2012-11-101-0/+4
| | | | | | | | | | | | | | | | We cannot use container tags at run time if we are using a cached, compiled container object (i.e. phpbb_cache_container) so we have to load them beforehand. PHPBB3-11152
| * [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-101-1/+3
| | | | | | | | PHPBB3-11152
* | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-1/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-021-1/+4
| | | | | | | | PHPBB3-10933
* | [ticket/11103] Inject table prefix to notifications system instead of constantsNathaniel Guse2012-11-093-0/+34
| | | | | | | | PHPBB3-11103
* | [ticket/11103] Use phpBB Container to load types/methodsNathaniel Guse2012-11-092-0/+274
| | | | | | | | PHPBB3-11103
* | [ticket/11103] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-041-1/+1
| | | | | | | | | | | | Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103
* | [ticket/11103] Use dependency injection instead of phpbb_containerNathan Guse2012-10-041-1/+9
| | | | | | | | PHPBB3-11103
* | [ticket/11103] Rename classesNathan Guse2012-10-041-1/+1
| | | | | | | | | | | | | | phpbb_notifications_service -> phpbb_notification_manager phpbb_notifications_ -> phpbb_notification_ PHPBB3-11103
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-09-141-1/+1
|\ \ | |/ | | | | | | Conflicts: phpBB/config/services.yml
| * [ticket/11101] Delay execution of container processorsIgor Wiedler2012-09-081-1/+1
| | | | | | | | | | | | Also fix the name of the ext processor service. PHPBB3-11101
* | [ticket/11103] The start of an all-encompassing notifications systemNathan Guse2012-09-081-0/+5
|/ | | | | | | | | | | This system will take input from various systems to store notifications and send notifications to users all in one nice extendable system. This system should act something like the notifications system on other social networking sites (in that, there is a single location where a user can see all of their notifications for various events). PHPBB3-11103
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631Unknown Bliss2012-09-011-0/+1
| | | | | | Conflicts: phpBB/common.php phpBB/download/file.php
* [feature/dic] Fix re-ordering of servicesIgor Wiedler2012-08-251-11/+11
| | | | PHPBB3-10739
* Merge remote-tracking branch 'upstream/develop' into feature/dicIgor Wiedler2012-08-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (259 commits) [prep-release-3.0.11] Bumping version number for 3.0.11 final. [feature/php-events] Fix doc of core.viewonline_overwrite_location [feature/php-events] Fix doc of core.user_set_default_group [feature/php-events] Fix doc of core.generate_smilies_after [feature/php-events] Fix doc of core.delete_user_after [feature/php-events] Fix doc of core.delete_user_before [feature/php-events] Fix doc of core.update_username [feature/php-events] Fix doc of core.memberlist_prepare_profile_data [feature/php-events] Fix doc and position of viewonline_overwrite_location [feature/php-events] Fix doc of core.viewtopic_get_post_data [feature/php-events] Fix doc of core.viewtopic_cache_guest_data [ticket/11061] Add the --dev flag to the composer instructions in README [ticket/11060] Make sure pyrus can install everything on travis [ticket/11059] Use https for the README logo [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum [feature/php-events] Fix core.acp_manage_forums_update_data_after vars [ticket/11032] fix language of error displayed [ticket/11052] update search backend constructor everywhere [ticket/11052] pass parametes to search construct while posting [ticket/11054] Fixed $config var description ... Conflicts: phpBB/includes/cron/task/core/tidy_cache.php phpBB/includes/cron/task/core/tidy_search.php
* [feature/dic] Re-order services alphabeticallyIgor Wiedler2012-08-251-54/+54
| | | | PHPBB3-10739
* [feature/dic] Add trailing newline to htaccessIgor Wiedler2012-07-261-1/+1
| | | | PHPBB3-10739
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-14 14:20:02 +0000