aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-111-2/+2
|\
| * [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-241-2/+2
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-051-46/+104
|\ \ | |/
| * [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-191-2/+2
| * [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-191-2/+2
| * [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-071-2/+2
| * [feature/avatars] Use empty() instead of sizeof()Marc Alexander2013-01-071-1/+1
| * [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-061-12/+1
| * [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-041-1/+1
| * [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-271-1/+1
| * [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-111-2/+2
| * [feature/avatars] Use seperate function for retrieving the config nameMarc Alexander2012-12-041-1/+1
| * [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-041-2/+2
| * [feature/avatars] Fix variable namesMarc Alexander2012-11-301-18/+16
| * [feature/avatars] Get list of enabled drivers from avatar managerMarc Alexander2012-11-301-19/+16
| * [feature/avatars] Implement better treatment of avatar errorsMarc Alexander2012-11-251-8/+6
| * [feature/avatars] Small cosmetic changesMarc Alexander2012-11-251-2/+2
| * [feature/avatars] Add static methods for handling driver namesMarc Alexander2012-11-251-3/+3
| * [feature/avatars] Only create avatar objects if necessaryMarc Alexander2012-11-251-1/+4
| * [feature/avatars] Miscellaneous fixesMarc Alexander2012-11-251-5/+7
| * [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-251-8/+8
| * [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-181-1/+7
| * [feature/avatars] Fix acp front-end of user and group avatarsMarc Alexander2012-11-171-11/+15
| * Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-121-47/+108
| |\
| | * Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-211-12/+14
| | |\
| | * \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-271-0/+8
| | |\ \
| | * | | [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-081-1/+1
| | * | | [feature/avatars] Introduce an avatar driver interfaceIgor Wiedler2012-04-081-1/+1
| | * | | [feature/avatars] Introduce global phpbb_avatar_managerIgor Wiedler2012-04-081-7/+5
| | * | | [feature/avatars] Use request object in avatar driversIgor Wiedler2012-04-071-2/+3
| | * | | Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-071-2/+2
| | |\ \ \
| | * | | | [feature/avatars] Support editing of group avatars in ACPCullen Walsh2012-03-181-1/+0
| | * | | | [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
| | * | | | [feature/avatars] Modularized AvatarsCullen Walsh2012-03-181-1/+1
* | | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-...Joas Schilling2012-11-101-5/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-171-2/+2
| * | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-091-2/+2
| * | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-081-2/+2
| * | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-031-3/+3
* | | | | | [feature/soft-delete] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-101-2/+2
* | | | | | [feature/soft-delete] Fix sync() and some more functions to use the new fieldsJoas Schilling2012-10-221-5/+7
* | | | | | [feature/soft-delete] Lay the groundwork for a soft-delete featureJosh Woody2012-08-291-2/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-201-6/+43
|\ \ \ \ \
| * | | | | [feature/php-events] Add core.acp_users_overview_run_quicktoolJoas Schilling2012-08-051-0/+13
| * | | | | [feature/php-events] Add core.acp_users_overview_modify_dataJoas Schilling2012-08-051-0/+12
| * | | | | [feature/php-events] Move and fix event core.acp_users_display_overviewJoas Schilling2012-08-051-9/+17