aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14842] Don't display filesize limit if there is noneJakub Senko2016-11-151-0/+1
| | | | PHPBB3-14842
* [ticket/14508] Adjust account inactive languageRichard McGirr2016-03-031-1/+1
| | | | PHPBB3-14508
* [ticket/14508] Change language notice on account activationRichard McGirr2016-03-021-1/+1
| | | | PHPBB3-14508
* [ticket/13945] Send reactivation requests to admins using notifications system.Cesar G2015-10-151-1/+1
| | | | PHPBB3-13945
* [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-221-0/+2
| | | | PHPBB3-13205
* [ticket/12796] Use dedicated lang varsPayBas2014-10-151-0/+1
| | | | PHPBB3-12796
* [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-181-0/+5
| | | | PHPBB3-13055
* [ticket/12748] Fix typo in terms of useOliver Schramm2014-07-181-1/+1
| | | | PHPBB3-12748
* [ticket/12768] More fixes in language filesn-aleha2014-07-081-2/+2
| | | | | | More spaces converted to tabs for identation in language files. PHPBB3-12768
* [ticket/12462] Do not use string "None" for different optionsJoas Schilling2014-06-251-0/+1
| | | | | | ... it limits translations. PHPBB3-12462
* [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATIONShitiz Garg2014-06-211-0/+2
| | | | PHPBB3-12753
* [ticket/12594] Replace phpBB Group with phpBB LimitedYuriy Rusko2014-05-281-2/+2
| | | | PHPBB3-12594
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+6
| | | | PHPBB3-12594
* Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-021-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-051-2/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
| * \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-071-6/+11
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-101-0/+1
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | [ticket/8323] Do not allow sending of Private Messages to users who do not ↵Nathan2012-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | have permission to read private messages PHPBB3-8323
* | | | [ticket/12456] Add , after the last array elementJoas Schilling2014-04-291-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12456
* | | | [ticket/12456] Fix duplicated empty lines in language filesJoas Schilling2014-04-291-1/+0
| | | | | | | | | | | | | | | | PHPBB3-12456
* | | | [ticket/12389] Change "PM" to "Message"PayBas2014-04-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12389
* | | | [ticket/12389] Moved PM tools to UCP templatePayBas2014-04-201-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12389
* | | | Merge remote-tracking branch 'crizz0/ticket/8785' into developJoas Schilling2014-03-131-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/8785: [ticket/8785] Deletes additional add and add_bcc buttons [ticket/8785] Fixed problem with add empty.png and travis will now pass [ticket/8785] and again a fresh line [ticket/8785] Just one blank line [ticket/8785] pm_layout.html back to more standard code [ticket/8785] <hr /> will only displayed when needed [ticket/8785] Adds blank lines at file end [ticket/8785] Adds a new optical improvement, new file and fixes html bugs [ticket/8785] Adds two <hr /> to seperate recipients and BCC [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px [ticket/8785] Little spaces mistake [ticket/8785] Rebuilding posting_editor pm head + new language vars
| * | | | [ticket/8785] Rebuilding posting_editor pm head + new language varsCrizzo2014-03-031-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-8785
* | | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12251
* | | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
* | | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12237
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-051-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-1/+0
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12234
* | | | | [ticket/12227] "X from Y messages" should be "X out of Y messages"Joas Schilling2014-02-241-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12227
* | | | | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-241-5/+6
|/ / / / | | | | | | | | | | | | PHPBB3-12226
* | | | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-081-3/+0
| | | | | | | | | | | | | | | | PHPBB3-12005
* | | | [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/+2
| | | | | | | | | | | | | | | | PHPBB3-11746
* | | | [ticket/11739] Rename “Remember Me” login keys moduleCesar G2013-10-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11739
* | | | [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11837
* | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTEDJoseph Warner2013-09-131-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11837
* | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-0/+1
|\ \ \ \ | | | | | | | | | | [ticket/11744] Group join request notification
| * | | | [ticket/11744] Group join request notificationNathan Guse2013-07-261-0/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-11744
* | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-241-5/+5
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Update language constants for ucp_auth_linkJoseph Warner2013-08-141-1/+5
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Forgot to have login_link be "in login" in ucpJoseph Warner2013-08-051-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Reword some of the language textJoseph Warner2013-07-301-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Properly check that all data needed is availableJoseph Warner2013-07-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11673
* | | | [feature/oauth] Basic checking for data needed in login linkingJoseph Warner2013-07-291-2/+3
| | | | | | | | | | | | | | | | PHPBB3-11673