aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* 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-043-139/+197
|\ \
| * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-045-31/+70
| |\ \ | | |/
| * | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-192-6/+5
| * | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-192-4/+4
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-1/+1
| |\ \
| * | | [feature/avatars] Pass phpbb_user object to prepare_form_acp()Marc Alexander2013-01-081-1/+1
| * | | [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-072-4/+4
| * | | [feature/avatars] Use empty() instead of sizeof()Marc Alexander2013-01-072-2/+2
| * | | [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-062-28/+3
| * | | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-042-2/+2
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-046-39/+36
| |\ \ \
| * | | | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-272-2/+2
| * | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-242-3/+3
| |\ \ \ \
| * | | | | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-112-3/+3
| * | | | | [feature/avatars] Fix behavior of avatar manager and variablesMarc Alexander2012-12-042-6/+6
| * | | | | [feature/avatars] Use seperate function for retrieving the config nameMarc Alexander2012-12-041-1/+1
| * | | | | [feature/avatars] Use seperate function for retrieving all driversMarc Alexander2012-12-041-1/+1
| * | | | | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-042-4/+4
| * | | | | [feature/avatars] Create setting for enabling avatar in managerMarc Alexander2012-11-301-3/+10
| * | | | | [feature/avatars] Fix variable namesMarc Alexander2012-11-303-32/+28
| * | | | | [feature/avatars] Let avatar manager handle $ignore_configMarc Alexander2012-11-301-1/+1
| * | | | | [feature/avatars] Get list of enabled drivers from avatar managerMarc Alexander2012-11-303-39/+33
| * | | | | [feature/avatars] Implement better treatment of avatar errorsMarc Alexander2012-11-252-13/+11
| * | | | | [feature/avatars] Small cosmetic changesMarc Alexander2012-11-252-4/+3
| * | | | | [feature/avatars] Add static methods for handling driver namesMarc Alexander2012-11-252-6/+6
| * | | | | [feature/avatars] Small fixesMarc Alexander2012-11-251-7/+4
| * | | | | [feature/avatars] Only create avatar objects if necessaryMarc Alexander2012-11-253-3/+8
| * | | | | [feature/avatars] Miscellaneous fixesMarc Alexander2012-11-252-11/+15
| * | | | | [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-252-16/+16
| * | | | | [feature/avatars] Move avatar specific settings to driversMarc Alexander2012-11-211-9/+15
| * | | | | [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-182-2/+14
| * | | | | [feature/avatars] Fix acp front-end of user and group avatarsMarc Alexander2012-11-172-30/+33
| * | | | | [feature/avatars] Add gravatar to avatar settingsMarc Alexander2012-11-161-0/+1
| * | | | | [feature/avatars] Fix coding guidelines infractionsMarc Alexander2012-11-121-1/+2
| * | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-122-137/+198
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-217-32/+60
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-275-8/+23
| | |\ \ \ \ \ \
| | * | | | | | | [feature/avatars] Do not assign in an if statementIgor Wiedler2012-04-081-1/+2
| | * | | | | | | [feature/avatars] Simplify clean_row, move it to avatar managerIgor Wiedler2012-04-082-2/+2
| | * | | | | | | [feature/avatars] Introduce an avatar driver interfaceIgor Wiedler2012-04-082-2/+2
| | * | | | | | | [feature/avatars] Introduce global phpbb_avatar_managerIgor Wiedler2012-04-082-13/+9
| | * | | | | | | [feature/avatars] Use request object in avatar driversIgor Wiedler2012-04-072-3/+4
| | * | | | | | | Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-0713-2215/+1017
| | |\ \ \ \ \ \ \
| | * | | | | | | | [feature/avatars] Support editing of group avatars in ACPCullen Walsh2012-03-182-89/+92
| | * | | | | | | | [feature/avatars] Made ACP avatar gallery in Manage Users prettierCullen Walsh2012-03-181-3/+11
| | * | | | | | | | [feature/avatars] Update ACP manage users, fix gallery focus issueCullen Walsh2012-03-181-41/+43
| | * | | | | | | | [feature/avatars] Dynamically list the avatar types in UCP and ACPCullen Walsh2012-03-181-42/+94
| | * | | | | | | | [feature/avatars] Support proper avatar deletion, stub ACPCullen Walsh2012-03-181-4/+5