Daniel Hensby
|
bcc21c2403
|
Merge branch '3'
|
2016-11-10 01:09:35 +00:00 |
|
Jonathon Menz
|
646d34ec48
|
DOCS Non-extendable classes
Closes #6129
|
2016-10-13 09:39:46 -07:00 |
|
Damian Mooyman
|
d52db0ba34
|
Merge 3 into master
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
|
2016-04-29 17:50:55 +12:00 |
|
Damian Mooyman
|
b8e7f9a934
|
Standardise spelling of "customise"
Fixes #3988
|
2016-03-30 13:17:28 +13:00 |
|
Damian Mooyman
|
3b0a9f4ba2
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# admin/javascript/LeftAndMain.Menu.js
# control/HTTPRequest.php
# css/GridField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/01_File_Management.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# filesystem/Upload.php
# javascript/HtmlEditorField.js
# model/Image.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/Enum.php
# model/versioning/Versioned.php
# scss/GridField.scss
|
2016-02-25 14:51:59 +13:00 |
|
David Alexander
|
903379bde2
|
DOCS 3.2 : fixing api: links now that api: tag parser working
fixed a couple of external links
fixed a docs link
|
2016-02-17 18:02:38 -07:00 |
|
Damian Mooyman
|
1e1a7a345c
|
Merge remote-tracking branch 'origin/3'
Conflicts:
control/Director.php
filesystem/File.php
filesystem/GD.php
filesystem/ImagickBackend.php
forms/HtmlEditorField.php
javascript/UploadField_uploadtemplate.js
model/Image.php
model/Image_Backend.php
model/fieldtypes/Enum.php
templates/AssetUploadField.ss
tests/model/ImageTest.php
tests/search/FulltextFilterTest.php
|
2015-11-03 14:23:16 +13:00 |
|
Damian Mooyman
|
be239896d3
|
API Refactor of File / Folder to use DBFile
API Remove filesystem sync
API to handle file manipulations
|
2015-10-13 11:57:39 +13:00 |
|
Peter Thaleikis
|
7ca97cd86d
|
Update 01_Extensions.md
adding missing space
|
2015-09-20 15:15:54 +12:00 |
|
Elliot Sawyer
|
83a3c4b166
|
Update 01_Extensions.md
Fix a typo
|
2015-04-02 15:51:51 +13:00 |
|
Will Rossiter
|
918baf1ca3
|
Review and clean up of extending section
|
2014-12-15 09:12:47 +13:00 |
|