aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | | [ticket/10942] Add access modifiersJoas Schilling2012-07-046-7/+7
| * | | | | [ticket/10942] Use ANSI SQL standard || in dbal.phpJoas Schilling2012-07-026-25/+17
| * | | | | [ticket/10942] Fix up unit tests for sql_case()Joas Schilling2012-07-021-11/+28
| * | | | | [ticket/10942] Require same data type and do not cast expressions automaticallyJoas Schilling2012-07-026-65/+2
| * | | | | [ticket/10942] Make unit tests for sql_case simplerJoas Schilling2012-06-301-31/+19
| * | | | | [ticket/10942] Add a comment why we cast to sql_case()Joas Schilling2012-06-205-0/+5
| * | | | | [ticket/10942] Rename method sql_conditional() to sql_case()Joas Schilling2012-06-207-44/+44
| * | | | | [ticket/10942] Change term string to expression to avoid confusionJoas Schilling2012-06-207-17/+17
| * | | | | [ticket/10942] Fix sql_conditional for mssql, postgre and oracleJoas Schilling2012-06-205-0/+60
| * | | | | [ticket/10942] Fix function name on order_lower_test.phpJoas Schilling2012-06-201-1/+1
| * | | | | [ticket/10942] Add unit tests for sql_concatenateJoas Schilling2012-06-201-0/+64
| * | | | | [ticket/10942] Add sql_concatenate to dbalJoas Schilling2012-06-207-0/+60
| * | | | | [ticket/10942] Add unit tests for sql_conditionalJoas Schilling2012-06-201-0/+64
| * | | | | [ticket/10942] Add sql_conditional to dbalJoas Schilling2012-06-201-0/+17
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-121-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-121-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11Andreas Fischer2012-07-121-1/+1
| | |\ \ \ \ \
| | | * | | | | [ticket/10978] Fix typo in prosilver ucp_groups_membership.htmlPatrick Webster2012-07-091-1/+1