Daniel Hensby
|
f176bb0a39
|
FIX Add nested transaction support
|
2018-02-09 11:24:35 +00:00 |
|
Damian Mooyman
|
e8f4e55b8a
|
Merge remote-tracking branch 'origin/1.4' into 2.0
# Conflicts:
# .travis.yml
# code/SQLite3Database.php
# composer.json
|
2017-12-07 16:16:11 +13:00 |
|
Damian Mooyman
|
2bde2640c3
|
Merge pull request #1 from silverstripe-security/patch/1.4/SS-2017-008
[SS-2017-008] Fix SQL injection in search engine
|
2017-12-07 15:59:01 +13:00 |
|
Daniel Hensby
|
4aad42c084
|
[SS-2017-008] Fix SQL injection in search engine
|
2017-11-21 16:16:32 +00:00 |
|
Damian Mooyman
|
7304708fa1
|
BUG Fix installer for 4.0 (#29)
|
2016-10-26 14:24:31 +13:00 |
|
Loz Calver
|
cfdf20b253
|
Merge pull request #28 from mikenz/patch-1
Update for latest SS4 changes
|
2016-10-10 09:05:52 +01:00 |
|
Mike Cochrane
|
dd81faac7b
|
Update for latest SS4 changes
|
2016-10-10 11:13:18 +13:00 |
|
Daniel Hensby
|
360b70aa22
|
Merge pull request #27 from open-sausages/pulls/4.0/fix-path-warnings
BUG Fix errors when 'path' isn't declared explicitly
|
2016-09-30 12:24:10 +01:00 |
|
Damian Mooyman
|
6d74fc05cf
|
BUG Fix errors when 'path' isn't declared explicitly
|
2016-09-30 15:45:13 +13:00 |
|
Damian Mooyman
|
b710ef04b3
|
Rename SS_ prefixed classes (#26)
|
2016-09-09 15:46:48 +12:00 |
|
Ingo Schommer
|
8001e69b71
|
Merge pull request #25 from open-sausages/pulls/4.0/namespace-everything
Upgrade for silverstripe namespaces
|
2016-09-08 16:11:21 +12:00 |
|
Damian Mooyman
|
1cb63311d8
|
Upgrade for silverstripe namespaces
|
2016-09-08 15:41:17 +12:00 |
|
Ingo Schommer
|
32ae8f8d94
|
Merge pull request #24 from open-sausages/pulls/4.0/namespace-cms
Update for SilverStripe\CMS namespace
|
2016-08-12 16:39:36 +12:00 |
|
Damian Mooyman
|
99e6081c42
|
Update for SilverStripe\CMS namespace
|
2016-08-12 13:22:58 +12:00 |
|
Damian Mooyman
|
72638cf40e
|
BUG Fix incorrect upgrade / rules
|
2016-07-05 16:27:01 +12:00 |
|
Ingo Schommer
|
d09ab6bea4
|
Merge pull request #23 from open-sausages/pulls/4.0/namespace
API Apply SilverStripe\SQLite namespace to module
|
2016-07-01 15:10:06 +12:00 |
|
Damian Mooyman
|
e36e74ab2f
|
API Apply SilverStripe\SQLite namespace to module
|
2016-06-29 13:55:45 +12:00 |
|
Damian Mooyman
|
0bd28649f5
|
Merge pull request #21 from dhensby/pulls/2.0/travis-fix
Update travis for 4.0 tests
|
2016-03-24 11:57:08 +13:00 |
|
Damian Mooyman
|
df303356cd
|
Merge pull request #19 from helpfulrobot/add-standard-scrutinizer-config
Added standard Scrutinizer config
|
2016-03-24 11:52:54 +13:00 |
|
Loz Calver
|
149d1708b6
|
Merge pull request #20 from dhensby/pulls/1.4/travis
Update travis test coverage
|
2016-03-23 13:50:28 +00:00 |
|
Daniel Hensby
|
8a4e3434bc
|
Update travis for 4.0 tests
|
2016-03-23 12:48:55 +00:00 |
|
Daniel Hensby
|
ea1d504617
|
Update travis test coverage
|
2016-03-23 11:37:24 +00:00 |
|
helpfulrobot
|
c77a73e970
|
Added standard Scrutinizer config
|
2016-03-23 23:18:23 +13:00 |
|
Daniel Hensby
|
7cf13c1808
|
Merge pull request #18 from helpfulrobot/add-standard-code-of-conduct-file
Added standard code of conduct file
|
2016-02-16 09:44:36 +00:00 |
|
helpfulrobot
|
f7ef5f16de
|
Added standard code of conduct file
|
2016-02-16 11:42:22 +13:00 |
|
Ingo Schommer
|
9780bb014c
|
Merge pull request #17 from silverstripe-labs/pulls/fix-tests
BUG Fix .travis.yml
|
2016-01-18 15:54:26 +13:00 |
|
Damian Mooyman
|
c95cbcdc01
|
BUG Fix .travis.yml
|
2016-01-18 15:28:10 +13:00 |
|
Damian Mooyman
|
941fc9d857
|
Merge pull request #16 from helpfulrobot/add-standard-gitattributes-file
Added standard .gitattributes file
|
2016-01-18 15:25:37 +13:00 |
|
helpfulrobot
|
0c0dceacac
|
Added standard .gitattributes file
|
2016-01-16 19:32:49 +13:00 |
|
Damian Mooyman
|
608458ccb8
|
Merge pull request #15 from helpfulrobot/convert-to-psr-2
Converted to PSR-2
|
2015-12-18 10:05:28 +13:00 |
|
helpfulrobot
|
b2d40ed61e
|
Converted to PSR-2
|
2015-12-18 07:11:01 +13:00 |
|
Damian Mooyman
|
7daf437e24
|
Merge pull request #14 from helpfulrobot/add-standard-editorconfig-file
Added standard .editorconfig file
|
2015-12-17 14:07:08 +13:00 |
|
helpfulrobot
|
4b6dcd8dde
|
Added standard .editorconfig file
|
2015-12-17 10:06:47 +13:00 |
|
Damian Mooyman
|
e76bd4b1a1
|
API Update master to new major version for 4.0 compat
|
2015-10-16 11:17:24 +13:00 |
|
Damian Mooyman
|
65cd866f42
|
Restrict 1.4 to ~3.2
|
2015-10-16 11:16:30 +13:00 |
|
Sean Harvey
|
feb9676d7d
|
Merge pull request #12 from dhensby/patch-2
Move to new travis containerised infrastructure
|
2015-07-21 08:40:30 +12:00 |
|
Daniel Hensby
|
e2293d4dab
|
Move to new travis containerised infrastructure
|
2015-07-20 16:10:08 +01:00 |
|
Damian Mooyman
|
45c97db3ae
|
Merge pull request #10 from dhensby/patch-1
Updating travis provisioner
|
2015-07-02 12:15:29 +12:00 |
|
Sam Minnée
|
85f82c2517
|
Merge pull request #11 from silverstripe-labs/pulls/1.4/update-api
Update API for 3.2 release
|
2015-06-17 15:47:31 +01:00 |
|
Damian Mooyman
|
b06bff09bf
|
Update API for 3.2 release
See https://github.com/silverstripe/silverstripe-framework/pull/4288
|
2015-06-17 15:03:36 +12:00 |
|
Daniel Hensby
|
de919e1700
|
Updating travis provisioner
Travis will now be more resilient to `composer self-update` failures
|
2015-06-15 10:27:00 +01:00 |
|
Damian Mooyman
|
dda4c3ab48
|
Merge pull request #9 from kinglozzer/fix-null-offset
Fix null offset
|
2015-05-05 09:50:49 +12:00 |
|
Loz Calver
|
4a91d999ee
|
Fix null offset
|
2015-05-04 22:37:13 +01:00 |
|
Damian Mooyman
|
e4960193b8
|
Merge pull request #8 from kinglozzer/pulls/orm-null-limit
NEW: Allow 'null' limit in database queries
|
2015-05-05 09:03:25 +12:00 |
|
Loz Calver
|
9bad442cc5
|
Enable 'null' limit
|
2015-05-04 15:35:35 +01:00 |
|
Damian Mooyman
|
de9c9274da
|
Merge pull request #6 from ClaySolutions/master
Add bigint support
|
2015-02-25 08:51:33 +13:00 |
|
Damian Mooyman
|
a3bb5cdfb7
|
Relax framework requirement to include 4.0
|
2014-12-05 09:38:57 +13:00 |
|
ClayLennart
|
f9153ab6c2
|
Add bigint support
|
2014-07-15 09:50:51 +02:00 |
|
Simon Welsh
|
eb6280e78f
|
Merge pull request #3 from tractorcow/3.2-pdo-connector
API Upgraded module to use new database ORM
|
2014-07-11 09:29:43 +10:00 |
|
Simon Welsh
|
52fac83cf1
|
Don't test against unsupported core versions
|
2014-07-11 09:24:43 +10:00 |
|