Ingo Schommer
ce8e72cf0e
MINOR Removing executable flag from all files (thanks miiihi)
2011-09-18 22:04:02 +02:00
Ingo Schommer
c776a1cd67
BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping
2011-09-15 14:24:46 +02:00
ajshort
1f6f7f0862
API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().
...
MINOR: Replaced usage of FieldSet with FieldList.
MINOR: Renamed FieldSetTest to FieldListTest.
2011-05-11 17:51:54 +10:00
ajshort
3a1c2df4e7
API CHANGE: Renamed DataObjectDecorator to DataExtension.
...
API CHANGE: Renamed LeftAndMainDecorator to LeftAndMainExtension.
MINOR: Replaced all references to decorators with extension.
2011-04-26 11:01:38 +10:00
Julian Seidenberg
6f1eab18c1
BUGFIX: fixing naming of folders when created a new folder. The title now no longer includes the full path.
2011-03-30 18:16:17 +13:00
Julian Seidenberg
5efdc60029
API-CHANGE: Renaming a folder did not update the folder's filename on the disk. This is now fixed. There is now a one-to-one mapping between a folder and its "Title" label. Files still can have a Title that is different from the Filename ( fixes #6088 , thanks Pike)
2011-03-30 18:16:16 +13:00
Ingo Schommer
50e8467535
MINOR Moved Folder->getUnusedFilesListFilter() to new SiteTreeFolderDecorator class in 'cms' module
...
MINOR Moved Folder_UnusedAssetsField to 'cms' module
2011-03-29 18:07:57 +13:00
Ingo Schommer
c6b7b1dc28
BUGFIX Fixed SQL injection in Folder::findOrMake() parameter. Exploitable through Upload::, although unlikely to be set via user input.
2011-03-21 16:12:37 +13:00
Ingo Schommer
31d7a00eb7
MINOR Fixed merge errors
2011-03-16 13:31:46 +13:00
Sam Minnee
27246ce982
MINOR: Fixed 2.4 mergeback
2011-02-22 10:53:58 +13:00
Sam Minnee
1e0c4ae8d1
Merge branch '2.4'
...
Conflicts:
cache/Cache.php
cli/CliController.php
core/Convert.php
core/Core.php
core/ManifestBuilder.php
core/Object.php
core/SSViewer.php
core/control/ContentController.php
core/control/ContentNegotiator.php
core/control/FormResponse.php
core/control/RequestHandler.php
core/control/SilverStripeNavigatorItem.php
core/i18n.php
core/i18nTextCollector.php
core/model/DataObjectSet.php
core/model/Hierarchy.php
core/model/Image.php
core/model/MySQLDatabase.php
core/model/SiteConfig.php
core/model/SiteTree.php
core/model/Translatable.php
core/model/VirtualPage.php
dev/Debug.php
dev/SapphireTest.php
dev/TestRunner.php
dev/YamlFixture.php
dev/install/MySQLDatabaseConfigurationHelper.php
docs/en/installation/from-source.md
docs/en/topics/themes.md
docs/en/tutorials/4-site-search.md
email/Mailer.php
filesystem/File.php
filesystem/Folder.php
forms/ComplexTableField.php
forms/CurrencyField.php
forms/DateField.php
forms/FieldSet.php
forms/FileField.php
forms/FileIFrameField.php
forms/HtmlEditorConfig.php
forms/HtmlEditorField.php
forms/SelectionGroup.php
forms/SimpleImageField.php
forms/TabSet.php
forms/TableField.php
forms/TableListField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
integration/Geoip.php
javascript/SelectionGroup.js
javascript/TreeSelectorField.js
javascript/UpdateURL.js
javascript/core/jquery.ondemand.js
javascript/tiny_mce_improvements.js
javascript/tree/tree.js
lang/en_US.php
search/ContentControllerSearchExtension.php
security/Group.php
security/Member.php
security/PermissionCheckboxSetField.php
security/PermissionRole.php
security/Security.php
static-main.php
templates/RelationComplexTableField.ss
templates/TableListField.ss
tests/ConvertTest.php
tests/DataObjectSetTest.php
tests/DataObjectTest.php
tests/DataObjectTest.yml
tests/RequestHandlingTest.php
tests/SSViewerTest.php
tests/SiteTreePermissionsTest.php
tests/SiteTreeTest.php
tests/TransactionTest.php
tests/api/RestfulServiceTest.php
tests/control/DirectorTest.php
tests/control/ModelAsControllerTest.php
tests/fieldtypes/WidgetAreaEditorTest.php
tests/forms/CurrencyFieldTest.php
tests/forms/FormTest.php
tests/model/DatabaseTest.php
tests/model/ImageTest.php
tests/search/ContentControllerSearchExtensionTest.php
tests/security/MemberAuthenticatorTest.php
thirdparty/.gitignore
thirdparty/behaviour/behaviour.js
thirdparty/firebug-lite/firebug.js
thirdparty/firebug-lite/firebugx.js
thirdparty/jquery-form/jquery.form.js
thirdparty/jquery-livequery/jquery.livequery.js
thirdparty/jquery-livequery/test/jquery.js
thirdparty/jquery-livequery/test/test.html
thirdparty/jquery-livequery/test/test2.html
thirdparty/jquery-metadata/META.json
thirdparty/jquery-metadata/README
thirdparty/jquery-metadata/jquery.metadata.js
thirdparty/jquery-metadata/test/index.html
thirdparty/jquery-metadata/test/jquery.js
thirdparty/jquery-metadata/test/test.js
thirdparty/jquery-metadata/test/testrunner.js
thirdparty/jquery-metadata/test/testsuite.css
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
thirdparty/jquery-ui/i18n/jquery-ui-i18n.js
thirdparty/jquery-ui/i18n/ui.datepicker-ar.js
thirdparty/jquery-ui/i18n/ui.datepicker-bg.js
thirdparty/jquery-ui/i18n/ui.datepicker-ca.js
thirdparty/jquery-ui/i18n/ui.datepicker-cs.js
thirdparty/jquery-ui/i18n/ui.datepicker-da.js
thirdparty/jquery-ui/i18n/ui.datepicker-de.js
thirdparty/jquery-ui/i18n/ui.datepicker-el.js
thirdparty/jquery-ui/i18n/ui.datepicker-eo.js
thirdparty/jquery-ui/i18n/ui.datepicker-es.js
thirdparty/jquery-ui/i18n/ui.datepicker-fa.js
thirdparty/jquery-ui/i18n/ui.datepicker-fi.js
thirdparty/jquery-ui/i18n/ui.datepicker-fr.js
thirdparty/jquery-ui/i18n/ui.datepicker-he.js
thirdparty/jquery-ui/i18n/ui.datepicker-hr.js
thirdparty/jquery-ui/i18n/ui.datepicker-hu.js
thirdparty/jquery-ui/i18n/ui.datepicker-hy.js
thirdparty/jquery-ui/i18n/ui.datepicker-id.js
thirdparty/jquery-ui/i18n/ui.datepicker-is.js
thirdparty/jquery-ui/i18n/ui.datepicker-it.js
thirdparty/jquery-ui/i18n/ui.datepicker-ja.js
thirdparty/jquery-ui/i18n/ui.datepicker-ko.js
thirdparty/jquery-ui/i18n/ui.datepicker-lt.js
thirdparty/jquery-ui/i18n/ui.datepicker-lv.js
thirdparty/jquery-ui/i18n/ui.datepicker-ms.js
thirdparty/jquery-ui/i18n/ui.datepicker-nl.js
thirdparty/jquery-ui/i18n/ui.datepicker-no.js
thirdparty/jquery-ui/i18n/ui.datepicker-pl.js
thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js
thirdparty/jquery-ui/i18n/ui.datepicker-ro.js
thirdparty/jquery-ui/i18n/ui.datepicker-ru.js
thirdparty/jquery-ui/i18n/ui.datepicker-sk.js
thirdparty/jquery-ui/i18n/ui.datepicker-sl.js
thirdparty/jquery-ui/i18n/ui.datepicker-sq.js
thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js
thirdparty/jquery-ui/i18n/ui.datepicker-sr.js
thirdparty/jquery-ui/i18n/ui.datepicker-sv.js
thirdparty/jquery-ui/i18n/ui.datepicker-th.js
thirdparty/jquery-ui/i18n/ui.datepicker-tr.js
thirdparty/jquery-ui/i18n/ui.datepicker-uk.js
thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js
thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js
thirdparty/jquery/jquery.js
thirdparty/jsmin/.piston.yml
thirdparty/jsmin/jsmin.php
thirdparty/prototype/prototype.js
thirdparty/scriptaculous/dragdrop.js
thirdparty/simplepie/.piston.yml
thirdparty/spyc/.piston.yml
thirdparty/spyc/README
thirdparty/spyc/php4/spyc.php4
thirdparty/spyc/php4/test.php4
thirdparty/spyc/spyc.php
thirdparty/spyc/spyc.yaml
thirdparty/tinymce-advcode/dialog.html
thirdparty/tinymce-advcode/editor_plugin_src.js
thirdparty/tinymce-advcode/js/dialog.js
thirdparty/tinymce/langs/en.js
thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
thirdparty/tinymce/plugins/advhr/rule.htm
thirdparty/tinymce/plugins/advimage/image.htm
thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
thirdparty/tinymce/plugins/advlink/langs/en_dlg.js
thirdparty/tinymce/plugins/advlink/link.htm
thirdparty/tinymce/plugins/emotions/emotions.htm
thirdparty/tinymce/plugins/emotions/langs/en_dlg.js
thirdparty/tinymce/plugins/example/dialog.htm
thirdparty/tinymce/plugins/fullpage/fullpage.htm
thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js
thirdparty/tinymce/plugins/fullscreen/fullscreen.htm
thirdparty/tinymce/plugins/inlinepopups/template.htm
thirdparty/tinymce/plugins/media/langs/en_dlg.js
thirdparty/tinymce/plugins/media/media.htm
thirdparty/tinymce/plugins/paste/js/pasteword.js
thirdparty/tinymce/plugins/paste/langs/en_dlg.js
thirdparty/tinymce/plugins/paste/pastetext.htm
thirdparty/tinymce/plugins/paste/pasteword.htm
thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js
thirdparty/tinymce/plugins/searchreplace/searchreplace.htm
thirdparty/tinymce/plugins/spellchecker/editor_plugin.js
thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js
thirdparty/tinymce/plugins/style/langs/en_dlg.js
thirdparty/tinymce/plugins/style/props.htm
thirdparty/tinymce/plugins/table/cell.htm
thirdparty/tinymce/plugins/table/langs/en_dlg.js
thirdparty/tinymce/plugins/table/merge_cells.htm
thirdparty/tinymce/plugins/table/row.htm
thirdparty/tinymce/plugins/table/table.htm
thirdparty/tinymce/plugins/template/langs/en_dlg.js
thirdparty/tinymce/plugins/template/template.htm
thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm
thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm
thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm
thirdparty/tinymce/plugins/xhtmlxtras/cite.htm
thirdparty/tinymce/plugins/xhtmlxtras/del.htm
thirdparty/tinymce/plugins/xhtmlxtras/ins.htm
thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
thirdparty/tinymce/themes/advanced/about.htm
thirdparty/tinymce/themes/advanced/anchor.htm
thirdparty/tinymce/themes/advanced/charmap.htm
thirdparty/tinymce/themes/advanced/color_picker.htm
thirdparty/tinymce/themes/advanced/image.htm
thirdparty/tinymce/themes/advanced/langs/en.js
thirdparty/tinymce/themes/advanced/langs/en_dlg.js
thirdparty/tinymce/themes/advanced/link.htm
thirdparty/tinymce/themes/advanced/source_editor.htm
thirdparty/tinymce/themes/simple/langs/en.js
thirdparty/tinymce/tiny_mce.js
thirdparty/tinymce/tiny_mce_src.js
widgets/Widget.php
2011-02-14 18:47:53 +13:00
Sam Minnee
cf0bf20e26
BUGFIX: Don't include web.config in the assets tracked in the File table.
...
MINOR: Add documentation to File::$allowed_extensions explaining that there are config files to edit in assets/
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@112961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:58 +13:00
Ingo Schommer
d55e38b6ab
MINOR Checking that Folder::findOrMake() can create an assets/assets/ folder
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:35 +13:00
Ingo Schommer
9a1c997818
MINOR Using Filesystem::makeFolder() instead of mkdir() in Folder for file operations
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107275 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:35 +13:00
Ingo Schommer
c82f0335f0
API CHANGE Don't reflect changes in File and Folder property setters on filesystem before write() is called, to ensure that validate() applies in all cases. This fixes a problem where File->setName() would circumvent restrictions in File::$allowed_extensions ( fixes #5693 )
...
API CHANGE Removed File->resetFilename(), use File->updateFilesystem() to update the filesystem, and File->getRelativePath() to just update the "Filename" property without any filesystem changes (emulating the old $renamePhysicalFile method argument in resetFilename())
API CHANGE Removed File->autosetFilename(), please set the "Filename" property via File->getRelativePath()
MINOR Added unit tests to FileTest and FolderTest (some of them copied from FileTest, to test Folder behaviour separately)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:34 +13:00
Ingo Schommer
7e65d3c5af
MINOR Documentation in File and Folder class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Ingo Schommer
1f1dda8643
MINOR Fixed phpdoc documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:15 +13:00
Geoff Munn
d21e7b0623
BUGFIX: default sort column now quoted
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Ingo Schommer
70ac42c577
MINOR Respecting folder sort order in admin/assets by adding Folder::$default_sort="Sort" ( #5235 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Michael Andrewartha
1baae6723b
BUGFIX: disabling unused file list as feature is still buggy.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Ingo Schommer
1e9aeaef3e
BUGFIX Fixed Folder writing by overloading validate() (was inheriting File->validate() which does extension checks)
...
BUGFIX Fixed Folder::findOrMake() not to create "new-folder" through File->setName() if using a trailing slash in the path (which causes an empty name). Added FolderTest to verify this.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:04 +13:00
Sean Harvey
853ee0c903
BUGFIX Fixed quotes around Folder::hasChildFolders() ParentID column
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:03 +13:00
Sean Harvey
2c809ccd87
BUGFIX #5199 Duplicate file uploads have odd numbering attached to end of file
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:00 +13:00
Sean Harvey
f19048c0c6
BUGFIX #5188 Upload and Folder don't handle the duplicate naming of files that have no extension
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101050 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:00 +13:00
Sam Minnee
876b3863f8
BUGFIX: Handle filename deduping when uploading of double-barrelled extensions and files ending in numbers better.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:42 +13:00
Sam Minnee
1c5dc228a7
BUGFIX: Fixed the code for the unused file list, although the feature is still disabled.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:42 +13:00
Sam Minnee
6e4ab94b8c
BUGFIX: Folder::findOrMake() will create the assets/ folder if it's missing
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:39 +13:00
Luke Hudson
d82ed75b37
BUGFIX: Folder::findOrMake() will call mkdir if needed, even if object already exists in database.
...
This covers the corner case where DB is out of sync with filesystem.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Andreas Piening
8ee148297a
MINOR: #4674 applied patch for special chars in folder titles
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Andrew Short
8361a41c16
MINOR: Don't include files and folders starting with an underscore in the asset system.
...
MINOR: Automatically rename files and folders beginning with an underscore.
From: Andrew Short <andrewjshort@gmail.com> (from r97400)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97435 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:12 +13:00
Sean Harvey
28ee3ec772
MINOR Fixed error message for Folder::addUploadToFolder() to be accurate
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94136 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:56 +13:00
Sam Minnee
6cec0a083e
BUGFIX: Don't include web.config in the assets tracked in the File table.
...
MINOR: Add documentation to File::$allowed_extensions explaining that there are config files to edit in assets/ (from r112961)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-05 00:05:05 +00:00
Jean-Fabien Barrios
5dbddba41b
BUGFIX File upload not working when open_basedir is set #5547
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-03 00:28:30 +00:00
Ingo Schommer
fd6fa62388
MINOR Fixed merge error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 04:02:54 +00:00
Ingo Schommer
706553ee95
MINOR Checking that Folder::findOrMake() can create an assets/assets/ folder (from r107276)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112567 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:21:41 +00:00
Ingo Schommer
07494a5f93
MINOR Using Filesystem::makeFolder() instead of mkdir() in Folder for file operations (from r107275)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112566 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:21:23 +00:00
Ingo Schommer
5d5bb2618a
API CHANGE Don't reflect changes in File and Folder property setters on filesystem before write() is called, to ensure that validate() applies in all cases. This fixes a problem where File->setName() would circumvent restrictions in File::$allowed_extensions ( fixes #5693 )
...
API CHANGE Removed File->resetFilename(), use File->updateFilesystem() to update the filesystem, and File->getRelativePath() to just update the "Filename" property without any filesystem changes (emulating the old $renamePhysicalFile method argument in resetFilename())
API CHANGE Removed File->autosetFilename(), please set the "Filename" property via File->getRelativePath()
MINOR Added unit tests to FileTest and FolderTest (some of them copied from FileTest, to test Folder behaviour separately) (from r107273)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:20:47 +00:00
Ingo Schommer
2d127753ed
MINOR Documentation in File and Folder class (from r107265)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:12:39 +00:00
Sam Minnee
2948bc1c64
MINOR: Misc merges from branches/2.4
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:53:12 +00:00
Sam Minnee
650a9f62c0
BUGFIX: default sort column now quoted (from r103182)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112121 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:33:16 +00:00
Sam Minnee
ddeebf3b7b
MINOR Respecting folder sort order in admin/assets by adding Folder::$default_sort="Sort" ( #5235 ) (from r101698)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:01:12 +00:00
Sam Minnee
e8f31282c1
BUGFIX: disabling unused file list as feature is still buggy. (from r101380)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:44:19 +00:00
Sam Minnee
767bfedd30
BUGFIX Fixed Folder writing by overloading validate() (was inheriting File->validate() which does extension checks)
...
BUGFIX Fixed Folder::findOrMake() not to create "new-folder" through File->setName() if using a trailing slash in the path (which causes an empty name). Added FolderTest to verify this. (from r101266)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111984 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 23:02:10 +00:00
Sam Minnee
5fba88d3c0
BUGFIX Fixed quotes around Folder::hasChildFolders() ParentID column (from r101175)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:55:17 +00:00
Sam Minnee
a729b86df8
BUGFIX #5199 Duplicate file uploads have odd numbering attached to end of file (from r101068)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:44:14 +00:00
Sam Minnee
2ea0e3e331
BUGFIX #5188 Upload and Folder don't handle the duplicate naming of files that have no extension (from r101050)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:42:13 +00:00
Ingo Schommer
c193d27f31
BUGFIX: Handle filename deduping when uploading of double-barrelled extensions and files ending in numbers better. (from r99818)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:04:55 +00:00
Ingo Schommer
d00d876efe
BUGFIX: Fixed the code for the unused file list, although the feature is still disabled. (from r99816)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:03:56 +00:00
Ingo Schommer
50667bf6c3
BUGFIX: Folder::findOrMake() will create the assets/ folder if it's missing (from r99638)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102872 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:42:59 +00:00
Ingo Schommer
ba3c070dbd
BUGFIX: Folder::findOrMake() will call mkdir if needed, even if object already exists in database.
...
This covers the corner case where DB is out of sync with filesystem. (from r97878)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:45:53 +00:00
Ingo Schommer
caebfe6ea3
MINOR: #4674 applied patch for special chars in folder titles (from r97669)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:09:15 +00:00
Andrew Short
712cc578d9
MINOR: Don't include files and folders starting with an underscore in the asset system.
...
MINOR: Automatically rename files and folders beginning with an underscore.
From: Andrew Short <andrewjshort@gmail.com>
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@97400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-21 22:59:19 +00:00
Ingo Schommer
487bb763d9
MINOR Fixed PHP notice ( #4765 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:23:45 +00:00
Ingo Schommer
84125b4416
MINOR Added CMSTreeClasses() methods to Group and Folder, to mirror SiteTree behaviour and allow reusage in CMS tree implementations
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92567 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:33:42 +00:00
Ingo Schommer
b1300f7c49
ENHANCEMENT Creating filesystem node in Folder->onBeforeWrite() (moved from AssetAdmin->add())
...
ENHANCEMENT Setting default folder title in Folder->populateDefaults()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:33:33 +00:00
Ingo Schommer
0e93bcec53
MINOR Moved 'delete files' button from Folder->getCMSFields() to AssetTableField
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92559 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:33:14 +00:00
Ingo Schommer
16f69c3080
BUGFIX Fixed Folder singular/plural name i18n by overloading the statics inherited from File class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:32:40 +00:00
Ingo Schommer
f7f3bc7050
MINOR Removed unused cmsCleanup_parentChanged() callback from Group, Folder and SiteTree classes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92543 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:59 +00:00
Sean Harvey
d1af532bf4
MINOR Destroy the child object in Folder::syncChildren() after destroying it's internal records and components (from r82790)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:32:11 +00:00
Sean Harvey
6b0a508502
BUGFIX Folder::syncChildren() now uses far less memory - we do this by destroying the child object memory after use (from r82780)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:30:48 +00:00
Sam Minnee
f84180813f
#150 - Pages with similar content
...
#148 - Stable against restructures (from r87251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:19:25 +00:00
Julian Seidenberg
844853ab10
BUGFIX: Ticket #4220 - Copying of uploaded files from temp to assets folder fails on IIS installs; simple patch fixes it
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85696 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-03 22:45:15 +00:00
Geoff Munn
e031478576
MINOR FIX: column names escaped
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-31 06:06:44 +00:00
Sam Minnee
e3d31f1bdd
BUGFIX: Use default File classname in Folder::syncChildren()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-24 07:21:08 +00:00
Sam Minnee
f41e2b474c
ENHANCEMENT: Improved performance of admin/assets area.
...
BUGFIX: Fixed bug in 'sake interactive' error handling.
BUGFIX: Fixed bugs with MSSQL and Windows support.
API CHANGE: Added FormAction::setButtonContent()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-01 22:27:18 +00:00
Sean Harvey
b1018f5864
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:26:47 +00:00
Sean Harvey
e41c0e2e55
BUGFIX Fixed error in Folder::getUsedFilesList() if ID column wasn't selected
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76544 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-11 05:30:29 +00:00
Sean Harvey
a5e82ddff1
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:20:24 +00:00
Sean Harvey
76b5adc979
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-28 23:52:15 +00:00
Sean Harvey
ec9765d9f2
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-28 23:40:35 +00:00
Geoff Munn
03acac8e59
API CHANGE: addslashes now DB-specific
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@74083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-05 23:24:56 +00:00
Geoff Munn
807736490f
API CHANGE: NOW() replaced with DB-specific version
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-11 21:50:03 +00:00
Sam Minnee
08a5a7c387
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 22:08:52 +00:00
Andrew O'Neil
60f75c5ca4
Merged changes from 2.3 branch
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Ingo Schommer
b7d394008e
MINOR Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:35:50 +00:00
Ingo Schommer
085346f0e0
MINOR Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:19:48 +00:00
Sam Minnee
96c5be8252
Updating queries to be more DB agnostic
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-24 09:31:14 +00:00
Sam Minnee
93438e0be2
API CHANGE: Adding double quotes to all table and field references (a work in progress)
...
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 23:28:16 +00:00
Sam Minnee
a3d3fb65a9
Updated SQL queries to be ansi compatable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:31:06 +00:00
Ingo Schommer
1b65a6bf46
MINOR removed debug commits from r65523 in Folder.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 11:33:29 +00:00
Sam Minnee
58dbe416ee
Merged from branches/2.2
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 03:51:35 +00:00
Ingo Schommer
cfde8adaee
API CHANGE Removed Folder->userCan*() and File->userCan*()permissions and added more consistent behaviour with Folder->can*() and File->can*()
...
ENHANCEMENT Allowing decoration of can*() methods in File and Folder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 12:17:42 +00:00
Sam Minnee
5f177b9f08
BUGFIX #2056 : Removed all references to deprecated Member::isAdmin()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 23:31:33 +00:00
Ingo Schommer
252f739919
API CHANGE Removed deprecated File->setMaxFileSize(), use Upload class
...
API CHANGE Removed deprecated File->getMaxFileSize(), use Upload class
API CHANGE Removed File::sync(), use Filesystem::sync()
API CHANGE Removed deprecated File::fixfiles()
API CHANGE Removed deprecated File::loadContent(), use Upload class
API CHANGE Removed deprecated File::loadallcontent(), use Upload class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 11:05:57 +00:00
Ingo Schommer
72047aa3a1
BUGFIX Fixing AssetAdmin translations which were previously moved to Folder.php - i18n::include_by_class() doesn't like filenames/namespaces which are in a different folder than the language file they're referenced in (see #2359 ) - started in r64076
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-10 17:35:24 +00:00
Ingo Schommer
9371f4688b
ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 16:02:38 +00:00
Sam Minnee
53cc576dab
Reverted Folder::CanEdit() to its original behaviour; that of returning a many-many join. Note that this conflicts with DataObject::CanEdit() now.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-18 00:51:35 +00:00
Sam Minnee
4acd84a837
Trap potential data-integrity bug
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 22:20:14 +00:00
Sam Minnee
0bd9bc4ff8
Merged changes from 2.2.2-assets - everything except the asset refactoring
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Ingo Schommer
60860cc1b9
MINOR Unified @package PHPdoc (added where missing, removed duplicates)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Ingo Schommer
0a3b20e672
BUGFIX Re-enabled "Unused files" tab in AssetAdmin (fixed memory problems)
...
MINOR Moved getUsedFilesList() and getAssetList() from AssetAdmin to Folder (needed for Folder->getCMSFields()), changed their visibility from private to protected
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-24 05:19:42 +00:00
Ingo Schommer
5d1336a5a4
Merged revisions 47616 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq
........
r47616 | ischommer | 2008-01-04 19:19:06 +1300 (Fri, 04 Jan 2008) | 1 line
wording
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:10:51 +00:00
Ingo Schommer
1b5b3f8627
Merged revisions 51246 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq
........
r51246 | ischommer | 2008-03-18 11:50:47 +1300 (Tue, 18 Mar 2008) | 1 line
ENHANCEMENT findOrMake() now deals with absolute paths and replaces leading/trailing slashes before checking for existing folder objects in the database
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 22:51:25 +00:00
Matt Peel
7d13ba7fb8
Reverted geoffm's accidental commit to /open
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6
First post
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
8eb13d5128
Moved folder admin form to Folder::getCMSFields() to let you more easily manipulate the form with a decorator
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:49:33 +00:00
Sam Minnee
b1d2e3906b
API Documentation updates
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448
Updated API documentation package tags
...
Fixed some whitespace
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:37:50 +00:00
Andrew O'Neil
4a233b8854
Merged revisions 46505 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy
........
r46505 | aoneil | 2007-12-10 10:48:37 +1300 (Mon, 10 Dec 2007) | 2 lines
Load content from files into the database
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:47:07 +00:00
Ingo Schommer
3e36baa6d8
FEATURE Using consistent umask static Filesystem::$folder_create_mask for mkdir()-calls
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 23:07:24 +00:00
