aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'Fyorl/ticket/10944' into developAndreas Fischer2012-07-191-6/+9
|\
| * [ticket/10944] strpos now stricter and removed superfluous ternaryFyorl2012-07-171-1/+1
| * [ticket/10944] Reverted changes in PHPBB3-10963Fyorl2012-07-171-6/+9
* | Merge remote-tracking branch 'Fyorl/ticket/10992' into developAndreas Fischer2012-07-191-17/+24
|\ \
| * | [ticket/10992] Changed octetstream to octet-streamFyorl2012-07-161-1/+1
| * | [ticket/10992] test_empty_file() now tries to upload the correct fileFyorl2012-07-161-1/+1
| * | [ticket/10992] Modified upload tests to work with new versionFyorl2012-07-161-17/+24
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-196-21/+61
|\ \
| * \ Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympusAndreas Fischer2012-07-197-13/+85
| |\ \
| | * | [ticket/10981] Added check for PHP version before running composerFyorl2012-07-171-1/+1
| | * | [ticket/10981] Modified travis to use composer with --devFyorl2012-07-171-0/+3
| | * | [ticket/10981] Removed setupBeforeClassFyorl2012-07-171-8/+0
| | * | [ticket/10981] Modified functional framework to account for goutte changesFyorl2012-07-161-3/+6
| | * | [ticket/10981] Added goutte via composerFyorl2012-07-166-2/+76
* | | | Merge remote-tracking branch 'mvinny/ticket/10998' into developAndreas Fischer2012-07-191-1/+2
|\ \ \ \
| * | | | [ticket/10998] Add border-radius to forum rules block - prosilverVinny2012-07-181-1/+2
* | | | | Merge pull request #877 from Drae/feature/pagination-as-listNils Adermann2012-07-1964-315/+728
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [feature/pagination-as-list] New parameter for name of start varDrae2012-07-1824-31/+32
| * | | | [feature/pagination-as-list] Updates for nils commentsDrae2012-07-1825-193/+57
| * | | | [feature/pagination-as-list] Rename and deprecate functionsDrae2012-07-1825-29/+72
| * | | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-1853-569/+303
| * | | | [ticket/10968] Render pagination within the templateDrae2012-07-1863-268/+1039
|/ / / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-181-2/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympusAndreas Fischer2012-07-181-2/+2
| |\ \ \
| | * | | [ticket/10996] Use correct DBMS name in Travis config for PostgreSQLPatrick Webster2012-07-181-2/+2
| |/ / /
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-175-6/+201
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-oly...Nils Adermann2012-07-175-6/+201
| |\ \ \
| | * | | [ticket/10678] Typo and formattingPatrick Webster2012-05-132-6/+6
| | * | | [ticket/10678] Add port handling for MSSQL testsPatrick Webster2012-05-081-0/+7
| | * | | [ticket/10678] Move config changes to new locationPatrick Webster2012-05-081-1/+3
| | * | | [ticket/10678] Rename helper class filePatrick Webster2012-05-082-1/+1
| | * | | [ticket/10678] Lowercase class name, adjust comment widthPatrick Webster2012-05-083-14/+18
| | * | | [ticket/10678] More formatting and docblocksPatrick Webster2012-05-082-4/+12
| | * | | [ticket/10678] More formatting requestsPatrick Webster2012-05-082-8/+5
| | * | | [ticket/10678] Fix formattingPatrick Webster2012-05-083-7/+15
| | * | | [ticket/10678] Add better support for Firebird, Oracle, and MSSQLPatrick Webster2012-05-084-5/+171
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10969' into developNils Adermann2012-07-172-46/+3
|\ \ \ \ \
| * | | | | [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()Andreas Fischer2012-07-081-9/+0
| * | | | | [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).Andreas Fischer2012-07-082-37/+3
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-171-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'bantu/ticket/10995' into develop-olympusAndreas Fischer2012-07-171-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10995] Return false in mssqlnative sql_fetchrow on empty resultPatrick Webster2012-07-171-1/+1
| |/ / / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-171-3/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympusAndreas Fischer2012-07-171-3/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [ticket/10789] Remove unnecessary variables from PM print - prosilverVinny2012-05-221-3/+2
* | | | | | Merge remote-tracking branch 'github-exreaction/ticket/7598' into developNils Adermann2012-07-171-1/+6
|\ \ \ \ \ \
| * | | | | | [ticket/7598] Use $user->lang['COMMA_SEPARATOR']Nathan2012-07-141-3/+3
| * | | | | | [ticket/7598] Inactive users action notification (ACP)Nathan2012-07-131-1/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10942' into developAndreas Fischer2012-07-179-1/+205
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10942] Avoid possible conflicts with magic words in unit testsJoas Schilling2012-07-161-12/+12