aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-032-0/+3
|\
| * [ticket/10737] Enforce allow_live_searches setting in memberlist.php.Cesar G2014-04-231-0/+1
| * [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+2
* | Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-asc...Nils Adermann2014-05-022-1/+1
|\ \
| * | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-152-1/+1
* | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into deve...Nils Adermann2014-05-021-1/+4
|\ \ \
| * | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-021-1/+4
* | | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-asc...Nils Adermann2014-05-021-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-0549-242/+679
| |\ \ \
| * \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-0717-142/+293
| |\ \ \ \
| * | | | | [ticket/8323] Only disable administrative deactivated accounts from receiving...Nathan2012-07-101-1/+0
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-101-0/+1
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who do not ha...Nathan2012-07-101-0/+1
* | | | | | Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeusNils Adermann2014-05-021-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ticket/8960-olympus' into ticket/8960Marc Alexander2014-04-161-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/8960] Allow changing avatar path if it's not writableMarc Alexander2014-04-141-1/+1
* | | | | | | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into dev...Nils Adermann2014-05-021-0/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/8558] Use only one variable and improve explain stringOliver Schramm2014-04-171-1/+1
| * | | | | | | [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-171-0/+2
* | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop...Nils Adermann2014-05-021-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12371] Fix language stringJoas Schilling2014-05-021-2/+2
| * | | | | | | | [ticket/12371] Do not add unlimited users as respondersJoas Schilling2014-04-251-2/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-asc...Nathaniel Guse2014-05-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12445] Change the formulationNicofuma2014-04-281-2/+2
| * | | | | | | | [ticket/12445] Disapproved post: the name of the poster should be in logsNicofuma2014-04-261-2/+2
* | | | | | | | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-292-2/+2
* | | | | | | | | [ticket/12456] Add , after the last array elementJoas Schilling2014-04-296-9/+9
* | | | | | | | | [ticket/12456] Fix duplicated empty lines in language filesJoas Schilling2014-04-295-7/+0
* | | | | | | | | [ticket/12456] Fix missing new lines at the end of email templatesJoas Schilling2014-04-2918-21/+17
|/ / / / / / / /
* | | | | | | | Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeusCesar G2014-04-252-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ticket/12389] Change "PM" to "Message"PayBas2014-04-241-1/+1
| * | | | | | | [ticket/12389] Moved PM tools to UCP templatePayBas2014-04-201-0/+1
| * | | | | | | [ticket/12389] Change language of email friendPayBas2014-04-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2036 from prototech/ticket/12201Joas Schilling2014-04-222-9/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-152-8/+6
| * | | | | | [ticket/12201] Fix typos in language pack.Cesar G2014-04-151-4/+4
| * | | | | | [ticket/12201] Display error and sorting options when there are no attachmentsCesar G2014-04-151-0/+1
| |/ / / / /
* | | | | | [ticket/12345] Improve search flood interval message for ascraeusn-aleha2014-04-161-1/+4
|/ / / / /
* | | | | Merge branch 'develop-olympus' into develop-ascraeusCesar G2014-04-101-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10687] Improve error message if unable to get image dimensionsMarc Alexander2014-04-091-1/+1
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop...Nils Adermann2014-04-101-1/+4
|\ \ \ \ \
| * | | | | [ticket/12113] Correctly use plurals when deleting user warningsJoas Schilling2014-04-011-1/+4
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeusCesar G2014-04-091-285/+1
|\ \ \ \ \ \
| * | | | | | [ticket/8700] Use L_COLON instead of adding ":" manuallyJoas Schilling2014-04-021-1/+1
| * | | | | | [ticket/8700] Remove unused language stringsJoas Schilling2014-04-021-284/+0
| |/ / / / /
* | | | | | [ticket/12361] Replace the Google logo.Maƫl Soucaze2014-04-071-2/+2
* | | | | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-292-3/+3
* | | | | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-291-0/+1
* | | | | | [ticket/12150] Add options to acpMarc Alexander2014-03-291-0/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-6/+23
|\ \ \ \ \