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 |
|