aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/nickv/ticket/10714' into developNathaniel Guse2013-03-041-3/+5
|\
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-221-31/+60
| |\
| * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-161-10/+10
| |\ \
| * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-071-89/+137
| |\ \ \
| * | | | [ticket/10714] Refactor disable mechanism to only disable certain typesJoas Schilling2012-08-211-2/+2
| * | | | [ticket/10714] Remove the dirty global hack to disable the log.Joas Schilling2012-08-211-3/+5
* | | | | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-041-466/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-31/+60
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-041-10/+10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | [feature/avatars] Remove obsolete functions from functions_user.phpMarc Alexander2012-11-221-466/+0
| * | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-121-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-211-6/+34
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-271-54/+25
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-071-0/+33
| | |\ \ \ \ \ \
| | * | | | | | | [feature/avatars] Support proper avatar deletion, stub ACPCullen Walsh2012-03-181-0/+1
* | | | | | | | | [ticket/10411] Catch exceptions from grouppositionsJoas Schilling2013-02-261-19/+65
* | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-251-41/+70
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | [ticket/9492] Fix typo in SQL queryJoas Schilling2013-01-201-1/+1
| * | | | | | | | [ticket/9492] Ensure to delete the avatar/rank data when we change itJoas Schilling2013-01-171-2/+2
| * | | | | | | | [ticket/9492] Fix undefined user_avatar_* values when updating the group avatarJoas Schilling2013-01-171-11/+17
| * | | | | | | | [ticket/9492] Retain custom ranks and avatars when setting users default groupJoas Schilling2013-01-171-30/+53
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-021-2/+2
| * | | | | | | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-151-2/+2
| * | | | | | | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-151-6/+6
| |/ / / / / /
* | | | | | | [ticket/10411] Fix logic error when editing/creating a groupJoas Schilling2012-11-141-3/+13
* | | | | | | [ticket/10411] Use DIC to get the groupposition classesJoas Schilling2012-11-141-7/+9
* | | | | | | [ticket/10411] Fix create_group and delete_group functionsJoas Schilling2012-11-141-36/+28
|/ / / / / /
* | | | | | Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-101-4/+6
|\ \ \ \ \ \
| * | | | | | [ticket/10939] Modified functions_user.php to not use $_FILESFyorl2012-08-151-4/+6
| | |_|_|/ / | |/| | | |
* | | | | | [feature/prune-users] $author_id_sql is no longer needed here.Oleg Pudeyev2012-11-061-2/+0
* | | | | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-061-76/+224
|\ \ \ \ \ \
| * | | | | | [feature/add_events] Globalize event dispatcher object in some functionsDavid King2012-08-221-0/+1
| * | | | | | [feature/add_events] Event to modify the data array for when a user is addedDavid King2012-08-211-0/+10
| | |_|_|_|/ | |/| | | |
| * | | | | [feature/php-events] Fix doc of core.user_set_default_groupJoas Schilling2012-08-201-1/+1
| * | | | | [feature/php-events] Fix doc of core.delete_user_afterJoas Schilling2012-08-201-1/+1
| * | | | | [feature/php-events] Fix doc of core.delete_user_beforeJoas Schilling2012-08-201-1/+1
| * | | | | [feature/php-events] Fix doc of core.update_usernameJoas Schilling2012-08-201-1/+1
| * | | | | [feature/php-events] Fix docs and naming of core.user_set_default_groupJoas Schilling2012-08-011-1/+12
| * | | | | [feature/php-events] Fix docs and naming of core.group_delete_user_beforeJoas Schilling2012-08-011-2/+12
| * | | | | [feature/php-events] Fix docs and naming of core.delete_group_afterJoas Schilling2012-08-011-3/+11
| * | | | | [feature/php-events] Fix docs and naming of core.delete_user_beforeJoas Schilling2012-08-011-0/+12
| * | | | | [feature/php-events] Fix docs and naming of core.delete_user_afterJoas Schilling2012-08-011-1/+10
| * | | | | [feature/php-events] Fix docs and naming of core.update_usernameJoas Schilling2012-08-011-1/+9
| * | | | | [feature/events] Removing the third trigger_event parameterMichael Cullum2012-08-011-5/+5
| * | | | | [feature/events] Change to use the new method of adding eventsMichael Cullum2012-08-011-15/+5
| * | | | | [feature/events] Adding ledge group_set_user_defaultJoas Schilling2012-08-011-1/+6
| * | | | | [feature/events] Adding ledge group_user_delJoas Schilling2012-08-011-1/+6
| * | | | | [feature/events] Adding ledge group_deleteJoas Schilling2012-08-011-1/+6
| * | | | | [feature/events] Adding ledges user_deleteJoas Schilling2012-08-011-1/+6
| * | | | | [feature/events] Adding ledge user_update_nameJoas Schilling2012-08-011-1/+6
| |/ / / /