Commit Graph

19042 Commits

Author SHA1 Message Date
Chris Joe
c8d8adfefe Merge pull request #7287 from open-sausages/pulls/4.0/fix-multi-configs
BUG Fix issue with multiple editors breaking plugins
2017-08-21 10:58:27 +12:00
Daniel Hensby
304889ff2f Merge pull request #7281 from sminnee/test-php72
NEW: Test on php 7.2
2017-08-18 21:22:10 +01:00
Damian Mooyman
ce5e15df6e BUG Fix issue with multiple editors breaking plugins 2017-08-18 16:33:16 +12:00
Daniel Hensby
33c2c7bfe7
Merge branch '3' into 4 2017-08-17 15:06:00 +01:00
Daniel Hensby
a39325f1fc Merge pull request #7285 from open-sausages/pulls/4.0/schema-ing-our-path-to-victory
Enhancement Add a path option for the schema data,  …
2017-08-17 14:55:35 +01:00
Daniel Hensby
c09305be9e
Merge branch '3.6' into 3 2017-08-17 14:31:57 +01:00
Daniel Hensby
921f615e19
Merge branch '3.5' into 3.6 2017-08-17 14:14:31 +01:00
Christopher Joe
9dc11eff43 Enhancement Add a path option for the schema data, so a full tree is not required for this data 2017-08-17 16:08:27 +12:00
Chris Joe
506ae52e62 Merge pull request #7262 from open-sausages/pulls/4.0/bootstrap-upgrade
Upgrade bootstrap class names
2017-08-17 15:46:34 +12:00
Damian Mooyman
7ad081a20b Merge pull request #7288 from dhensby/pulls/3.5/write-no-change-edit
FIX Don't update LastEdited on skipped writes
2017-08-17 15:09:03 +12:00
Daniel Hensby
eb80a5f9e8
FIX LastEdited no longer updated on skipped writes 2017-08-16 23:39:22 +01:00
Daniel Hensby
1ae07ac2a3
TEST Prove LastEdited is updated when no changes are made 2017-08-16 22:26:47 +01:00
Damian Mooyman
bbded44056 Upgrade bootstrap class names 2017-08-16 10:50:09 +12:00
Sam Minnee
02cd720748 FIX: Remove deprecated assert() usage.
This stopped working in PHP 7.2
2017-08-15 20:45:57 +12:00
Chris Joe
ac91a4598a Merge pull request #7275 from open-sausages/pulls/4.0/enable-behat-config-fixtures
API Enable config files to be loaded for behat tests
2017-08-15 12:58:49 +12:00
Sam Minnee
0926b04512 FIX: Fix latent bug in DataObject
This didn’t show up until we ran tests on PHP 7.3-dev
2017-08-15 11:13:57 +12:00
Sam Minnee
0eebeedd03 NEW: Test php 7.2
Travis now supports PHP 7.2 testing, and we should add this to our suite
so that SilverStripe 4 can be released with PHP 7.2 support.

PHP 7.2 is due for released in November, a little after when SS4 is
expected to go stable.
2017-08-15 11:06:37 +12:00
Damian Mooyman
c14233f743
API Enable config files to be loaded for behat tests 2017-08-15 10:30:29 +12:00
Daniel Hensby
c0211927aa
Merge branch '3' into 4 2017-08-14 21:18:03 +01:00
Daniel Hensby
23a726f385
Merge branch '3.6' into 3 2017-08-14 13:43:28 +01:00
Daniel Hensby
a3b72c500d
Merge branch '3.5' into 3.6 2017-08-14 12:55:09 +01:00
Chris Joe
388ff1df74 Merge pull request #7273 from open-sausages/pulls/4.0/recipe-info
Provide information related to recipe
2017-08-14 23:06:40 +12:00
Saophalkun Ponlu
29cb4f2f07 Provide information related to recipe 2017-08-14 10:24:48 +12:00
Chris Joe
b0af45231a Merge pull request #7257 from open-sausages/pulls/4.0/cascade-deletes
API Implement cascade_deletes
2017-08-09 16:07:02 +12:00
Damian Mooyman
323644c7bb
API Implement cascade_deletes 2017-08-09 15:14:00 +12:00
Damian Mooyman
4572b01068 Merge pull request #7255 from robbieaverill/pulls/4.0/index-columns-docs-and-exception
FIX Throw exception when "value" is used to define indexes. Update docs.
2017-08-09 14:24:29 +12:00
Damian Mooyman
9ea09376eb Merge pull request #7250 from phptek/issue/7181
FIX: Fixes #7181 Use config system for userland config of node_threshold_total
2017-08-09 14:18:50 +12:00
Robbie Averill
5d5fac7450 FIX Throw exception when "value" is used to define indexes. Update docs. 2017-08-09 09:17:28 +12:00
Damian Mooyman
14d3567f90 Merge pull request #6871 from sminnee/better-sapphiretest-error
MINOR: Better error message in SapphireTest
2017-08-08 23:33:29 +12:00
Damian Mooyman
8df37e99d9 Merge pull request #7254 from johndalangin/7253-add-mysql-ssl-documentation
DOCS: Add SSL Documentation to docs (fixes #7253)
2017-08-08 23:26:36 +12:00
Damian Mooyman
d07dc2b6f8 Merge pull request #7259 from johndalangin/origin/7258-fix-pdoconnector-bug
FIX: PDOConnector ssl_cipher bug fixes #7258
2017-08-08 23:25:47 +12:00
John
1a4a006d09 FIX: PDOConnector ssl_cipher bug fixes #7258 2017-08-08 18:00:06 +08:00
Damian Mooyman
364a14da1d Merge pull request #7248 from open-sausages/pulls/4.0/remove-3.0-api-docs
MINOR: Clean up code references in docs
2017-08-08 09:41:29 +12:00
Damian Mooyman
b26f1b0cc8 Merge pull request #7252 from open-sausages/pull/4.0/no-in-ten-tion
Fix reference to IE10 when it should be IE11
2017-08-08 09:27:34 +12:00
John
10bf2286a5 Add SSL Documentation to docs (fixes #7253) 2017-08-07 16:32:54 +08:00
Christopher Joe
c164fcfe54 Fix reference to IE10 when it should be IE11 2017-08-07 15:39:08 +12:00
Aaron Carlino
50c8a02bff remove tabs 2017-08-07 15:11:17 +12:00
Damian Mooyman
73e1919b8f Added 4.0.0-beta2 changelog 2017-08-07 15:08:32 +12:00
Aaron Carlino
5d6b7c85d7 Deprecate SS_TemplateManifest 2017-08-07 14:51:27 +12:00
Damian Mooyman
d0814c0766 Added 4.0.0-beta2 changelog 2017-08-07 14:50:49 +12:00
Damian Mooyman
e61163ce7f Update translations 2017-08-07 14:34:14 +12:00
Aaron Carlino
e4935123d8 Remove a few more references 2017-08-07 14:01:38 +12:00
Aaron Carlino
6c0629f025 Remove more deprecated APIs 2017-08-07 14:01:38 +12:00
Aaron Carlino
e4fba5a7b1 add use statements 2017-08-07 14:01:38 +12:00
Aaron Carlino
84feab5a68 Yeah psr2 functions 2017-08-07 14:01:38 +12:00
Aaron Carlino
4c7a068b28 classes psr2 2017-08-07 14:01:38 +12:00
Aaron Carlino
2414eaeafd Yay, clean arrays 2017-08-07 14:01:38 +12:00
Aaron Carlino
eb1695c03d Replace all legacy ::: syntax with GFMD tags 2017-08-07 14:01:38 +12:00
Aaron Carlino
16407b9185 first pass 2017-08-07 14:01:38 +12:00
Damian Mooyman
0681567102 BUG Fix flushing on live mode (#7241)
* BUG Fix flushing on live mode
Fixes #7217

* Clarify injector service documentation
2017-08-07 13:53:23 +12:00