aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | [feature/new-tz-handling] Fix selecting and validating of timezone in UCPJoas Schilling2012-06-181-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9558
* | | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| * | | [feature/new-tz-handling] Removed DST and numeric timezone-related language.Oleg Pudeyev2012-03-141-1/+0
| | | | | | | | | | | | | | | | PHPBB3-9558
| * | | [feature/new-tz-handling] Preselect a timezone in registration.Oleg Pudeyev2012-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Javascript to obtain client's timezone offset and select the first timezone in our list with that offset. Changes for prosilver only. The javascript file should be shared between styles. PHPBB3-9558
* | | | Merge PR #785 branch 'develop-olympus' into developOleg Pudeyev2012-05-111-1/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10835] changing "e-mail" to "email" [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry [ticket/10835] fixing misleading message in UCP Conflicts: phpBB/language/en/ucp.php
| * | [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1
| | | | | | | | | | | | PHPBB3-10835
| * | [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1
| | | | | | | | | | | | PHPBB3-10835
| * | [ticket/10835] fixing misleading message in UCPSenky2012-05-011-1/+2
| | | | | | | | | | | | PHPBB3-10835
* | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-151-23/+23
| | | | | | | | | | | | | | | | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-4/+0
| | | | | | | | | | | | | | | | PHPBB3-10535
* | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9916
* | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
|/ / / | | | | | | | | | PHPBB3-9916
* | | [ticket/10345] Remove more useless 0-casesJoas Schilling2011-11-251-2/+0
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Remove some unused 0 casesJoas Schilling2011-11-251-3/+0
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-251-10/+10
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-251-6/+14
| | | | | | | | | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-8/+25
| |/ |/| | | | | PHPBB3-10345
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+3
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9361] View correct error messages when editing account information
| * [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-0/+3
| | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-0/+1
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10005] Add description to test cases [ticket/10005] Add validation of dropdown custom profile field values
| * Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympusAndreas Fischer2011-06-091-0/+1
| |\ | | | | | | | | | | | | | | | * naderman/ticket/10005: [ticket/10005] Add description to test cases [ticket/10005] Add validation of dropdown custom profile field values
| | * [ticket/10005] Add validation of dropdown custom profile field valuesNils Adermann2011-06-021-0/+1
| | | | | | | | | | | | PHPBB3-10005
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10158] Remove some code duplication from generating the message. [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| * | [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-231-0/+1
| |/ | | | | | | PHPBB3-10158
| * #50985 - fix XML export of private messages sent to deleted usersHenry Sudhof2009-12-131-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10329 89ea8834-ac86-4346-8a33-228a782c2dd0
| * rollback; will be in 3.0.7Henry Sudhof2009-09-111-1/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
| * #50985Henry Sudhof2009-09-111-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Separate PM Reply and PM Reply to all in prosilver.Meik Sievertsen2009-08-041-0/+1
| | | | | | | | | | | | Style changes by dhn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
| * fix mcp sorting for pm_reports, and some minor language changesNils Adermann2009-07-221-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9830 89ea8834-ac86-4346-8a33-228a782c2dd0
| * #47665Marek A. R2009-07-181-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9784 89ea8834-ac86-4346-8a33-228a782c2dd0
| * - [Feature] New "Newly Registered Users" group for assigning ↵Meik Sievertsen2009-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts. - [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users. As a coincidence also Bug #46535 got fixed. Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix bug #46785 - Hide avatars if type disabled and give global option to ↵Joas Schilling2009-06-191-0/+2
| | | | | | | | | | | | | | | | turn on/off Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix bug #19945 - Wrong description in UCP group managment implicates missing ↵Joas Schilling2009-06-181-0/+1
| | | | | | | | | | | | | | | | feature Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9613 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix bug #39875 - Empty error message in UCP folder management when creating ↵Joas Schilling2009-06-181-0/+1
| | | | | | | | | | | | | | | | folder without name Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9612 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix bug #40205 - Wrong message shown to user, when adding bots to friends/foesJoas Schilling2009-06-161-0/+2
| | | | | | | | | | | | Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9597 89ea8834-ac86-4346-8a33-228a782c2dd0
| * use correct e-mail term. ;)Meik Sievertsen2009-04-221-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9478 89ea8834-ac86-4346-8a33-228a782c2dd0
| * a language alteration for captchas. Meik Sievertsen2009-04-111-2/+2
| | | | | | | | | | | | Added min/max captcha chars constants and changed the length from 5-8 to 4-7 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9437 89ea8834-ac86-4346-8a33-228a782c2dd0
| * captcha changesHenry Sudhof2009-03-171-0/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9390 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Changed the success message when requesting a new password to be more ↵Chris Smith2009-02-141-1/+1
| | | | | | | | | | | | accurate. #41405 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9326 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Use "less than a minute ago" instead of "0 minutes ago"Meik Sievertsen2008-12-031-3/+3
| | | | | | | | | | | | Use "Sent: {DATE}" in pm's, instead of "Sent at: {DATE}" git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9162 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Small language fixes, one for r8989Chris Smith2008-10-111-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9001 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Display a message if no topics or forums are selected when unsubscribing. #34855Chris Smith2008-10-111-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8997 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Do not allow password reminders if u_passchg permission is not given. (Bug ↵Meik Sievertsen2008-10-061-0/+1
| | | | | | | | | | | | #14806) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8977 89ea8834-ac86-4346-8a33-228a782c2dd0
| * - Added 'max_recipients' setting for private messages. This setting allows ↵Meik Sievertsen2008-09-231-1/+1
| | | | | | | | | | | | | | | | | | admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting. - Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Language typos/fixes. #27625, #30755Chris Smith2008-09-081-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8838 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Added missing UCP language string NO_AUTH_READ_HOLD_MESSAGE.Chris Smith2008-09-051-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8827 89ea8834-ac86-4346-8a33-228a782c2dd0
| * some corrections to the language filesMeik Sievertsen2008-03-261-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8471 89ea8834-ac86-4346-8a33-228a782c2dd0
| * some language/style/code fixes (refer to the diff of the changelog)Meik Sievertsen2008-02-231-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8389 89ea8834-ac86-4346-8a33-228a782c2dd0
* | [ticket/6109] MSN is now called Windows Live Messenger (WLM)Joas Schilling2011-01-101-1/+1
| | | | | | | | | | | | Replaced the logo with the current one and changed the language strings. PHPBB3-6109