aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| | | | PHPBB3-8041
* [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-121-2/+3
| | | | PHPBB3-8041
* [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-052-6/+0
| | | | PHPBB3-12236
* [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-052-5/+0
| | | | PHPBB3-12237
* Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-052-21/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
| * [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-042-5/+0
| | | | | | | | PHPBB3-12235
| * [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-041-2/+2
| | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187
| * [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-032-7/+0
| | | | | | | | PHPBB3-12187
| * [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-282-7/+0
| | | | | | | | PHPBB3-12234
* | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-241-3/+3
|/ | | | PHPBB3-12226
* Merge pull request #2021 from nickvergessen/ticket/12171Nathan Guse2014-02-201-1/+1
|\ | | | | Ticket/12171 Attachments from soft-deleted posts are still downloadable
| * [ticket/12171] Split post and pm download linksJoas Schilling2014-02-101-1/+1
| | | | | | | | | | PHPBB3-12171 PHPBB3-12172
* | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-185-5/+0
|\ \ | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-035-5/+0
| |/ | | | | | | PHPBB3-12153
* | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-102-5/+0
| | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-062-6/+0
| | | | | | | | PHPBB3-12115
* | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-062-5/+0
|/ | | | PHPBB3-12115
* [ticket/12159] Fix codesniffer complaints due to profilefields and passwordsMarc Alexander2014-02-031-1/+1
| | | | | | | The two PRs regarding profilefields and passwords manager that were recently merged caused a few codesniffer complaints that are fixed by these changes. PHPBB3-12159
* Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-023-14/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-023-3/+3
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-103-14/+5
| | | | | | | | PHPBB3-11201
* | Merge pull request #1716 from marc1706/feature/passwordsNils Adermann2014-02-023-7/+16
|\ \ | |/ |/| [feature/passwords] Add password hashing manager with support for newer hashing algorithms
| * Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-2913-103/+71
| |\ | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | [feature/passwords] Use passwords manager service instead of functionsMarc Alexander2013-10-133-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/12034] AJAXify notifications popup.Cesar G2013-12-301-1/+13
| |/ |/| | | | | PHPBB3-12034
* | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-255-19/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Update rest of the UCP modulesJoas Schilling2013-12-183-8/+16
| | | | | | | | | | | | PHPBB3-11849
| * | [ticket/11849] Update UCP notifications and pm folderJoas Schilling2013-12-182-11/+12
| | | | | | | | | | | | PHPBB3-11849
* | | [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-042-2/+2
|/ / | | | | | | PHPBB3-11842
* | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-212-28/+0
|\ \ | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| * | [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| | | | | | | | | | | | PHPBB3-12005
* | | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-211-1/+0
|\ \ \ | | | | | | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| * | | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-131-1/+0
| |/ / | | | | | | | | | PHPBB3-10810
* | | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-191-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11896: [ticket/11896] Use $form_time and fix out of bounds $form_time [ticket/11896] Correctly document return of null in docblocks [ticket/11896] Minor code improvements in phpbb_functional_test_case [ticket/11896] Add functional tests for marking all notifications read [ticket/11896] Add ability to define expected message after posting [ŧicket/11896] Set form_time with time() when marking all notifications read
| * | | [ticket/11896] Use $form_time and fix out of bounds $form_timeMarc Alexander2013-11-141-2/+3
| | | | | | | | | | | | | | | | PHPBB3-11896
| * | | [ŧicket/11896] Set form_time with time() when marking all notifications readMarc Alexander2013-11-091-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | form_time is only set if is passed via the form. Since the mark notifications read link does not use the form, it will default to 0 causing the mark notifications logic to only mark notifications read if their time is smaller or equal to 0. This patch will change ucp_notifications to correctly set form_time for the confirm_box. PHPBB3-11896
* | | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-132-2/+2
|\ \ \ | |/ / |/| | [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-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-35/+13
|\ \ \ | | | | | | | | [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-242-35/+13
| |/ / | | | | | | | | | PHPBB3-11746
* | | [ticket/11983] Add missing argument to docblock in ucp_notificationsMarc Alexander2013-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | The argument $subscriptions was not documented in the docblock of the method output_notification_types() until now. PHPBB3-11983
* | | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-301-1/+1
| | | | | | | | | | | | PHPBB3-11980
* | | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-291-6/+6
|\ \ \ | | | | | | | | | | | | | | | | * marc1706/ticket/11981: [ticket/11981] Fix code sniffer complaints
| * | | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-281-6/+6
| |/ / | | | | | | | | | PHPBB3-11981
* | | Merge pull request #1784 from nickvergessen/ticket/11924Nils Adermann2013-10-281-1/+1
|\ \ \ | |/ / |/| | [Ticket/11924] Add a script to export the events in wiki format
| * | [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-161-1/+1
| | | | | | | | | | | | PHPBB3-11924
* | | [ticket/11923] Attempt to translate errors only if user can change avatar.Cesar G2013-10-171-3/+3
| | | | | | | | | | | | PHPBB3-11923
* | | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-161-1/+1
|/ / | | | | | | PHPBB3-11921
* | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-111-1/+9
| | | | | | | | | | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929