aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-213-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12990
| * | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-163-7/+7
| | |/ / | |/| | | | | | | | | | PHPBB3-12990
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-112-37/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-112-37/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * | | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-37/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-113-7/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-113-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-113-7/+5
| | | | | | | | | | | | | | | | PHPBB3-11854
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-7/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-091-7/+0
| |/ / | | | | | | | | | PHPBB3-12938
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-021-6/+6
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12895] Rename user style setting to resolve conflict with style param
| * | [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-291-6/+6
| | | | | | | | | | | | | | | | | | | | | The style URL parameter, i.e. style=1, will conflict with the user's style setting due to it also being named style. This patch with solve this conflict. PHPBB3-12895
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-161-3/+21
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12828] Add ucp_prefs.php common core event
| * | Merge pull request #2709 from rxu/ticket/12828Joas Schilling2014-07-161-3/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12828] Add ucp_prefs.php common core event * rxu/ticket/12828: [ticket/12828] Add ucp_prefs.php common core event
| | * | [ticket/12828] Add ucp_prefs.php common core eventrxu2014-07-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add common core event at the bottom of the includes/ucp/ucp_prefs.php to allow additional actions (like template variable assignments etc.) before the page load. PHPBB3-12828
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-081-2/+3
|\ \ \ \ | |/ / /
| * | | [ticket/12804] Dont use ternary formPayBas2014-07-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12804
| * | | [ticket/12804] Hide Jabber from UCP & member search when disabledPayBas2014-07-071-2/+3
| |/ / | | | | | | | | | PHPBB3-12804
* | | Merge branch 'develop-ascraeus' into developDhruv2014-07-011-1/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | # By Oliver Schramm # Via Dhruv (1) and Oliver Schramm (1) * develop-ascraeus: [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
| * | [ticket/12674] Use user's colour in 'Last edited' line in sent PMsOliver Schramm2014-06-301-1/+10
| | | | | | | | | | | | PHPBB3-12674
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-251-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12680] Adds variable for guest user [ticket/12680] Brings back get_username_string() [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname [ticket/12680] Still some problems with displaying the nickname in ucp [ticket/12680] Little changes, but some issues are still there [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER [ticket/12680] Adds alternativ text with new variable to contact: [ticket/12680] Adds second alternativ text and font-size: 0 to remove text [ticket/12680] Adds alternative text to contact icon in viewtopic.php
| * | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-251-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12680] - Adds alternative text to contact icon in viewtopic.php * Crizz0/ticket/12680: [ticket/12680] Adds variable for guest user [ticket/12680] Brings back get_username_string() [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname [ticket/12680] Still some problems with displaying the nickname in ucp [ticket/12680] Little changes, but some issues are still there [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER [ticket/12680] Adds alternativ text with new variable to contact: [ticket/12680] Adds second alternativ text and font-size: 0 to remove text [ticket/12680] Adds alternative text to contact icon in viewtopic.php
| | * | [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| | * | [ticket/12680] Still some problems with displaying the nickname in ucpCrizzo2014-06-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| | * | [ticket/12680] Little changes, but some issues are still thereCrizzo2014-06-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-111-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: (33 commits) [ticket/12352] Do not check hashes that don't have the necessary length [ticket/12352] Update file headers to fit new format [ticket/12352] Use custom provider collection for auth providers [ticket/12352] Add checks for existing user_pass_convert to migrations [ticket/12352] Remove usages of user_pass_convert column [ticket/12352] Update schema json file [ticket/12352] Remove user_pass_convert column from database [ticket/12352] Check each newly added passwords driver in manager_test [ticket/12352] Add get_settings_only method to passwords driver base [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords [ticket/12352] Add tests for wcf1 and wcf2 drivers [ticket/12352] Add driver for woltlab community framework 1 passwords [ticket/12352] Add driver for woltlab community framework 2 passwords [ticket/12352] Add missing $ to md5_mybb and md5_vb driver [ticket/12352] Fix spacing in passwords tests [ticket/12352] Add passwords driver for vB passwords [ticket/12352] Use correct hashing method in md5_mybb driver [ticket/12352] Add driver for myBB md5 passwords [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers [ticket/12352] Add passwords driver for sha1 password hashes ...
| * | | Merge remote-tracking branch 'github-marc1706/ticket/12352' into ↵Nils Adermann2014-06-111-1/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12352: (33 commits) [ticket/12352] Do not check hashes that don't have the necessary length [ticket/12352] Update file headers to fit new format [ticket/12352] Use custom provider collection for auth providers [ticket/12352] Add checks for existing user_pass_convert to migrations [ticket/12352] Remove usages of user_pass_convert column [ticket/12352] Update schema json file [ticket/12352] Remove user_pass_convert column from database [ticket/12352] Check each newly added passwords driver in manager_test [ticket/12352] Add get_settings_only method to passwords driver base [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords [ticket/12352] Add tests for wcf1 and wcf2 drivers [ticket/12352] Add driver for woltlab community framework 1 passwords [ticket/12352] Add driver for woltlab community framework 2 passwords [ticket/12352] Add missing $ to md5_mybb and md5_vb driver [ticket/12352] Fix spacing in passwords tests [ticket/12352] Add passwords driver for vB passwords [ticket/12352] Use correct hashing method in md5_mybb driver [ticket/12352] Add driver for myBB md5 passwords [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers [ticket/12352] Add passwords driver for sha1 password hashes ...
| | * | [ticket/12352] Remove usages of user_pass_convert columnMarc Alexander2014-06-011-1/+0
| | | | | | | | | | | | | | | | PHPBB3-12352
* | | | Merge pull request #2557 from Elsensee/ticket/12516Joas Schilling2014-06-101-56/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12516] Always preview signature in UCP/ACP module * Elsensee/ticket/12516: [ticket/12516] Always preview signature in UCP/ACP module
| * | | | [ticket/12516] Always preview signature in UCP/ACP moduleOliver Schramm2014-06-071-56/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-12516
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-092-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into ↵Nils Adermann2014-06-092-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/10073: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| | * | | [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-292-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-10073
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-06-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12566] Also changed for ucp_pm_viewmessage.php [ticket/12566] "Private messages" should be "Send pivate message"
| * | | [ticket/12566] Also changed for ucp_pm_viewmessage.phpPayBas2014-06-021-1/+1
| |/ / | | | | | | | | | PHPBB3-12566
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-2828-129/+198
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12594] Replace phpBB Group with phpBB Limited [ticket/12594] Update footer credit lines [ticket/12594] Remove @package tags and update file headers
| * | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2728-129/+198
| | | | | | | | | | | | PHPBB3-12594
* | | [ticket/12564] Remove version definition from ACP/MCP/UCP module info filesMatt Friedman2014-05-189-9/+0
|/ / | | | | | | PHPBB3-12564
* | [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | | | | | PHPBB3-12526
* | [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
| | | | | | | | | | | | | | | | This fixes a bug where a user A could not send a PM to user B when both users allowed other users to send them a PM. More precisely, it fixes the selection of users that either are inactive or have disabled private messages. PHPBB3-12493
* | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-9/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
| * | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-2/+9
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-2/+2
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-1/+0
| | | | | | | | | | | | PHPBB3-12254
* | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-021-2/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
| * | | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12265
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-27 09:55:28 +0000