tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
10,495 Commits 31 Branches 527 Tags 162 MiB
4681673896
Commit Graph

10495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hamish Friedlander
4681673896 FIX TinyMCE context menu displaying default dialogs instead of our one 2013-01-31 16:39:00 +13:00
Hamish Friedlander
6f937745b0 FIX Not being able to remove, add or edit the caption on an image properly 2013-01-31 16:35:48 +13:00
Hamish Friedlander
9f822d1e3c FIX Not calling updateFromNode on re-opening an image 
Inside mediaform updateFromEditor we called $(this).updateFromNode, but this wasnt
pointing to anything useful after a refactor, which resulted in the fields not
being filled in with current data when editing an already-inserted image
 2013-01-30 17:15:01 +13:00
Ingo Schommer
2ad56e1d52 Merge pull request #1100 from ajshort/grid-field-save-handler 
ENHANCEMENT: Add grid field save handler.
 2013-01-15 04:19:18 -08:00
Andrew Short
16efd7402e ENHANCEMENT: Add grid field save handler. 2013-01-15 22:41:25 +11:00
Ingo Schommer
27d2f75d9d Added test for DataList filters with array and modifiers (see #8162) 2013-01-15 01:11:35 +01:00
Jeremy Bridson
a93f8841d7 BUGFIX:fixed broken styling of iframe in IE for member and group import 2013-01-15 00:57:47 +01:00
Ingo Schommer
80feb8c0b4 Respect displayFields in GridFieldPrintButton 
Provides more coherent and expected default behaviour
 2013-01-15 00:55:24 +01:00
Ingo Schommer
703c10aa0e Restored inlined styling of .fieldgroup (same UI as in 2.x) 2013-01-14 17:01:08 +01:00
Ingo Schommer
0a00fea334 Removed .fieldgroup styles specific to one UI use case 2013-01-14 16:59:22 +01:00
Ingo Schommer
f30277c3cf Split out getLinkAttributes() in .htmleditor JavaScript for more flexibility 
Saves us from overwriting the whole insertLink() method just
to add another option.
 2013-01-14 16:54:58 +01:00
Nathan Cox
fd80c4fb3e Issue #7818: Making sure UploadField can find the form/SecurityID on direct page load/refresh 2013-01-11 16:42:20 +01:00
micschk
7f605cfb54 NEW Disable items in DropdownField and GroupedDropdownField 2013-01-11 16:32:20 +01:00
Ingo Schommer
f3c0669fec Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	_config/uploadfield.yml
	css/UploadField.css
	forms/UploadField.php
	scss/UploadField.scss
	templates/UploadField.ss
	tests/forms/uploadfield/UploadFieldTest.php
 2013-01-11 10:02:39 +01:00
Ingo Schommer
9e82d8e857 Fixed line lengths 2013-01-11 09:59:33 +01:00
Ingo Schommer
212c4f1e51 Fixed UploadField regression from 4da1af9c3 2013-01-11 09:30:21 +01:00
Sam Minnee
f8758bad6a FIX: Fixed margins so that margin is displayed between preview images and their title. 
Previously the margin was erroneously only shown for a drop zone.  It's possible that this bug only affects single-image uploads.
 2013-01-11 09:29:09 +01:00
Sam Minnee
5b450f7fea NEW: Added replaceExistingFile setting for UploadField. 
Sometimes has-one UploadFields can get confused about whether or not there is an existing file that needs deleting.  This setting lets you make a more robust has-one UploadField, where any existing file will be replaced.  It more closely mimics simple single-file upload fields.
 2013-01-11 09:29:06 +01:00
Sam Minnee
cc7318fde4 NEW: Added canAttachExisting config option for UploadField. 
This is the companion setting to canUpload, letting you control whether existing files from the asset store can be referenced.  It's particularly useful when using UploadField on the front-end.
 2013-01-11 09:29:02 +01:00
Sam Minnee
2fdd9a3b13 FIX: Allow images attached to UploadFields to be unlinked without File::canEdit() or File::canDelete() permission. 
Although editing meta-data or deleting permanently would require File editing/deleting permissions, merely linking to a record does not.  This change is important for allowing front-end use of UploadField; or, more importantly, use of UploadFile by people without CMS rights.
 2013-01-11 09:07:42 +01:00
Ingo Schommer
4da1af9c3f Show label-less input#file field in UploadField with canUpload=false 
The field carries the configuration, and some non-upload functionality
like "attach files" still relies on the fileupload jQuery plugin
being initialized.

Conflicts:
	templates/UploadField.ss
 2013-01-11 09:07:42 +01:00
Ingo Schommer
67c5db3320 NEW Global default config for UploadField 2013-01-11 09:07:42 +01:00
Ingo Schommer
2dfd42795e NEW Restrict upload abilities in UploadField 
Conflicts:
	css/UploadField.css
	templates/UploadField.ss
 2013-01-11 09:07:42 +01:00
Ingo Schommer
7306d02411 Show label-less input#file field in UploadField with canUpload=false 
The field carries the configuration, and some non-upload functionality
like "attach files" still relies on the fileupload jQuery plugin
being initialized.
 2013-01-11 00:33:31 +01:00
Ingo Schommer
b918487375 Fixed preview overlay showing by default 
This was a regression made visible by the recent change to
enforce dimensions on this overlay, which in turn visualizes
the blocked/unblocked states of the preview (see fc6d6ffad)
 2013-01-11 00:23:47 +01:00
Ingo Schommer
f922321287 ManyManyList->getExtraFields() 
Needed for introspection for many_many relationships
without knowing the name of the relationship,
meaning we can't use DataObject->many_many_extraFields().
 2013-01-10 22:35:20 +01:00
Sam Minnée
1e56de22d2 Merge pull request #1085 from drzax/patch-1 
Update docs/en/topics/i18n.md
 2013-01-09 16:53:13 -08:00
Sam Minnée
58013cf367 Merge pull request #1087 from chillu/pulls/dataobject-get-join 
API Removed non-functional $join argument from DataObject::get() and oth...
 2013-01-09 16:17:21 -08:00
Ingo Schommer
43601d6010 NEW Global default config for UploadField 2013-01-10 00:15:35 +01:00
Ingo Schommer
9310b8d86d NEW Restrict upload abilities in UploadField 2013-01-10 00:15:34 +01:00
Ingo Schommer
e8bfc241fd Setting SapphireTest::is_running_test() in PHPUnit bootstrap 
Otherwise conditional logic will only succeed
when run through "sake dev/tests", not when
run through phpunit directly (which is the recommended way now)
 2013-01-09 23:31:10 +01:00
Ingo Schommer
5f8115f4c7 BUGFIX Hard fallback to en_US.js in Requirements 
Ideally we'll have region-less locales like en.js as fallbacks,
but for now this prevents the UI becoming non-operational
e.g. when both i18n::set_locale() and i18n::default_locale()
are set to 'en_NZ'.
 2013-01-09 22:31:19 +01:00
Ingo Schommer
76e233de70 Only show preview switch if states are available 
We've removed all states from RedirectorPage in order to disable the redirect.
 2013-01-09 21:43:10 +01:00
Ingo Schommer
80ee913f26 Correct dimensions for preview overlay 
During the side-by-side refactoring, those were removed,
rendering the overlay invisible, which lead to the "blocked"
state not being shown at all.
 2013-01-09 21:42:20 +01:00
Ingo Schommer
f07ad307e4 API Removed non-functional $join argument from DataObject::get() and other APIs 
See 68bb74820
 2013-01-09 18:28:55 +01:00
drzax
f6ab5a4020 Update docs/en/topics/i18n.md 
Make the documentation more clear and 3.x specific. Especially around template translations.
 2013-01-09 12:46:09 +10:00
Ingo Schommer
5bd8619dd3 Add pointer to expand/collapse tree icons 
Make it clear that they're interactive elements
 2013-01-08 18:46:08 +01:00
Ingo Schommer
f564592ec5 Fix tree arrows in TreeDropdownField 
Partially reverts "fixes" from 411673ed. This re-introduces the arrow on the main tree node in the CMS ("Your site name"), but that's less important than being able to navigate tree hierarchies in the first place in TreeDropdownField.
 2013-01-08 18:45:35 +01:00
Ingo Schommer
abfb3c7095 Default TreeDropdownField to TreeTitle 
Same behaviour as in 2.x. All common elements displayed
in this field (SiteTree, Group, File) have a TreeTitle accessor.
 2013-01-08 18:39:31 +01:00
Ingo Schommer
61cc033304 Fluent interface for TreeDropdownField 2013-01-08 18:32:40 +01:00
Ingo Schommer
79997477b3 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	model/DataList.php
 2013-01-08 17:16:09 +01:00
Ingo Schommer
2ace1de328 Merge pull request #1084 from jcwacky/patch-1 
Update docs/en/tutorials/1-building-a-basic-site.md
 2013-01-08 08:08:59 -08:00
James Cocker
001e58c110 Update docs/en/tutorials/1-building-a-basic-site.md 
Fixed typo in code block. UL tag was opening instead of closing.
 2013-01-08 15:52:46 +00:00
Will Rossiter
a8904e3de0 Removed incorrect line from contact form docs. 
From disqus comments.
 2013-01-08 18:17:38 +08:00
Sean Harvey
b63e55a77a Merge pull request #993 from halkyon/htaccess_fix 
Fixing .htaccess to ignore rewriting PHP files directly
 2013-01-06 17:24:49 -08:00
Sean Harvey
baaa270ceb Merge pull request #1032 from halkyon/datalist_filter_docs 
Improve class naming and docs for DataList::applyFilterContext()
 2013-01-06 17:23:43 -08:00
Sean Harvey
2140a621fb Merge pull request #1067 from halkyon/shorthand_ternary_op 
Remove unncessary variable from TreeDropdownField
 2013-01-06 17:20:54 -08:00
Sean Harvey
68eb367d27 Remove unncessary variable from TreeDropdownField 2013-01-07 14:14:54 +13:00
Ingo Schommer
a0a317886b Merge pull request #1077 from sunnysideup/patch-5 
upgrading 'Setting up an environment for contributing to SilverStripe'
 2013-01-06 13:08:06 -08:00
Nicolaas
9dcace9b32 upgrading 'Setting up an environment for contributing to SilverStripe' to heading 1 
we do this to make it clearer that you can do the basic install OR a 'DEV' install - after that we list the advanced usage cases.
 2013-01-05 11:26:21 +13:00