Damian Mooyman
|
88fdc75456
|
Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
|
2015-01-15 18:52:46 +13:00 |
|
micmania1
|
7384d011e9
|
FIX DataDifferencer was trying to compare fields, even if the fields didn't exist causing an error.
|
2014-11-28 05:35:06 +00:00 |
|
Damian Mooyman
|
eb069e605d
|
Remove all redundant whitespace
|
2014-08-19 09:17:15 +12:00 |
|
Ingo Schommer
|
e2f073f38a
|
Method visibility according to coding conventions
|
2012-09-20 10:46:59 +02:00 |
|
Sean Harvey
|
0fe0d87d9f
|
Merge pull request #434 from halkyon/using_non_deprecated_template_controls
Replacing use of deprecated <% control %> with <% with %> or <% loop %> as necessary
|
2012-05-11 15:08:16 -07:00 |
|
Sean Harvey
|
6f672e5f36
|
MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary.
|
2012-05-11 13:49:20 +12:00 |
|
Sean Harvey
|
1859070fa9
|
MINOR Fixing use of deprecated getAllFields(), mark field as deprecated properly.
|
2012-05-11 11:23:24 +12:00 |
|
Simon Welsh
|
f07258f3cf
|
MINOR Update @package values to match renaming sapphire
|
2012-04-15 10:50:19 +12:00 |
|
Stig Lindqvist
|
e38dd08ea5
|
MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate
|
2011-10-28 15:58:55 +13:00 |
|
Ingo Schommer
|
67568b08a3
|
MINOR Checking for valid field type in DataDifferencer (built-in fields like 'RecordClassName' can't be casted to a field object)
|
2011-10-07 14:12:50 +02:00 |
|
Ingo Schommer
|
2ec2c97766
|
ENHANCEMENT Allowing diffs of has_one relationship in DataDifferencer (AIR-24)
|
2011-10-07 14:12:48 +02:00 |
|
Ingo Schommer
|
8cc1b4c852
|
BUGFIX Bypassing setters in DataDifferencer to avoid problems with invalid data (e.g. HTML fragment instead of valid classname in SiteTree->setClassname(). Better validation of constructor parameters (AIR-42)
|
2011-10-07 14:12:47 +02:00 |
|
ajshort
|
3f132a105b
|
API CHANGE: Replaced DataObjectSet instances with ArrayList.
|
2011-05-05 20:40:24 +10:00 |
|
Ingo Schommer
|
9b29616710
|
API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure
|
2011-03-31 09:56:21 +13:00 |
|