aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | [ticket/10714] Change $phpbb_dispatcher calls to the new layoutJoas Schilling2012-08-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add docblock for the test casesJoas Schilling2012-08-212-25/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Inject the global $phpbb_log into view_log()Joas Schilling2012-08-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Use phpbb_log class in view_log()Joas Schilling2012-08-212-293/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Implement get_logs() based on view_log()Joas Schilling2012-08-212-0/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I moved some stuff into its own function to make the code a bit clearer. PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add doc block for view_log functionJoas Schilling2012-08-211-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add incorrect offset calculation in view_log functionJoas Schilling2012-08-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add casts to integer values.Joas Schilling2012-08-211-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add unit tests for view_log functionJoas Schilling2012-08-212-0/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Rename add_log_function testJoas Schilling2012-08-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Use {@inheritDoc} instead of repeating the doc-blockJoas Schilling2012-08-211-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add missing log_operation to events in phpbb_logJoas Schilling2012-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add return null to phpbb_log and add param to constructorJoas Schilling2012-08-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Use keys for the log data instead of requiring a special orderJoas Schilling2012-08-212-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add @return null to doc blocksJoas Schilling2012-08-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Serialize the log_data in the testinsteadof hardcoding itJoas Schilling2012-08-211-50/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add unit tests for log classJoas Schilling2012-08-211-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Add unit tests for add_log functionJoas Schilling2012-08-212-0/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Create a phpbb_log object and inject it into add_logJoas Schilling2012-08-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Remove the dirty global hack to disable the log.Joas Schilling2012-08-211-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Use new phpbb_log class in add_log functionJoas Schilling2012-08-211-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | | | [ticket/10714] Implement a class to add logs to the database.Joas Schilling2012-08-212-0/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
* | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11386-3' into developDavid King2013-03-0410-160/+159
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11386-3: [ticket/11386] Fix missing ; [ticket/11386] Send list of migrations instead of using load_migrations
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3Nathaniel Guse2013-03-0478-1667/+4969
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/db/migrator.php
| * | | | | | | | | | | | [ticket/11386] Fix missing ;Nathaniel Guse2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11386
| * | | | | | | | | | | | [ticket/11386] Send list of migrations instead of using load_migrationsNathaniel Guse2013-03-0310-161/+160
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependency of extension manager for migrator. Keeping load_migrations function for others to use if they desire but requiring the finder be sent to it in order to use it. PHPBB3-11386
* | | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11394' into developDavid King2013-03-044-12/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11394: [ticket/11394] Relax Migration Tools
| * | | | | | | | | | | | [ticket/11394] Relax Migration ToolsNathaniel Guse2013-03-044-12/+8
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not throw as many exceptions in the migration tools (when something unexpected occurs but can be safely ignored). PHPBB3-11394
* | | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11393' into developDavid King2013-03-043-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11393: [ticket/11393] Give more information on database updater
| * | | | | | | | | | | [ticket/11393] Give more information on database updaterNathaniel Guse2013-03-033-2/+33
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11393
* | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11395' into developDavid King2013-03-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11395: [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
| * | | | | | | | | | | [ticket/11395] Prevent acp_modules::get_modules_info from reincluding filesNathaniel Guse2013-03-031-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11395
* | | | | | | | | | | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-0463-1143/+2430
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (100) and others # Via Marc Alexander (8) and Igor Wiedler (3) * remotes/marc/feature/avatars: (138 commits) [feature/avatars] Update module_auth of ucp module and fix small issues [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [feature/avatars] Auto-clear avatar dimensions when first changing avatars [feature/avatars] Use "Main" as category for avatars in root of gallery [feature/avatars] Remove trailing whitespace from avatar code [feature/avatars] Pass phpbb_user to prepare and process form functions [feature/avatars] Document the use of the allowed extensions array [feature/avatars] Use array for allowed extensions and implode if needed [feature/avatars] Use deprecated for compatibility function [feature/avatars] Correct license, copyright and package info [feature/avatars] Move list of supported formats to avatar driver class [feature/avatars] Add include of functions_display.php in BC function [feature/avatars] Add note about when compatibility function was added [feature/avatars] Add compatibility function for get_user_avatar() [feature/avatars] Move definition of driver_collection to avatars.yml [feature/avatars] Remove the obsolete request argument for avatar drivers [feature/avatars] Add missing @var to docblocks in avatar manager [feature/avatars] Remove not needed inline style [feature/avatars] Differentiate tests for get drivers functions ...
| * | | | | | | | | | | [feature/avatars] Update module_auth of ucp module and fix small issuesMarc Alexander2013-03-041-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced the check effectively_installed() to just checking for the config entry "allow_avatar_gravatar". Also added the missing update of the module_auth of the ucp_profile avatar mode. PHPBB3-10018
| * | | | | | | | | | | [feature/avatars] Add migrations data file for avatarsMarc Alexander2013-03-041-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module_auth of the ucp avatar settings are used for checking if the migration has already been installed. PHPBB3-10018
| * | | | | | | | | | | [feature/avatars] Reduce module auth of ucp avatar settingsMarc Alexander2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the avatar types that need to be enabled were hardcoded into the module auth. This is no longer needed in the new avatar system. PHPBB3-10018
| * | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-04183-3618/+12168
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * | | | | | | | | | | [feature/avatars] Auto-clear avatar dimensions when first changing avatarsMarc Alexander2013-02-282-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the remote avatar and gravatar the dimension input boxes will now be cleared when changing the avatar. This will only happen once per page-load. Any input after the first change will not trigger this. PHPBB3-10018
| * | | | | | | | | | | [feature/avatars] Use "Main" as category for avatars in root of galleryMarc Alexander2013-02-192-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change the whole avatar gallery path would show as category. Additionally, the avatars that were selected like that had an incorrect path and didn't show up correctly. With this patch it'll display "Main" as category and properly work. PHPBBB3-10018
| * | | | | | | | | | | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-196-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | | | | | | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-1911-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpbb_user object might be used for language variables and other things. PHPBB3-10018
| * | | | | | | | | | | [feature/avatars] Document the use of the allowed extensions arrayMarc Alexander2013-02-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | | | | | | [feature/avatars] Use array for allowed extensions and implode if neededMarc Alexander2013-02-074-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-0779-411/+4450
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | | | | | | | | | [feature/avatars] Use deprecated for compatibility functionMarc Alexander2013-02-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved use of global variables inside the only if statement they are used in. PHPBB3-10018
| * | | | | | | | | | | | [feature/avatars] Correct license, copyright and package infoMarc Alexander2013-02-038-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | | | | | | | [feature/avatars] Move list of supported formats to avatar driver classMarc Alexander2013-01-254-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the regex and turning it into an array if necessary seemed like the cleanest approach to achieve this. PHPBB3-10018
| * | | | | | | | | | | | [feature/avatars] Add include of functions_display.php in BC functionMarc Alexander2013-01-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The needed function phpbb_get_avatar() is defined in includes/functions_display.php. Include that file in the backwards compatible function get_user_avatar(). PHPBB3-10018
| * | | | | | | | | | | | [feature/avatars] Add note about when compatibility function was addedMarc Alexander2013-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | | | | | | | [feature/avatars] Add compatibility function for get_user_avatar()Marc Alexander2013-01-222-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018