aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-2/+7
|\
| * [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-2/+7
* | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-5/+0
* | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-4/+0
* | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-4/+0
* | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-031-6/+0
* | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-6/+0
* | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-181-2/+0
|\ \
| * | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-031-2/+0
* | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-4/+0
* | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-4/+0
* | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-4/+0
|/ /
* | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-021-2/+1
|\ \
| * | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-021-1/+1
| * | [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-101-2/+1
* | | [feature/passwords] Get rid of unneeded code complexityMarc Alexander2013-12-291-1/+1
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-291-11/+13
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into de...Dhruv2013-12-251-4/+6
| |\ \
| | * | [ticket/11849] Fix more function callsJoas Schilling2013-12-181-4/+6
| * | | [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-041-1/+1
| |/ /
| * | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-211-3/+0
| |\ \
| | * | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-081-3/+0
| * | | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-131-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-241-1/+1
| * | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-021-0/+3
| |\ \ \
| | * | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-261-1/+1
| | * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-241-0/+3
| | |/ /
| * | | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-301-2/+2
| |/ /
* | | [feature/passwords] Use passwords manager service instead of functionsMarc Alexander2013-10-131-2/+5
|/ /
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-2/+2
* | 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