aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/profile.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2942 from Senky/ticket/12489Joas Schilling2014-10-071-1/+1
|\ | | | | | | [ticket/12489] Description for Contact link in custom profile fields
| * [ticket/12489] Language correctionJakub Senko2014-10-071-1/+1
| | | | | | | | PHPBB3-12489
| * [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAINJakub Senko2014-09-181-1/+1
| | | | | | | | PHPBB3-12489
* | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-241-0/+6
|\ \ | |/ |/| | | [ticket/13055] Fix string profile fields validation to support unicode
| * [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-181-0/+6
| | | | | | | | PHPBB3-13055
* | [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAINGiampaolo Falqui2014-09-181-1/+1
|/ | | | PHPBB3-13068
* [ticket/12730] Add a Google+ field by defaultShitiz Garg2014-06-211-0/+1
| | | | PHPBB3-12730
* Merge pull request #2621 from Dragooon/ticket/12732Joas Schilling2014-06-201-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12732] Add Skype custom profile field * Dragooon/ticket/12732: [ticket/12732] Update schema.json for Skype [ticket/12732] Add functional test for Skype profile field [ticket/12732] Values shouldn't be escaped for schema_data.sql [ticket/12732] Set field_active to 1 for Skype's field [ticket/12732] Add unit tests for ALPHA_PUNCTUATION [ticket/12732] Missing comma after validation definition [ticket/12732] Improve ALPHA_PUNCTUATION description [ticket/12732] Use user info instead of chat as default Skype action [ticket/12732] Add Skype custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php tests/profilefields/type_string_test.php
| * [ticket/12732] Improve ALPHA_PUNCTUATION descriptionShitiz Garg2014-06-201-1/+1
| | | | | | | | PHPBB3-12732
| * [ticket/12732] Add Skype custom profile fieldShitiz Garg2014-06-201-0/+1
| | | | | | | | PHPBB3-12732
* | [ticket/12729] Add Facebook custom profile fieldShitiz Garg2014-06-201-0/+1
|/ | | | PHPBB3-12729
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+6
| | | | PHPBB3-12594
* [ticket/12415] Use private message instead of "pm" accronymGaëtan Muller2014-05-041-2/+2
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-12415 PHPBB3-12415
* [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-061-0/+1
| | | | PHPBB3-12251
* [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-031-0/+1
| | | | PHPBB3-12187
* [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-281-0/+4
| | | | | | | | Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages PHPBB3-12233
* [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-101-0/+2
| | | | PHPBB3-12169
* Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+2
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+2
| | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
| * #48985Henry Sudhof2009-08-031-0/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fixed bug #'ers 41295, 41385, 41955, 41705 and 41985Jim Wigginton2009-02-261-1/+1
| | | | | | | | | | | | Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9342 89ea8834-ac86-4346-8a33-228a782c2dd0
| * no newlineMeik Sievertsen2008-11-261-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9128 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Better handling and finer control for custom profile fields visibility ↵Meik Sievertsen2008-11-261-7/+7
| | | | | | | | | | | | options. (Patch by Highway of Life) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9127 89ea8834-ac86-4346-8a33-228a782c2dd0
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-201-0/+2
| | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | Copy 3.0.x branch to trunkMeik Sievertsen2009-10-041-0/+156
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Move trunk/phpBB to old_trunk/phpBB Meik Sievertsen2009-10-041-154/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Merge most changes from 3.0.x branch since the 25th december.Meik Sievertsen2009-03-221-1/+1
|/ | | | | | (Captcha changes for refreshing captcha image not included) git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
* #14621Meik Sievertsen2007-10-041-0/+5
| | | | | | | | #14596 info file changes git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0
* #13816Henry Sudhof2007-07-271-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7959 89ea8834-ac86-4346-8a33-228a782c2dd0
* two fixesMeik Sievertsen2007-07-241-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7940 89ea8834-ac86-4346-8a33-228a782c2dd0
* ok, mess around with the templates + fixing some bugs + adjusting headers ↵Meik Sievertsen2007-06-091-3/+3
| | | | | | for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!) git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
* tiny fixes which do not need to be listed within the changelog... (falls ↵Meik Sievertsen2007-06-031-3/+1
| | | | | | under tiny stylistic and language changes) git-svn-id: file:///svn/phpbb/trunk@7709 89ea8834-ac86-4346-8a33-228a782c2dd0
* language change and reset locked status for link forum type.Meik Sievertsen2007-05-201-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7652 89ea8834-ac86-4346-8a33-228a782c2dd0
* #11229, #11233Meik Sievertsen2007-05-191-2/+2
| | | | git-svn-id: file:///svn/phpbb/trunk@7650 89ea8834-ac86-4346-8a33-228a782c2dd0
* some language fixes reported.Meik Sievertsen2007-05-141-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7570 89ea8834-ac86-4346-8a33-228a782c2dd0
* punctuation changes in language filesMeik Sievertsen2007-05-101-5/+5
| | | | git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
* some language-specific adjustementsMeik Sievertsen2007-05-031-1/+1
| | | | | | | | fix prune users (adding the list of users to the confirmation page) tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element) git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
* fixes for search button in header - #10389, #10225, #9548Meik Sievertsen2007-05-021-2/+2
| | | | | | | | | | | added missing colour swatch to prosilver - #8657 language changes - #10387, #10375, #10373, #10353, #10279 line-height for font size (still not ideal) - #10317 Search load setting checked in sessions.php along with limit_load and also reset if not possible to determine load - #10383 Fix editing issues - #9660 git-svn-id: file:///svn/phpbb/trunk@7451 89ea8834-ac86-4346-8a33-228a782c2dd0
* some fixes...Meik Sievertsen2007-04-021-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7266 89ea8834-ac86-4346-8a33-228a782c2dd0
* ok, handled some bugs... the most important being validate_username (the ↵Meik Sievertsen2007-01-171-1/+1
| | | | | | variable passed to validate_data([...]array('username', [...])) and updating group listings while doing relevant group actions. Oh, and PM icons are working now. :o git-svn-id: file:///svn/phpbb/trunk@6894 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bertiezilla make Bertie-smash on language files!Jonathan Stanley2006-12-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6244 #6278 #6284 #6286 #6336 #6340 #6342 #6344 #6346 #6352 #6358 #6364 #6376 #6382 #6386 #6388 #6418 #6420 #6426 #6428 #6430 #6434 #6452 #6454 #6458 git-svn-id: file:///svn/phpbb/trunk@6790 89ea8834-ac86-4346-8a33-228a782c2dd0
* #5562Jonathan Stanley2006-11-231-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@6644 89ea8834-ac86-4346-8a33-228a782c2dd0
* some updates; and hopefully not completely breaking redirects (again). :D ↵Meik Sievertsen2006-11-021-1/+3
| | | | | | You know, i like breaking things. git-svn-id: file:///svn/phpbb/trunk@6544 89ea8834-ac86-4346-8a33-228a782c2dd0
* - typo in functions.phpDavid M2006-10-181-0/+1
| | | | | | | - #4826 git-svn-id: file:///svn/phpbb/trunk@6510 89ea8834-ac86-4346-8a33-228a782c2dd0
* consistent acp layout regarding backlinks and messages.Meik Sievertsen2006-10-021-7/+8
| | | | git-svn-id: file:///svn/phpbb/trunk@6428 89ea8834-ac86-4346-8a33-228a782c2dd0
* Righto... my first checkin for these language related thingies. Hopefully ↵Jonathan Stanley2006-09-241-31/+31
| | | | | | | | | | | | | | | | | | | | | nothing has blown up! ;) The basic style guide is: 1) British English, Cambridge style... ie: -ise, not -ize, etc. 2) Sentence-case pervasively with exception of acronyms/abbreviations, which if not in their contracted form, shall be in title-case. If you don't like it, you can restyle it via CSS using text-transform: none|uppercase|lowercase|capitalize; ... additional hooks may be added to the strings to assist this. 3) For those that have missed the switch to UTF-8, it means that the language files need not use numeric entities anymore. <, > and & stay though, as they must always be entitised. There'll be more tweaks and changes, though this "big 'un" is out of the way and will get progressively chilly so that it can be frozen for RC1 after however many betas there may be. ;) Wooh! :P git-svn-id: file:///svn/phpbb/trunk@6399 89ea8834-ac86-4346-8a33-228a782c2dd0
* - no more encoding mixture, say hello to UTF-8 (I'll add a validation ↵Nils Adermann2006-09-171-1/+3
| | | | | | | | | | | | solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762] - take local server time into consideration for birthday/age calculation - faster active topic search - allow changing active topic time frame [Bug #4150] - reload stylesheet on language change [Bug #4222] git-svn-id: file:///svn/phpbb/trunk@6380 89ea8834-ac86-4346-8a33-228a782c2dd0
* - fixing profile bugMeik Sievertsen2006-09-041-0/+1
| | | | | | | | - adjusting acl_gets calls (they are or'd - make sure they get checked correctly based on the situation) - automatically assign the u_download and u_search permission to the guest group git-svn-id: file:///svn/phpbb/trunk@6351 89ea8834-ac86-4346-8a33-228a782c2dd0