aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | [ticket/14633] Check for XML extension support on installMáté Bartus2016-07-301-0/+2
| | | | | | | | | | | | | | | | PHPBB3-14633
* | | | Merge pull request #4344 from Senky/ticket2/14586Marc Alexander2016-07-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14586] Add OAuth1 support
| * | | | [ticket/14586] Add OAuth1 supportJakub Senko2016-05-301-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14586
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-172-462/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4378 from Crizz0/ticket/14704Marc Alexander2016-07-172-462/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14704] Removes unused function and language files in base.php
| | * | | | [ticket/14704] Removes unused function and language files in base.phpCrizzo2016-07-032-462/+0
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14704
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-071-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php
| * | | | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-072-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick
| | * | | | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-112-4/+4
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14654
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-061-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
| | * | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-171-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This should help users trying to figure out why their mail config is not working when they forgot to use a protocol prefix. PHPBB3-14184
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-195-5/+5
|\ \ \ \ | |/ / /
| * | | [ticket/14683] Fix typos in email templates.rxu2016-06-205-5/+5
| | | | | | | | | | | | | | | | PHPBB3-14683
* | | | Merge pull request #4326 from Crizz0/ticket/14640Marc Alexander2016-06-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2
| * | | | [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docuCrizzo2016-05-181-1/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-14640
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+10
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: phpBB/language/en/install.php
| * | [ticket/13716] Remove extra br tag and correct missing closing a html tagRichard McGirr2016-05-161-1/+1
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-17/+1
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Fix grammar and href title tagsRichard McGirr2016-04-061-7/+7
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-051-0/+25
| |/ | | | | | | | | | | | | | | Display a warning in the ACP if the version constant (files) does not match the phpbb_config version (often indicating that the database updates hasn't been run) PHPBB3-13716
* | [ticket/13969] Remove obsolute language filesPaul Sohier2016-04-282-470/+0
| | | | | | | | | | | | These help_*.php files have been moved to help/ PHPBB3-13969
* | [ticket/14589] Fix grammatical errors in language stringsMáté Bartus2016-04-111-6/+6
| | | | | | | | PHPBB3-14589
* | [ticket/14589] Add error messages for failable installer requirementsMáté Bartus2016-04-101-9/+13
| | | | | | | | PHPBB3-14589
* | Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-031-0/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14561] Add more user commands * VSEphpbb/ticket/14561: [ticket/14561] Remove requires for functions in tests [ticket/14561] Small change to progress bar output [ticket/14561] Fix function docblock in activate command [ticket/14561] Add a progress bar to reclean command [ticket/14561] Use the user loader where appropriate [ticket/14561] Add extra help explaining reclean command [ticket/14561] Import classes with use statements [ticket/14561] Remove unused use statements [ticket/14561] Refactor tests [ticket/14561] Reclean usernames command [ticket/14561] User activate command [ticket/14561] User delete command
| * | [ticket/14561] Add a progress bar to reclean commandMatt Friedman2016-03-311-1/+2
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] Add extra help explaining reclean commandMatt Friedman2016-03-311-0/+1
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] Reclean usernames commandMatt Friedman2016-03-311-0/+6
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] User activate commandMatt Friedman2016-03-311-0/+7
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] User delete commandMatt Friedman2016-03-311-0/+4
| | | | | | | | | | | | PHPBB3-14561
* | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-021-1/+1
|/ / | | | | | | | | | | | | | | DO NOT apply these changes into master when merging it. This means that you'll have to checkout the latest files from upstream after merging this into master (possibly while resolving likely merge conflicts). PHPBB3-14495
* | [ticket/14329] Add missing ACP language varsRichard McGirr2016-03-271-0/+10
| | | | | | | | PHPBB3-14329
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-271-1/+1
|\ \ | |/
| * Merge pull request #4230 from Senky/ticket/13028Marc Alexander2016-03-271-1/+1
| |\ | | | | | | | | | [ticket/13028] Rename unanswered search label
| | * [ticket/13028] Rename unanswered search labelJakub Senko2016-03-181-1/+1
| | | | | | | | | | | | PHPBB3-13028
* | | Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-261-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12684] Add console command user:add * VSEphpbb/ticket/12684: (26 commits) [ticket/12684] Use a switch statement for readability [ticket/12684] Refactor a test [ticket/12684] Use interactive method correctly [ticket/12684] Extract interactivity to a method [ticket/12684] Update option help [ticket/12684] Add extended help for the user:add command [ticket/12684] Add shorthand alternates to the options [ticket/12684] Remove whitespace [ticket/12684] Add an error on user creation failure [ticket/12684] Remove unnecessary null arguments [ticket/12684] Additional clean up [ticket/12684] Allowed to use $this in enclosure [ticket/12684] Move all lang keys to cli [ticket/12684] Fix a few mistakes and clean it up [ticket/12684] Some code clean up [ticket/12684] Another little fix [ticket/12684] Fix tests [ticket/12684] Update to use non-deprecated methods [ticket/12684] Add send email option [ticket/12684] Add input validation ...
| * | | [ticket/12684] Update option helpMatt Friedman2016-03-081-1/+1
| | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add extended help for the user:add commandMatt Friedman2016-03-081-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Move all lang keys to cliMatt Friedman2016-02-292-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add send email optionMatt Friedman2016-02-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Updates for 3.2 APIMatt Friedman2016-02-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix merge errorsMatt Friedman2016-02-291-0/+5
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add command user:addLEZY Thomas2016-02-291-0/+2
| | | | | | | | | | | | | | | | PHPBB3-12684
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-261-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * 3.1.x: [ticket/13013] Explain to user explicitl what "participate more" means
| * | | [ticket/13013] Explain to user explicitl what "participate more" meansJakub Senko2016-03-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13013
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-252-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| * | | [ticket/14241] Log fatal captcha error to error logMarc Alexander2016-03-121-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14241
| * | | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improper setup of the q&a captcha in combination with the admin choosing a default language that does not have any questions and answers set might result in the user being presented empty questions and answers. This change will try to fall back to any question in case the admin incorrectly set the default language and has no questions & answers set. If that does not work, the captcha will not allow passing it and suggest to contact the board admin to resolve this issue. PHPBB3-14241
* | | Merge branch '3.2.x'Marc Alexander2016-03-051-1/+1
|\ \ \
| * \ \ Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-051-1/+1
| |\ \ \ | | |/ /