aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-241-3/+1
|\
| * [ticket/12858] Directly return and use timezone selectsMarc Alexander2014-09-171-1/+1
| * [ticket/12858] Fix timezone display on acp users pageMarc Alexander2014-09-171-2/+0
| * [ticket/12858] Generate timezone selects with template loopMarc Alexander2014-09-171-1/+1
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-1/+1
|\ \ | |/
| * [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-161-1/+1
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-111-40/+18
|\ \ | |/
| * [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-071-40/+18
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-07-041-2/+2
|\ \ | |/
| * [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_extsTristan Darricau2014-06-261-2/+2
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-111-1/+0
|\ \ | |/
| * Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascr...Nils Adermann2014-06-111-1/+0
| |\
| | * [ticket/12352] Remove usages of user_pass_convert columnMarc Alexander2014-06-011-1/+0
* | | Merge pull request #2557 from Elsensee/ticket/12516Joas Schilling2014-06-101-40/+35
|\ \ \ | |/ / |/| |
| * | [ticket/12516] Always preview signature in UCP/ACP moduleOliver Schramm2014-06-071-40/+35
| |/
* | [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-291-1/+1
|/
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-6/+7
* Merge remote-tracking branch 'github-rxu/ticket/12409' into develop-ascraeusNils Adermann2014-05-021-25/+65
|\
| * [ticket/12409] Add acp_users.php core events to modify users preferences datarxu2014-04-171-25/+65
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop...Nils Adermann2014-05-021-3/+3
|\ \
| * | [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-251-3/+3
| |/
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop...Nils Adermann2014-05-021-1/+2
|\ \
| * | [ticket/12371] Fix SQL queryJoas Schilling2014-04-251-1/+1
| * | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-251-1/+2
| |/
* | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-291-4/+0
|/
* Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop...Nils Adermann2014-04-101-10/+6
|\
| * [ticket/12113] Correctly use plurals when deleting user warningsJoas Schilling2014-04-011-10/+6
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-041-1/+1
|\ \ | |/ |/|
| * [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ \ | |/
| * [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| * [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| * [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
* | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-201-2/+2
|\ \
| * | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-201-2/+2
| * | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-161-2/+2
* | | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
* | | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
|/ /
* | 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
|/ /