aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-191-30/+37
|\
| * Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-releas...Nils Adermann2012-07-191-30/+37
| |\
| | * [ticket/10441] Make CDB linking more consistentPatrick Webster2012-07-021-5/+5
| | * [ticket/10441] TypoPatrick Webster2012-06-291-1/+1
| | * [ticket/10441] Update to docs/README.htmlOyabun12012-06-291-28/+35
* | | 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 '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 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 '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 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 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 'github-bantu/ticket/10974' into develop-olympusNils Adermann2012-07-083-2/+2
|\ \ \ \ \
| * | | | | [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.phpAndreas Fischer2012-07-083-2/+2
* | | | | | Merge PR #856 branch 'prep-release-3.0.11' into develop-olympusOleg Pudeyev2012-07-074-8/+55
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11Oleg Pudeyev2012-07-074-8/+55
| |\ \ \ \
| | * | | | [ticket/10937] Update documentation to say which comment styles are removed.Andreas Fischer2012-07-031-1/+1
| | * | | | [ticket/10937] Comment removal functions: Restore backward compatibilityAndreas Fischer2012-07-034-8/+55
* | | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-013-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'Noxwizard/ticket/10773' into prep-release-3.0.11Andreas Fischer2012-07-013-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-303-3/+3
| |/ / / /
* | | | | Merge branch 'ticket/brunoais/10850' into develop-olympusAndreas Fischer2012-06-281-1/+1
|\ \ \ \ \
| * | | | | [ticket/10850] Changed the fopen mode to wbBruno Ais2012-06-281-1/+1
|/ / / / /
* | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-212-2/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10935' into prep-release-3...Andreas Fischer2012-06-212-2/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-202-2/+16
* | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11Andreas Fischer2012-06-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/10925] Clarify installation requirements for SQLitePatrick Webster2012-06-191-1/+1
* | | | | Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-ol...Nils Adermann2012-06-191-1/+1
|\ \ \ \ \
| * | | | | [ticket/9551] uncomment line and change length to 255Dhruv Goel2012-06-191-1/+1
* | | | | | Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympusNils Adermann2012-06-121-0/+15
|\ \ \ \ \ \