aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2739-158/+237
* Merge pull request #2429 from Nicofuma/ticket/12074Joas Schilling2014-05-261-0/+4
|\
| * [ticket/12074] Don't log errorsTristan Darricau2014-05-091-15/+1
| * [ticket/12074] Managing extensions doesn't produce any log entryTristan Darricau2014-05-091-0/+18
* | Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeusCesar G2014-05-161-2/+3
|\ \
| * | [ticket/12525] Add string argument to contact and email user language variablesn-aleha2014-05-171-2/+3
* | | Merge pull request #2463 from nickvergessen/ticket/12433Andreas Fischer2014-05-151-0/+1
|\ \ \
| * | | [ticket/12433] Use a different message when nesting of quotes is not allowedJoas Schilling2014-05-151-0/+1
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-05-152-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/12540] Fix broken placeholders in language filesJoas Schilling2014-05-133-3/+3
* | | | Merge pull request #2452 from n-aleha/ticket/12519Joas Schilling2014-05-131-1/+1
|\ \ \ \
| * | | | [ticket/12519] Restore m_approve language descriptionn-aleha2014-05-121-1/+1
| | |/ / | |/| |
* / | | [ticket/12451] Fix whitespace in posting.php lang fileOliver Schramm2014-05-111-1/+1
|/ / /
* | | Merge pull request #2420 from prototech/ticket/9388Joas Schilling2014-05-111-0/+1
|\ \ \
| * | | [ticket/9388] Display only the settings for the auth method that's selected.Cesar G2014-05-081-0/+1
| | |/ | |/|
* | | Merge pull request #2340 from PayBas/ticket/12431Joas Schilling2014-05-111-0/+1
|\ \ \ | |/ / |/| |
| * | [ticket/12431] Lang full sentencePayBas2014-05-081-1/+1
| * | [ticket/12431] Add has_poll icon to topiclistsPayBas2014-05-021-0/+1
* | | Merge pull request #2363 from Elsensee/ticket/12451Joas Schilling2014-05-081-7/+12
|\ \ \
| * | | [ticket/12451] Remove duplicated lang varOliver Schramm2014-05-031-10/+8
| * | | [ticket/12451] Split TOO_MANY_CHARS vars for pluralsOliver Schramm2014-05-031-2/+5
| * | | [ticket/12451] Split TOO_FEW_CHARS_LIMIT for pluralsOliver Schramm2014-05-031-2/+6
* | | | Merge pull request #2373 from Nicofuma/ticket/12459Joas Schilling2014-05-061-3/+6
|\ \ \ \
| * | | | [ticket/12459] Change language stringsTristan Darricau2014-05-051-4/+6
| * | | | [ticket/12459] Fix: Soft deleted topics should appear in feedsTristan Darricau2014-05-041-0/+1
| |/ / /
* | | | Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeusCesar G2014-05-041-2/+2
|\ \ \ \
| * | | | [ticket/12415] Use private message instead of "pm" accronymGaƫtan Muller2014-05-041-2/+2
* | | | | [ticket/12455] Remove unused language strings from common.php and app.phpn-aleha2014-05-042-5/+0
|/ / / /
* | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |