aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
Commit message (Collapse)AuthorAgeFilesLines
...
| * [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
| | | | | | | | PHPBB3-12353
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | PHPBB3-12035
| * [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| | | | | | | | PHPBB3-12035
| * [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
| | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
* | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-201-2/+2
|\ \ | | | | | | [ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
| * | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-201-2/+2
| | | | | | | | | | | | PHPBB3-8309
| * | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-161-2/+2
| | | | | | | | | | | | PHPBB3-8309
* | | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
| | | | | | | | | | | | PHPBB3-11239
* | | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
|/ / | | | | | | | | | | | | Adding username to the page title to avoid confusion while managing multiple users in ACP PHPBB3-11239
* | Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-2/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message. Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-2/+7
| | | | | | | | PHPBB3-12176
* | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-5/+0
| | | | | | | | PHPBB3-12236
* | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-4/+0
| | | | | | | | PHPBB3-12237
* | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-4/+0
| | | | | | | | PHPBB3-12235
* | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-031-6/+0
| | | | | | | | PHPBB3-12187
* | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-6/+0
| | | | | | | | PHPBB3-12234
* | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-181-2/+0
|\ \ | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-031-2/+0
| | | | | | | | | | | | PHPBB3-12153
* | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-4/+0
| | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-4/+0
| | | | | | | | | | | | PHPBB3-12115
* | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-4/+0
|/ / | | | | | | PHPBB3-12115
* | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-021-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11201: (50 commits) [ticket/11201] Remove empty calls section from .yml [ticket/11201] Split template file into multiple files [ticket/11201] Remove dependency from types on the manager [ticket/11201] Rename profilefields class to manager [ticket/11201] Fix parameter description [ticket/11201] Use !== null, its faster [ticket/11201] Also translate profile fields in UCP and ACP [ticket/11201] Add parameters and variables to profile field class [ticket/11201] Add commas on last array entry [ticket/11201] Allow translation of profile field name and explanation [ticket/11201] Fix some variable names [ticket/11201] Add tables to constructor in tests [ticket/11201] Add a method to return the translated full name of the type [ticket/11201] Remove db depending code from field class [ticket/11201] Add variables to classes and add constructor doc blocks [ticket/11201] Update copyright in class file [ticket/11201] Add visibility and remove unused variable [ticket/11201] Add some commas at the last array entry [ticket/11201] Cast some variables to integer [ticket/11201] Inject table names rather then using constants ... Conflicts: phpBB/config/services.yml
| * | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-021-1/+1
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-101-2/+1
| | | | | | | | | | | | PHPBB3-11201
* | | [feature/passwords] Get rid of unneeded code complexityMarc Alexander2013-12-291-1/+1
| | | | | | | | | | | | | | | | | | Simplified a little bit of code as pointed out by imkingdavid on github. PHPBB3-11610
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-291-11/+13
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-251-4/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Joas Schilling # Via Joas Schilling * nickvergessen/feature/pagination-class: [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class
| | * | [ticket/11849] Fix more function callsJoas Schilling2013-12-181-4/+6
| | | | | | | | | | | | | | | | PHPBB3-11849
| * | | [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-041-1/+1
| |/ / | | | | | | | | | PHPBB3-11842
| * | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-211-3/+0
| |\ \ | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| | * | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-081-3/+0
| | | | | | | | | | | | | | | | PHPBB3-12005
| * | | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-131-1/+1
| |\ \ \ | | |/ / | |/| | [ticket/11525] Only remove group or user prefix from given avatar data
| | * | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the user data had both user_id and group_id keys in the avatar data. As both group_ and user_ prefixes were removed the group_id was collapsed onto the user_id and therefore all users in the same group had the same prefix for their uploaded avatars. This patch will make sure that the correct id is used depending on whether it's a group's or user's avatar data. PHPBB3-11525
| * | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-021-0/+3
| |\ \ \ | | | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| | * | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11746
| | * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-241-0/+3
| | |/ / | | | | | | | | | | | | PHPBB3-11746
| * | | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-301-2/+2
| |/ / | | | | | | | | | PHPBB3-11980
* | | [feature/passwords] Use passwords manager service instead of functionsMarc Alexander2013-10-131-2/+5
|/ / | | | | | | | | | | | | | | | | | | | | The old functions phpbb_hash() and phpbb_check_hash() have been replaced with the passwords manager service in all front-end related files. The phpBB2 converter and the release_3_0_5_rc1 migration file have not been changed. The same applies to the security/hash_test that still tests the function phpbb_check_hash(). This will however make sure that the old function still works. PHPBB3-11610
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-2/+2
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-111-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This should fix some other bugs that may not have yet been recognized--some areas only set to(), but sent according to user_notify_type, which is not necessarily email. PHPBB3-11454
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-051-46/+104
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (234 commits) [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [feature/avatars] Auto-clear avatar dimensions when first changing avatars [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update ...
| * | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-191-2/+2
| | | | | | | | | | | | PHPBB3-10018
| * | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | | The phpbb_user object might be used for language variables and other things. PHPBB3-10018
| * | [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Remove the $request property from the phpbb_avatar_driver class and rather pass it as function argument if it's needed in a function. Currently this is only the case for the class methods prepare_form() and process_form(). PHPBB3-10018
| * | [feature/avatars] Use empty() instead of sizeof()Marc Alexander2013-01-071-1/+1
| | | | | | | | | | | | PHPBB3-10018
| * | [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-061-12/+1
| | | | | | | | | | | | PHPBB3-10018
| * | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Although get_user_avatar() is not new, the phpbb prefix was prepended. This is due to the fact that it was entirely rewritten and is therefore more or less a completely new function. PHPBB3-10018
| * | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-271-1/+1
| | | | | | | | | | | | PHPBB3-10018