aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge remote-tracking branch 'Fyorl/ticket/10941' into developAndreas Fischer2012-07-0916-0/+610
|\ \ \ \ \ \
| * | | | | | [ticket/10941] Removed superfluous arrayFyorl2012-07-091-1/+1
| * | | | | | [ticket/10941] File 'txt' now too big so changed tests to reflect thatFyorl2012-07-091-1/+1
| * | | | | | [ticket/10941] Added a comment to ensure tags stay uppercaseFyorl2012-07-091-0/+1
| * | | | | | [ticket/10941] Modified tearDown to use DirectoryIterator instead of globFyorl2012-07-091-2/+7
| * | | | | | [ticket/10941] Added tests/upload/fixture/copies to trackingFyorl2012-07-091-0/+0
| * | | | | | [ticket/10941] Fixed form test test_too_largeFyorl2012-07-091-2/+2
| * | | | | | [ticket/10941] Replaced use of English with language systemFyorl2012-07-091-2/+2
| * | | | | | [ticket/10941] Renamed classes and filenames so that tests runFyorl2012-07-092-5/+7
| * | | | | | [ticket/10941] Moved comment into markTestIncomplete parameterFyorl2012-07-091-3/+1
| * | | | | | [ticket/10941] Removed manual includes of mock classesFyorl2012-07-093-5/+3
| * | | | | | [ticket/10941] Added subdirectory for file operationsFyorl2012-07-098-22/+8
| * | | | | | [ticket/10941] Added some comments for clarificationFyorl2012-07-092-0/+15
| * | | | | | [ticket/10941] Fixed a failing testFyorl2012-07-091-1/+1
| * | | | | | [ticket/10941] Rearranged tests into their own classes or methodsFyorl2012-07-094-110/+151
| * | | | | | [ticket/10941] Removed the incomplete mark as is_image is fixedFyorl2012-07-091-11/+6
| * | | | | | [ticket/10941] Refactored tearDown to stop iterating over the directory.Fyorl2012-07-091-20/+15
| * | | | | | [ticket/10941] Refactored init_filespec to return new object.Fyorl2012-07-091-27/+26
| * | | | | | [ticket/10941] Minor typo fixesFyorl2012-07-092-3/+1
| * | | | | | [ticket/10941] Changed assertTrue to assertEqualsFyorl2012-07-091-1/+1
| * | | | | | [ticket/10941] Now actually checks for the value of errors.Fyorl2012-07-093-25/+29