aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-302-21/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/10899] Update doc block [ticket/10899] Use isset($field_value['IN']) [ticket/10899] Add event core.delete_log [ticket/10899] Remove trailing ; [ticket/10899] Fix typo in the class name [ticket/10899] Add unit tests [ticket/10899] Get $phpbb_log from the container [ticket/10899] Remove extra ';' [ticket/10899] Typo [ticket/10899] Refactoring in \phpbb\log\log_interface [ticket/10899] Using Delete All in log viewer with keyword search
| * Merge pull request #2433 from Nicofuma/ticket/10899Joas Schilling2014-05-302-21/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10899] Using Delete All in log viewer with keyword search * Nicofuma/ticket/10899: [ticket/10899] Update doc block [ticket/10899] Use isset($field_value['IN']) [ticket/10899] Add event core.delete_log [ticket/10899] Remove trailing ; [ticket/10899] Fix typo in the class name [ticket/10899] Add unit tests [ticket/10899] Get $phpbb_log from the container [ticket/10899] Remove extra ';' [ticket/10899] Typo [ticket/10899] Refactoring in \phpbb\log\log_interface [ticket/10899] Using Delete All in log viewer with keyword search
| | * [ticket/10899] Get $phpbb_log from the containerTristan Darricau2014-05-271-1/+3
| | | | | | | | | | | | PHPBB3-10899
| | * [ticket/10899] Refactoring in \phpbb\log\log_interfaceTristan Darricau2014-05-102-30/+28
| | | | | | | | | | | | PHPBB3-10899
| | * [ticket/10899] Using Delete All in log viewer with keyword searchTristan Darricau2014-05-102-4/+18
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-10899 PHPBB3-10899
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-302-9/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11942] Don't change the reason to '' when hard deleting [ticket/11942] Don't show the checkbox if the post is already soft-deleted [ticket/11942] Remove useless IF in templates [ticket/11942] Apply the modifications to subsilver [ticket/11942] Always display delete reason [ticket/11942] Edits messages [ticket/11942] Change the formulation [ticket/11942] Adding the reason to hard deleted topic/post [ticket/11942] Delete post/topic reason should be added to logs
| * | Merge pull request #2357 from Nicofuma/ticket/11942Joas Schilling2014-05-302-9/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11942] Delete post/topic reason should be added to logs * Nicofuma/ticket/11942: [ticket/11942] Don't change the reason to '' when hard deleting [ticket/11942] Don't show the checkbox if the post is already soft-deleted [ticket/11942] Remove useless IF in templates [ticket/11942] Apply the modifications to subsilver [ticket/11942] Always display delete reason [ticket/11942] Edits messages [ticket/11942] Change the formulation [ticket/11942] Adding the reason to hard deleted topic/post [ticket/11942] Delete post/topic reason should be added to logs
| | * | [ticket/11942] Don't change the reason to '' when hard deletingTristan Darricau2014-05-291-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11942
| | * | [ticket/11942] Always display delete reasonTristan Darricau2014-05-111-2/+0
| | | | | | | | | | | | | | | | PHPBB3-11942
| | * | [ticket/11942] Edits messagesNicofuma2014-05-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11942
| | * | [ticket/11942] Adding the reason to hard deleted topic/postNicofuma2014-05-041-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11942
| | * | [ticket/11942] Delete post/topic reason should be added to logsNicofuma2014-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11942 PHPBB3-11942
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-302-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11467] Add user object to extension manager for tests [ticket/11467] Add language variables to tests [ticket/11467] Add language variables for extension exception messages
| * | | Merge pull request #2447 from n-aleha/ticket/11467Joas Schilling2014-05-302-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11467] Add language variables for extension exception messages * n-aleha/ticket/11467: [ticket/11467] Add user object to extension manager for tests [ticket/11467] Add language variables to tests [ticket/11467] Add language variables for extension exception messages
| | * | | [ticket/11467] Add language variables for extension exception messagesn-aleha2014-05-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hard-coded messages and add language variables for extension exception messages. PHPBB3-11467
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-301-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11266] Better message for when composer dependencies are missing.
| * | | | Merge pull request #2512 from bantu/ticket/11266Joas Schilling2014-05-301-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11266] Better message for when composer dependencies are missing... * bantu/ticket/11266: [ticket/11266] Better message for when composer dependencies are missing.
| | * | | | [ticket/11266] Better message for when composer dependencies are missing.Andreas Fischer2014-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11266
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-b4] Update phpBB Version for b5 development [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4 [prep-release-3.1.0-b4] Prepare Changelog [prep-release-3.1.0-b4] Add migration for 3.1.0-b4 [prep-release-3.1.0-b4] Update version to 3.1.0-b4
| * | | | | [prep-release-3.1.0-b4] Update phpBB Version for b5 developmentJoas Schilling2014-05-301-1/+1
| | | | | |
| * | | | | [prep-release-3.1.0-b4] Update version to 3.1.0-b4Joas Schilling2014-05-301-1/+1
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-291-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11226] Explicity set file_moved to false [ticket/11226] Add tests [ticket/11226] Use $user->lang() [ticket/11226] filespec::move_file() should error correctly
| * | | | Merge pull request #2432 from Nicofuma/ticket/11226Joas Schilling2014-05-291-0/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11226] filespec::move_file() should error correctly * Nicofuma/ticket/11226: [ticket/11226] Explicity set file_moved to false [ticket/11226] Add tests [ticket/11226] Use $user->lang() [ticket/11226] filespec::move_file() should error correctly
| | * | | [ticket/11226] Explicity set file_moved to falseTristan Darricau2014-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11226
| | * | | [ticket/11226] Use $user->lang()Tristan Darricau2014-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11226
| | * | | [ticket/11226] filespec::move_file() should error correctlyTristan Darricau2014-05-101-0/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-11226
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-283-40/+180
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: (29 commits) [ticket/11366] Fix headings css in list page [ticket/11366] Add config value in schema_data.sql [ticket/11366] Fix HTML [ticket/11366] Exchange links and settings' form [ticket/11366] Remove the extra {S_FORM_TOKEN} [ticket/11366] Move the links to the top of the page [ticket/11366] Hide the version check settings by default [ticket/11366] Versions, options and actions heading should be centered [ticket/11366] Better language string for "recheck all" [ticket/11366] Move "recheck all" link [ticket/11366] Add $config['extension_force_unstable'] [ticket/11366] Use force_cache on the list page [ticket/11366] Add recheck-all link [ticket/11366] Force the use of the cache on the list page [ticket/11366] Update FILE_NOT_FOUND language string [ticket/11366] Fix whitespaces [ticket/11366] Update FILE_NOT_FOUND language string [ticket/11366] Update var names [ticket/11366] Align language strings [ticket/11366] Fix detailed view ...
| * | | [ticket/11366] Add $config['extension_force_unstable']Tristan Darricau2014-05-281-1/+31
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Use force_cache on the list pageTristan Darricau2014-05-281-6/+10
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Add recheck-all linkTristan Darricau2014-05-281-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Force the use of the cache on the list pageTristan Darricau2014-05-281-4/+7
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Update FILE_NOT_FOUND language stringTristan Darricau2014-05-282-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Fix whitespacesTristan Darricau2014-05-281-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Update var namesTristan Darricau2014-05-281-16/+13
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Fix detailed viewTristan Darricau2014-05-281-2/+4
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Remove the double spacesTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Coding styleTristan Darricau2014-05-281-33/+33
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Adding a missing commitNicofuma2014-05-281-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11366
| * | | [ticket/11366] Bug Fix: Extensions removed but still registred in DBNicofuma2014-05-281-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fix the bug with the Extensions removed but still registred in DB PHPBB3-11366
| * | | [ticket/11366] Moving to \phpbb\version_helperNicofuma2014-05-281-30/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + bug fix (missing exception) + Using \phpbb\version_helper So, now, the version file have a new format : { "stable": { "<branch>": { "current": "<version>", [ "announcement": "<announcement link>", ] [ "download": "<download link>", ] }, "<branch>": { ... } }, "unstable": { } } PHPBB3-11366
| * | | [ticket/11366] Extension's version's checkNicofuma2014-05-281-26/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a feature to check automatically the version of the installed extensions. The informations are cached for 24 hours (like for the global update check on the main page of the acp). The informations about the versions are display both on the global list and on the detailled page. To do this the developper has to to let the composer.json of the latest version available and add some informations into it : "extra": { "version-check": { "host": "<the host>", "directory": "<the directory containing the file>", "filename": "<the composer.json of the latest version>" } } He can also add two extra informations which will be displayed if a new version is available : "extra": { "download": "<download link>", "annoucement": "<announcement link>", } Currently a notice is displayed when the "extra.version-check" informations are missing. Ticket: https://tracker.phpbb.com/browse/PHPBB3-11366 Signed-off-by: Nicofuma <github@nicofuma.fr> PHPBB3-11366
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-28156-835/+1109
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12594] Replace phpBB Group with phpBB Limited [ticket/12594] Update footer credit lines [ticket/12594] Remove @package tags and update file headers
| * | | [ticket/12594] Replace phpBB Group with phpBB LimitedYuriy Rusko2014-05-285-5/+5
| | | | | | | | | | | | | | | | PHPBB3-12594
| * | | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-282-2/+12
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-271-1031/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/hook_system.html
| * | | | | [ticket/12594] Update footer credit linesYuriy Rusko2014-05-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12594
| * | | | | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-27156-827/+1101
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12594
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-282-2/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12509] Add example in doc block [ticket/12509] Add missing ',' in arrays [ticket/12509] Update calls to set_custom_style in forgotten places [ticket/12509] Fix path in adm/index.php [ticket/12509] Fix typo in adm/index.php [ticket/12509] Fix doc block [ticket/12509] Fix the call to set_custom_file in adm/index and messenger [ticket/12509] Update acp custom_style setter [ticket/12509] Add an option to set the path of custom file for extensions
| * | | | | Merge pull request #2455 from Nicofuma/ticket/12509Joas Schilling2014-05-282-2/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12509] Add an option to set the path of custom style directory (ie: email templates) for extensions * Nicofuma/ticket/12509: [ticket/12509] Add example in doc block [ticket/12509] Add missing ',' in arrays [ticket/12509] Update calls to set_custom_style in forgotten places [ticket/12509] Fix path in adm/index.php [ticket/12509] Fix typo in adm/index.php [ticket/12509] Fix doc block [ticket/12509] Fix the call to set_custom_file in adm/index and messenger [ticket/12509] Update acp custom_style setter [ticket/12509] Add an option to set the path of custom file for extensions
| | * | | | [ticket/12509] Add missing ',' in arraysTristan Darricau2014-05-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509