aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-141-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/9871-2: [ticket/9871] Can set current version to use instead of the phpBB version [ticket/9871] Fix indentation on comment [ticket/9871] Fix test name [ticket/9871] Split fast and slow version tests [ticket/9871] Option to force the stability when checking for updates [ticket/9871] Allow setting the host/file to load for the version class [ticket/9871] Restore get_remote_file_test [ticket/9871] Fix tests [ticket/9871] Typehint and comment on var types [ticket/9871] Mark test as slow [ticket/9871] Restore phpbb_version_compare [ticket/9871] Restore get_remote_file [ticket/9871] Use $request->variable instead of request_var [ticket/9871] Update version check file to use json format
| * [ticket/9871] Allow setting the host/file to load for the version classNathan Guse2014-03-101-0/+1
| | | | | | | | PHPBB3-9871
| * [ticket/9871] Update version check file to use json formatNathan Guse2014-02-191-0/+7
| | | | | | | | PHPBB3-9871
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into developJoas Schilling2014-03-111-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11271-develop: (25 commits) [ticket/11271] Make path conversion more precise [ticket/11271] limit absolute path conversion to attachment links only [ticket/11271] Add docblock of feed_generate_content( ) [ticket/11271] Fix tabs and use !empty( ) instead of count( ) [ticket/11271] Remove unnecessary inclusion of functions_display [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. [ticket/11271] Removing unnecessary database object [ticket/11271] Separated attachment fetching query [ticket/11271] Fetched feed attachments before loop. [ticket/11271] Removed in-line attachment comments properly. [ticket/11271] Displaying in-line attached images in ATOM feed. [ticket/11271] Add the inline images html to content [ticket/11271] Use class variable $db instead of global [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. ...
| * | Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * ticket/11271: [ticket/11271] Make path conversion more precise Conflicts: phpBB/feed.php
* | | [ticket/12090] Move find() call to container and fix testsJoas Schilling2014-03-091-0/+2
| | | | | | | | | | | | PHPBB3-12090
* | | [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-081-1/+6
| | | | | | | | | | | | PHPBB3-12090
* | | [ticket/12090] Fix pagination for routesJoas Schilling2014-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | | No clickable "jump to" at the moment, as we can not get the route url by the route name in js yet. Need to find another solution later. PHPBB3-12090
* | | [ticket/12090] Pass route name to url() to allow admins to change the routesJoas Schilling2014-03-071-0/+1
| | | | | | | | | | | | PHPBB3-12090
* | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-031-0/+9
| |/ |/| | | | | PHPBB3-12187
* | [ticket/11880] Move get_schema_steps function to a migrator helper classNathan Guse2014-02-051-0/+4
| | | | | | | | PHPBB3-11880
* | [ticket/12156] Add missing passwords manager to oauthMarc Alexander2014-02-031-0/+1
| | | | | | | | PHPBB3-12156
* | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-023-0/+87
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11201: (50 commits) [ticket/11201] Remove empty calls section from .yml [ticket/11201] Split template file into multiple files [ticket/11201] Remove dependency from types on the manager [ticket/11201] Rename profilefields class to manager [ticket/11201] Fix parameter description [ticket/11201] Use !== null, its faster [ticket/11201] Also translate profile fields in UCP and ACP [ticket/11201] Add parameters and variables to profile field class [ticket/11201] Add commas on last array entry [ticket/11201] Allow translation of profile field name and explanation [ticket/11201] Fix some variable names [ticket/11201] Add tables to constructor in tests [ticket/11201] Add a method to return the translated full name of the type [ticket/11201] Remove db depending code from field class [ticket/11201] Add variables to classes and add constructor doc blocks [ticket/11201] Update copyright in class file [ticket/11201] Add visibility and remove unused variable [ticket/11201] Add some commas at the last array entry [ticket/11201] Cast some variables to integer [ticket/11201] Inject table names rather then using constants ... Conflicts: phpBB/config/services.yml
| * | [ticket/11201] Remove empty calls section from .ymlJoas Schilling2014-02-021-1/+0
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Remove dependency from types on the managerJoas Schilling2014-02-021-12/+9
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-021-5/+5
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Inject table names rather then using constantsJoas Schilling2014-01-182-0/+8
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Add database column type to type classJoas Schilling2014-01-151-0/+2
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Use a service collection for the types instead of the containerJoas Schilling2014-01-151-2/+2
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Split language options into a new classJoas Schilling2014-01-151-2/+15
| | | | | | | | | | | | | | | | | | Otherwise we run into a circular dependency PHPBB3-11201
| * | [ticket/11201] Move generate_field() method to type classJoas Schilling2014-01-141-0/+6
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move get_profile_field() to type classesJoas Schilling2014-01-131-0/+7
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move get_options to type classesJoas Schilling2014-01-131-11/+41
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Remove global use from admin classJoas Schilling2014-01-101-0/+1
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-102-0/+24
| |/ | | | | | | PHPBB3-11201
* | Merge pull request #1716 from marc1706/feature/passwordsNils Adermann2014-02-023-0/+66
|\ \ | | | | | | [feature/passwords] Add password hashing manager with support for newer hashing algorithms
| * | [feature/passwords] Get rid of set_name/get_name methods for passwords driversMarc Alexander2014-02-021-8/+0
| | | | | | | | | | | | PHPBB3-11610
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-296-3/+148
| |\ \ | | |/ | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | [feature/passwords] Pass list of default types to passwords managerMarc Alexander2013-10-271-2/+6
| | | | | | | | | | | | | | | | | | | | | This list is in the order of how the driver types would be used. If a driver is not supported we will try the subsequent one. PHPBB3-11610
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-031-6/+10
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * | | [feature/passwords] Inject passwords manager into auth providersMarc Alexander2013-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The passwords manager will replace the old method of using the functions phpbb_hash() and phpbb_check_hash(). PHPBB3-11610
| * | | [feature/passwords] Pass config via service container to driver helperMarc Alexander2013-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This will get rid of the global $config in the driver helper PHPBB3-11610
| * | | [feature/passwords] More changes due to namespacingMarc Alexander2013-09-271-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11610
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-09-278-113/+178
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/develop/create_schema_files.php
| * | | | [feature/passwords] Use dependency injection for passwords driver helperMarc Alexander2013-09-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The passwords driver helper is now injected into the driver base instead of being manually loaded. PHPBB3-11610
| * | | | [feature/passwords] Use dependency injection for helperMarc Alexander2013-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now be used instead of manually loading the passwords helper instance in the passwords manager. PHPBB3-11610
| * | | | [feature/passwords] Do not pass phpbb_container to passwords managerMarc Alexander2013-09-201-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11610
| * | | | [feature/passwords] Rename "crypto" files to "passwords" filesMarc Alexander2013-09-143-55/+55
| | | | | | | | | | | | | | | | | | | | PHPBB3-11610
| * | | | [feature/passwords] Define default hashing algorithm in container fileMarc Alexander2013-09-142-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default hashing algorithm type is defined as a parameter in the service definition file for the password hashing system. This will allow us to change this in the future but it will also prevent unexperienced admins from changing the hashing algorithm. PHPBB3-11610
| * | | | [feature/passwords] Add get_name() method to driversMarc Alexander2013-09-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to actually properly differentiate between the available drivers. PHPBB3-11610
| * | | | [feature/passwords] Add service collection file crypto.ymlMarc Alexander2013-09-142-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will contain definitions of the services and the service collection that will be passed to the passwords manager. PHPBB3-11610
| * | | | [feature/passwords] Add basic implementation of passwords managerMarc Alexander2013-09-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The passwords manager is capable of checking and hashing passwords. It will support different hashing algorithms. PHPBB3-11610
* | | | | Merge pull request #1893 from nickvergessen/ticket/12039Andreas Fischer2014-01-121-0/+35
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12039] Add config:* to the command line interface tool * nickvergessen/ticket/12039: [ticket/12039] Allow getting the value without a new line at the end [ticket/12039] Do not print success message when config did not exist [ticket/12039] Do not colour returned value in get command [ticket/12039] Update command descriptions [ticket/12039] Remove debug code [ticket/12039] Fix option descriptions [ticket/12039] Use an abstract class and some more minor adjustments [ticket/12039] Add config:* to the command line interface tool
| * | | | [ticket/12039] Use an abstract class and some more minor adjustmentsJoas Schilling2013-11-271-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12039
| * | | | [ticket/12039] Add config:* to the command line interface toolJoas Schilling2013-11-261-0/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-12039
* | | | | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-251-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Joas Schilling # Via Joas Schilling * nickvergessen/feature/pagination-class: [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class
| * | | | | [ticket/11849] Add service definitionJoas Schilling2013-12-181-0/+6
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11849
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912Marc Alexander2013-11-233-3/+64
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | [ticket/12008] Update the run time value for the prune notifications cron taskCesar G2013-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12008
| * | | | Merge pull request #1871 from nickvergessen/ticket/12016Nils Adermann2013-11-131-1/+8
| |\ \ \ \ | | | | | | | | | | | | Ticket/12016 Event listeners should be services