aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3Nathaniel Guse2013-03-0470-1376/+3695
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11395' into developDavid King2013-03-041-2/+2
| |\
| | * [ticket/11395] Prevent acp_modules::get_modules_info from reincluding filesNathaniel Guse2013-03-031-2/+2
| * | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-0460-1143/+2302
| |\ \
| | * | [feature/avatars] Update module_auth of ucp module and fix small issuesMarc Alexander2013-03-041-9/+12
| | * | [feature/avatars] Add migrations data file for avatarsMarc Alexander2013-03-041-0/+64
| | * | [feature/avatars] Reduce module auth of ucp avatar settingsMarc Alexander2013-03-041-1/+1
| | * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-04168-3585/+11297
| | |\ \ | | | |/
| | * | [feature/avatars] Auto-clear avatar dimensions when first changing avatarsMarc Alexander2013-02-282-0/+28
| | * | [feature/avatars] Use "Main" as category for avatars in root of galleryMarc Alexander2013-02-192-6/+9
| | * | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-196-17/+16
| | * | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-199-18/+20
| | * | [feature/avatars] Document the use of the allowed extensions arrayMarc Alexander2013-02-131-1/+6
| | * | [feature/avatars] Use array for allowed extensions and implode if neededMarc Alexander2013-02-074-4/+9
| | * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-0752-407/+2977
| | |\ \
| | * | | [feature/avatars] Use deprecated for compatibility functionMarc Alexander2013-02-031-4/+5
| | * | | [feature/avatars] Correct license, copyright and package infoMarc Alexander2013-02-038-22/+22
| | * | | [feature/avatars] Move list of supported formats to avatar driver classMarc Alexander2013-01-254-3/+8
| | * | | [feature/avatars] Add include of functions_display.php in BC functionMarc Alexander2013-01-241-1/+8
| | * | | [feature/avatars] Add note about when compatibility function was addedMarc Alexander2013-01-221-1/+2
| | * | | [feature/avatars] Add compatibility function for get_user_avatar()Marc Alexander2013-01-222-0/+42
| | * | | [feature/avatars] Move definition of driver_collection to avatars.ymlMarc Alexander2013-01-152-7/+7
| | * | | [feature/avatars] Remove the obsolete request argument for avatar driversMarc Alexander2013-01-151-4/+0
| | * | | [feature/avatars] Add missing @var to docblocks in avatar managerMarc Alexander2013-01-091-0/+4
| | * | | [feature/avatars] Remove not needed inline styleMarc Alexander2013-01-081-1/+1
| | * | | [feature/avatars] Strictly check if avatar list is empty and cache resultMarc Alexander2013-01-081-2/+3
| | * | | [feature/avatars] Pass phpbb_user object to prepare_form_acp()Marc Alexander2013-01-085-7/+7
| | * | | [feature/avatars] Pass phpbb_user object to get_custom_html()Marc Alexander2013-01-084-4/+7
| | * | | [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-0710-41/+36
| | * | | [feature/avatars] Use empty() instead of sizeof()Marc Alexander2013-01-072-2/+2
| | * | | [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-065-58/+35
| | * | | [feature/avatars] Add missing docblocks to avatar managerMarc Alexander2013-01-051-0/+16
| | * | | [feature/avatars] Change avatar javascript to conform to new coding guidelinesMarc Alexander2013-01-043-9/+9
| | * | | [feature/avatars] Improve handling of incorrect input for avatarsMarc Alexander2013-01-043-1/+14
| | * | | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-0410-23/+23
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-0446-270/+518
| | |\ \ \
| | * | | | [feature/avatars] Inform user of no available local avatarsMarc Alexander2013-01-043-0/+11
| | * | | | [feature/avatars] Let the server handle http or https for gravatarsMarc Alexander2012-12-271-1/+1
| | * | | | [feature/avatars] Add missing explanation to docblock of get_all_drivers()Marc Alexander2012-12-271-0/+4
| | * | | | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-277-28/+28
| | * | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-2495-2041/+3003
| | |\ \ \ \
| | * | | | | [feature/avatars] Use callback method in avatar manager's clean rowMarc Alexander2012-12-171-7/+12
| | * | | | | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-117-21/+31
| | * | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-09119-594/+2289
| | |\ \ \ \ \
| | * | | | | | [feature/avatars] Call set_name() method in avatars.ymlMarc Alexander2012-12-091-0/+8
| | * | | | | | [feature/avatars] Fix behavior of avatar manager and variablesMarc Alexander2012-12-043-16/+16
| | * | | | | | [feature/avatars] Use seperate function for retrieving the config nameMarc Alexander2012-12-042-4/+16
| | * | | | | | [feature/avatars] Use seperate function for retrieving all driversMarc Alexander2012-12-042-4/+23
| | * | | | | | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-048-18/+18
| | * | | | | | [feature/avatars] Removed unneeded dependenciesMarc Alexander2012-12-012-13/+1