aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
* [feature/remove-db-styles] Add error if template/theme file is unwritable.Chris Smith2011-09-201-0/+1
| | | | PHPBB3-9741
* [feature/remove-db-styles] Removed database storage of style components.Chris Smith2011-09-201-4/+0
| | | | | | | | | | | | The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
* [feature/remove-imagesets] Changing admin control panel styles moduleVjacheslav Trushkin2011-09-032-58/+5
| | | | | | Removing imagesets. Changing admin control panel styles module PHPBB3-10336
* [feature/remove-imagesets] Changing database structureVjacheslav Trushkin2011-09-031-1/+1
| | | | | | Removing imagesets. Changing database structure PHPBB3-10336
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-07-301-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/8173] Removed some redundant code in the BBCode JavaScript.
| * Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympusOleg Pudeyev2011-07-301-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/8173: [ticket/8173] Removed some redundant code in the BBCode JavaScript. Conflicts: phpBB/adm/style/acp_users_signature.html
| | * [ticket/8173] Removed some redundant code in the BBCode JavaScript.Callum Macrae2011-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following code can be found in the ACP, when changing a user's signature: t: '{ BBCODE_T_HELP }', The code that uses it and the code that produces it were changed or removed a while ago, but this code remained. In 2c4c1f9, the accesskey for the list item button was changed to y from t, explaining the origin of the redundant code - although it wasn't being used then, either. This commit also changes the helpline code of "[*]" to y, as the access key is y, so this makes it more consistent. PHPBB3-8173
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions Conflicts: phpBB/includes/functions_display.php
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into ↵Nils Adermann2011-07-161-0/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10237: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
| | * | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Also add some information to the confirm-box (forum_name / topic title) PHPBB3-10237
| | * | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-071-0/+2
| | |/ | | | | | | | | | PHPBB3-10237
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
| * | [ticket/10208] Explain what happens when 'Warning duration' is set to 0.Tabitha Backoff2011-07-161-1/+1
| | | | | | | | | | | | PHPBB3-10208
* | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
| * | [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.Callum Macrae2011-07-141-1/+1
| |/ | | | | | | | | | | | | Previously "errors are listing below", should have said "errors are listed below". PHPBB3-10216
* | [ticket/7090] Update documented minimum PHP version to 5.2.0Igor Wiedler2011-07-131-2/+2
| | | | | | | | PHPBB3-7090
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-221-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
| * [ticket/10228] Correct "trigger" to "triggered" in acp registration settingsNils Adermann2011-06-221-1/+1
| | | | | | | | PHPBB3-10228
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-181-4/+4
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10229] On languge/acp/styles.php "%s" should be %s
| * [ticket/10229] On languge/acp/styles.php "%s" should be %sRaimon2011-06-181-4/+4
| | | | | | | | PHPBB3-10229
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-161-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-161-1/+1
| | | | | | | | PHPBB3-10221
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10211] Add spce after dot in new language string
| * [ticket/10211] Add spce after dot in new language stringNils Adermann2011-06-121-1/+1
| | | | | | | | PHPBB3-10211
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-111-3/+9
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
| * [ticket/9992] Clarify explanations of ip and account limits on loginNils Adermann2011-06-111-2/+2
| | | | | | | | PHPBB3-9992
| * [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAINNils Adermann2011-06-111-1/+1
| | | | | | | | PHPBB3-9992
| * [ticket/9992] Adding a limit on login attempts per IP.Nils Adermann2011-06-101-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | A new table was created to save all failed login attempts with corresponding information on username, ip and useragent. By default the limit is 50 login attempts within 6 hours per IP. The limit is relatively high to avoid big problems on sites behind a reverse proxy that don't receive the forwarded-for value as REMOTE_ADDR but see all users as coming from the same IP address. But if these users run into problems a special forwarded-for option is available to limit logins by forwarded-for value instead of ip. PHPBB3-9992
* | Merge branch 'develop-olympus' into developNils Adermann2011-06-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/6712] Properly explain result of setting the bump interval to 0. [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time [ticket/6712] Pass $post_data by the value instead of by the reference. [ticket/6712] Bump does not create new topic icon on index. Conflicts: phpBB/includes/functions_posting.php
| * Merge branch 'ticket/rxu/6712' into develop-olympusNils Adermann2011-06-101-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/6712: [ticket/6712] Properly explain result of setting the bump interval to 0. [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time [ticket/6712] Pass $post_data by the value instead of by the reference. [ticket/6712] Bump does not create new topic icon on index.
| | * [ticket/6712] Properly explain result of setting the bump interval to 0.Nils Adermann2011-06-101-1/+1
| | | | | | | | | | | | PHPBB3-6712
* | | 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 developAndreas Fischer2011-06-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
| * | | [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067Joas Schilling2011-06-091-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10203
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10067] Clarify language for user activation options in ACP.
| * | | Merge branch 'ticket/p/10067' into develop-olympusNils Adermann2011-06-051-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/10067: [ticket/10067] Clarify language for user activation options in ACP.
| | * | | [ticket/10067] Clarify language for user activation options in ACP.Oleg Pudeyev2011-04-301-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10067
* | | | | 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.
| * | | | Merge branch 'ticket/nickvergessen/10158' into develop-olympusNils Adermann2011-06-051-0/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10158: [ticket/10158] Remove some code duplication from generating the message. [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
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-232-4/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| * | | Merge remote-tracking branch 'p/ticket/9630' into develop-olympusAndreas Fischer2011-05-232-4/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/9630: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| | * | | [ticket/9630] Make language for moving posts clearer in quickmod/mcp.Oleg Pudeyev2011-05-022-4/+3
| | |/ / | | | | | | | | | | | | PHPBB3-9630
* | | | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-202-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | | | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-202-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-101-3/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| * | | | Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympusOleg Pudeyev2011-05-101-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10170: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| | * | | | [ticket/10170] Include www in hostname in language strings.Andreas Fischer2011-05-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10170