aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-062-0/+2
| | | | | | The setting is copied from "Can use signature" PHPBB3-10679
* [ticket/10091] Bump minimum supported postgresql version to 8.3.Oleg Pudeyev2012-12-041-1/+1
| | | | PHPBB3-10091
* Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into developOleg Pudeyev2012-12-024-10/+10
|\ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10771: [ticket/10771] fix remember me language [ticket/10771] use remember me in ucp [ticket/10771] use remember me in acp [ticket/10771] changed value in help_faq.php [ticket/10771] Using Remember Me instead of autologin or persistent keys
| * [ticket/10771] fix remember me languageDhruv2012-12-022-8/+8
| | | | | | | | PHPBB3-10771
| * [ticket/10771] use remember me in ucpDhruv2012-12-021-4/+4
| | | | | | | | PHPBB3-10771
| * [ticket/10771] use remember me in acpDhruv2012-12-021-4/+4
| | | | | | | | PHPBB3-10771
| * [ticket/10771] changed value in help_faq.phpHari Sankar R2012-12-021-1/+1
| | | | | | | | PHPBB3-10771
| * [ticket/10771] Using Remember Me instead of autologin or persistent keysHari Sankar R2012-12-021-1/+1
| | | | | | | | | | | | | | Changed language variable LOG_ME_IN's value to "Remember me" PHPBB3-10771
* | [feature/controller] Remove unused language stringsDavid King2012-11-181-6/+0
| | | | | | | | PHPBB3-10864
* | [feature/controller] Don't use $user->lang() before container compilationDavid King2012-11-181-5/+0
| | | | | | | | PHPBB3-10864
* | [feature/controller] Don't allow a kernel listener to be added with no methodDavid King2012-11-161-0/+1
| | | | | | | | PHPBB3-10864
* | [feature/controller] Implement a front controllerDavid King2012-11-161-0/+59
| | | | | | | | PHPBB3-10864
* | Merge PR #1074 branch 'develop-olympus' into developOleg Pudeyev2012-11-161-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11192] Merge dataProvider arrays because the test is the same now. [ticket/11192] Update $value parameter description to support other types. [ticket/11192] Mark negative byte numbers as unsupported. [ticket/11192] Test strings not converted to int/float before. [ticket/11192] Also test strings, e.g. sums returned by the database. [ticket/11192] Also test powers of 10 / 1000. [ticket/11192] Add tests. [ticket/11192] Add Tebibyte to get_formatted_filesize().
| * [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-111-0/+2
| | | | | | | | PHPBB3-11192
* | [ticket/10780] Replace colon usage in template output with {L_COLON}Nathan Guse2012-11-101-0/+1
| | | | | | | | | | | | | | Replace all the instances (I could find) where the colon is displayed to the user with {L_COLON} so it can be localised. PHPBB3-10780
* | [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)Igor Wiedler2012-11-091-2/+2
| | | | | | | | PHPBB3-11181
* | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-0652-657/+856
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
| * | [ticket/11156] Delete "Misc" tab of forum based permissions + move itemsRMcGirr832012-10-291-27/+26
| | | | | | | | | | | | PHPBB3-11156
| * | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-0/+1
| |\ \ | | |/ | | | | | | | | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | * Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-0/+1
| | |\ | | | | | | | | | | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | | * [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10568
| * | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-163-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| | * | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-163-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| | | * | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-153-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8743
| * | | | Merge PR #1004 branch 'develop-olympus' into developOleg Pudeyev2012-10-091-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/11131] Correctly use indefinite article for "warning".
| | * | | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11131
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| | * | | | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-1/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| | * | | | [ticket/11021] Better language strings for site home url/textNathan Guse2012-09-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the logo title to be {L_HOME} if {U_HOME} is used. Check if the Home text is instead of just equal to false when outputting it to the template PHPBB3-11021
| | * | | | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631Unknown Bliss2012-09-011-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/download/file.php
| | * \ \ \ \ Merge branch 'develop-olympus' into developNils Adermann2012-09-011-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10873] Change language for notice about undelivered, deleted PM.
| | | * | | | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the ticket for my reasoning. PHPBB3-10873
| | | * | | | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
| * | | | | | [ticket/10631] Use exceptions for errors. Build action list dynamically.Nathan Guse2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Remove references to delete extensionNathan Guse2012-09-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Make the enable/disable/purge notices more visable.Nathan Guse2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Validation for extensionsNathan Guse2012-09-011-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Stagger the enable/disable/purge for extensionsNathan Guse2012-09-011-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Various tidbits and cleanup on the acp extensions managerNathan Guse2012-09-011-103/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] A few more extension admin changesMichael Cullum2012-09-011-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Fixing some items mentioned in PRMichael Cullum2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Update extensions language file for some issues foundMichael Cullum2012-09-011-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Rename language file to extensions.phpMichael Cullum2012-09-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Removing ?> at end of customisations language fileMichael Cullum2012-09-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Some rewording of extensions admin languageMichael Cullum2012-09-011-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | [ticket/10631] Update extensions admin languageMichael Cullum2012-09-011-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added details page information, added a new line at end of file and removed some whitespace. PHPBB3-10631
| * | | | | | [ticket/10631] Adding an extensions adminMichael Cullum2012-09-013-0/+102
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | Merge remote-tracking branch 'Fyorl/feature/attach-dl' into developAndreas Fischer2012-08-261-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/feature/attach-dl: (75 commits) [feature/attach-dl] Removed the use of some abbreviations [feature/attach-dl] Changed $files_added checks [feature/attach-dl] Renamed $post_id to $post_msg_id [feature/attach-dl] Fixed a comment [feature/attach-dl] Optimised an sql query [feature/attach-dl] Fixed the logic in an sql statement [feature/attch-dl] $forum_id cast to int [feature/attach-dl] Fixed $file_added to $files_added [feature/attach-dl] Moved definition of $archive_name [feature/attach-dl] Swapped the order of an if statement [feature/attach-dl] Cast variables to int [feature/attach-dl] Added $archive_path [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma [feature/attach-dl] Renamed $count to $files_added [feature/attach-dl] Removed sprintf() use [feature/attach-dl] Removed need for array_keys() [feature/attach-dl] Added multiple attachment downloads to PMs [feature/attach-dl] Removed reliance on current($row) [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth [feature/attach-dl] Moved PM authentication handling into own function ...