Robbie Averill
|
94428a7a14
|
Merge branch '2'
# Conflicts:
# code/PostgreSQLQuery.php
|
2018-11-26 14:30:28 +01:00 |
|
Loz Calver
|
0d9fcabc80
|
Merge pull request #91 from sminnee/strict-types
Strict types
|
2018-11-05 10:14:23 +01:00 |
|
Sam Minnee
|
8f70ac89ca
|
FIX: Removed test that has been moved back to framework
This test has been added for all database types in framework
in https://github.com/silverstripe/silverstripe-framework/pull/8448
|
2018-11-05 18:13:47 +13:00 |
|
Sam Minnee
|
72787ae83e
|
FIX: Return correct types in PostgreSQLQuery
Fixes https://github.com/silverstripe/silverstripe-postgresql/issues/90
Helps fix https://github.com/silverstripe/silverstripe-framework/issues/7039
|
2018-11-05 18:13:47 +13:00 |
|
Robbie Averill
|
522816fa00
|
Merge branch '2'
|
2018-09-24 12:50:48 +02:00 |
|
Robbie Averill
|
4c6034f350
|
Bump branch alias for 2.2.x-dev
|
2018-09-24 12:49:53 +02:00 |
|
Robbie Averill
|
edfa209a3c
|
Merge branch '2.1' into 2
|
2018-09-24 12:49:36 +02:00 |
|
Robbie Averill
|
e123f69b7b
|
Remove obsolete branch alias
|
2018-09-24 12:48:49 +02:00 |
|
Daniel Hensby
|
9590000630
|
Merge pull request #89 from creative-commoners/pulls/3.0/phpunit-version
FIX Ensure tests pass by reducing PHPUnit to 7.1.3
|
2018-08-20 17:47:15 +01:00 |
|
Robbie Averill
|
fb412d2c46
|
FIX Ensure tests pass by reducing PHPUnit to 7.1.3
See https://github.com/silverstripe/silverstripe-framework/pull/8271
|
2018-08-17 21:04:00 +12:00 |
|
Daniel Hensby
|
4157408adb
|
Merge branch '2'
|
2018-07-13 17:43:45 +01:00 |
|
Daniel Hensby
|
4c89d103c5
|
Merge branch '1' into 2
|
2018-07-13 17:42:10 +01:00 |
|
Maxime Rainville
|
6378003540
|
Prefer source so we get the tests.
|
2018-07-02 11:47:15 +12:00 |
|
Maxime Rainville
|
b210c7284f
|
Targeting 4.3.x-dev
Third time's a charm.
|
2018-07-02 11:47:15 +12:00 |
|
Maxime Rainville
|
7fe935fc89
|
Correct typo in targeted version.
|
2018-07-02 11:47:15 +12:00 |
|
Maxime Rainville
|
694c4059b9
|
Test against recipe-cms 4.
|
2018-07-02 11:47:15 +12:00 |
|
Maxime Rainville
|
6d80ea2bfe
|
Test against recipe-cms 5.x-dev.
Parent issue silverstripeltd/open-sourcerers#31
|
2018-06-29 16:29:36 +12:00 |
|
Robbie Averill
|
6cfc30952c
|
Merge pull request #86 from open-sausages/pulls/2/report-transaction-nesting
API Support better transaction nesting
|
2018-06-19 16:57:46 +12:00 |
|
Damian Mooyman
|
e0d5536715
|
API Support better transaction nesting
|
2018-06-19 16:20:07 +12:00 |
|
Damian Mooyman
|
01cc78ec94
|
Merge pull request #85 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
|
2018-06-18 10:12:41 +12:00 |
|
Dylan Wagstaff
|
513c969c93
|
Add supported module badge to readme
|
2018-06-15 17:43:43 +12:00 |
|
Daniel Hensby
|
bb5bda6643
|
Merge pull request #84 from kinglozzer/generators
Update PostgreSQLQuery to use generators
|
2018-03-17 14:48:16 +00:00 |
|
Loz Calver
|
25e57f4598
|
Update PostgreSQLQuery to use generators
|
2018-03-16 16:43:07 +00:00 |
|
Damian Mooyman
|
577988715f
|
Merge remote-tracking branch 'origin/2'
|
2018-02-09 10:06:00 +13:00 |
|
Damian Mooyman
|
e3825697d0
|
Merge remote-tracking branch 'origin/2.0' into 2
|
2018-02-09 10:05:32 +13:00 |
|
Daniel Hensby
|
47a6ebb4e3
|
FIX Allow nested transactions
|
2018-02-09 10:05:00 +13:00 |
|
Damian Mooyman
|
2bbd73620d
|
Merge pull request #83 from dhensby/pulls/2.0/nested-transactions
FIX Allow nested transactions
|
2018-02-09 09:50:46 +13:00 |
|
Daniel Hensby
|
97afbd9a88
|
FIX Allow nested transactions
|
2018-02-08 20:00:49 +00:00 |
|
Damian Mooyman
|
917884e015
|
Merge pull request #82 from creative-commoners/pulls/3.0/travis-update
Update dependencies to PHP 7.1 and PHPUnit 7
|
2018-01-23 18:04:30 +13:00 |
|
Robbie Averill
|
48992633c2
|
Prefer source for Travis build installations
|
2018-01-23 14:32:45 +13:00 |
|
Robbie Averill
|
892798c6fd
|
FIX Prefer source for framework so we can run tests for it
|
2018-01-18 17:55:25 +13:00 |
|
Robbie Averill
|
6f11131d4f
|
Update dependencies to PHP 7.1 and PHPUnit 7
|
2018-01-18 16:31:14 +13:00 |
|
Damian Mooyman
|
2e2868c237
|
Merge remote-tracking branch 'origin/2'
|
2017-12-07 16:31:59 +13:00 |
|
Damian Mooyman
|
f2392eb7c6
|
Merge remote-tracking branch 'origin/2.0' into 2
|
2017-12-07 16:31:21 +13:00 |
|
Damian Mooyman
|
1f6d892609
|
Merge remote-tracking branch 'origin/1.2' into 2.0
# Conflicts:
# code/PostgreSQLDatabase.php
|
2017-12-07 16:30:22 +13:00 |
|
Damian Mooyman
|
2d11336dce
|
Merge remote-tracking branch 'origin/1.2' into 1
|
2017-12-07 16:26:06 +13:00 |
|
Damian Mooyman
|
aa16771922
|
Merge pull request #1 from silverstripe-security/patch/1.2/SS-2017-008
[SS-2017-008] Fix SQL injection in search engine
|
2017-12-07 15:59:04 +13:00 |
|
Damian Mooyman
|
fc51749386
|
Framework 5.0 compatible branch
|
2017-11-28 10:39:22 +13:00 |
|
Damian Mooyman
|
6dbacea799
|
Merge branch '2'
|
2017-11-28 10:38:01 +13:00 |
|
Damian Mooyman
|
05e15d85d6
|
Merge branch '2.0' into 2
|
2017-11-28 10:37:16 +13:00 |
|
Damian Mooyman
|
a401f7ad24
|
Remove alias from 2.0 branch
|
2017-11-28 10:36:18 +13:00 |
|
Loz Calver
|
390cb09928
|
FIX: Add missing $totalCount variable
|
2017-11-25 21:40:01 +00:00 |
|
Daniel Hensby
|
d110b92fc8
|
Merge pull request #80 from kinglozzer/fix-searchengine
Fix PostgreSQLDatabase::searchEngine()
|
2017-11-25 18:09:58 +00:00 |
|
Loz Calver
|
851309f187
|
Fix PostgreSQLDatabase::searchEngine()
|
2017-11-24 22:28:01 +00:00 |
|
Daniel Hensby
|
ee356b1ad7
|
[SS-2017-008] Fix SQL injection in search engine
|
2017-11-21 15:34:59 +00:00 |
|
Daniel Hensby
|
a32f5e556a
|
Correcting travis install steps
|
2017-11-21 11:38:00 +00:00 |
|
Damian Mooyman
|
1277361a6c
|
Remove version constraint
|
2017-11-21 18:32:56 +13:00 |
|
Chris Joe
|
e41df60b40
|
Merge pull request #78 from open-sausages/pulls/4.0/update-4.0-stable
BUG Fix 4.0.0 compat / PDO not working
|
2017-11-20 11:14:34 +13:00 |
|
Damian Mooyman
|
685e33cf84
|
BUG Fix postgres + PDO not working
BUG Fix empty enums
|
2017-11-20 09:07:32 +13:00 |
|
Damian Mooyman
|
8c5f95fdaa
|
Merge pull request #77 from Rudigern/insert-concurrency-issue
getGeneratedID to use currval() which is session dependent
|
2017-10-20 18:47:01 +13:00 |
|