aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-11-182-4/+21
|\
| * Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into develop-...Nils Adermann2011-11-182-4/+21
| |\
| | * [ticket/9776] Delete poll if no poll options were submitted.Joas Schilling2011-11-182-4/+21
* | | Merge branch 'develop-olympus' into developNils Adermann2011-11-183-1/+6
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-...Nils Adermann2011-11-183-1/+5
| |\ \
| | * | [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-143-1/+5
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-11-181-3/+3
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympusNils Adermann2011-11-181-3/+3
| |\ \
| | * | [ticket/9416] HTML entities in poll titles and options incorrectly re-encodedrxu2011-11-171-3/+3
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-11-183-1/+99
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop...Nils Adermann2011-11-183-1/+99
| |\ \ \
| | * | | [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracledmauri2011-11-151-1/+1
| | * | | [ticket/10296] Add unit test for CROSS JOIN with INNER JOINJoas Schilling2011-11-152-0/+98
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-181-12/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympusAndreas Fischer2011-11-181-12/+9
| |\ \ \ \
| | * | | | [ticket/10185] Always set board startdate on conversionJoas Schilling2011-11-151-12/+9
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-11-181-3/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
| |\ \ \ \
| | * | | | [ticket/9008] Incorrect unread topic tracking for unapproved topicsrxu2011-09-251-3/+9
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-172-1/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-172-1/+9
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-172-1/+9
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-153-0/+51
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-153-0/+51
| |\ \ \ \
| | * | | | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| | * | | | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-052-8/+8
| | * | | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-183-0/+51
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-142-108/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympusAndreas Fischer2011-11-142-110/+47
| |\ \ \ \ \
| | * | | | | [ticket/10452] Fix xHTML errors when print-viewing PMsJoas Schilling2011-11-142-110/+47
| | | |_|_|/ | | |/| | |
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10457' into developAndreas Fischer2011-11-141-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/10457] Undefined variable $request, when print-viewing PMsJoas Schilling2011-11-141-1/+1
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-142-6/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-142-6/+9
| |\ \ \ \ \ \
| | * | | | | | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-142-6/+9
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-144-1/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-144-1/+47
| |\ \ \ \ \ \
| | * | | | | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-143-1/+40
| | * | | | | | [ticket/9066] Disallow some database prefix to prevent same errors and problemsJoas Schilling2011-11-132-1/+8
| | |/ / / / /
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-1411-34/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympusAndreas Fischer2011-11-1411-33/+21
| |\ \ \ \ \ \
| | * | | | | | [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.cssAndreas Fischer2011-11-141-1/+1
| | * | | | | | [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.maelsoucaze2011-11-141-4/+0
| | * | | | | | [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.maelsoucaze2011-11-141-4/+0
| | * | | | | | [ticket/10254] Remove subsilver2 as default style on theme.maelsoucaze2011-11-141-1/+1
| | * | | | | | [ticket/10254] Remove style names from themes and fix some informations on it.maelsoucaze2011-11-1411-30/+26
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-132-5/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-132-5/+32
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-112-5/+32
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-134-6/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /