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
14,952 Commits 31 Branches 527 Tags 162 MiB
0d1bdd58b3
Commit Graph

217 Commits

Author SHA1 Message Date
scott1702
37e0f55124 fix gridfield overflow 2015-09-11 11:22:30 +12:00
Damian Mooyman
42e87d6830 Merge pull request #4510 from scott1702/gridfield 
Make gridfield button sizes consistent with the rest of the cms
 2015-08-19 12:39:37 +12:00
scott1702
c803c01e99 Make gridfield button sizes consistent with the rest of the cms 2015-08-19 10:56:40 +12:00
Jonathon Menz
aa286ef7d7 FIX Missing thumbnails and inconsistencies 
Made thumbnails and columns in File list Grid Fields more consistent (fixes #4409)
 2015-07-30 16:15:51 -07:00
Jonathon Menz
1af939bcb0 Tweak UploadField width for better alignment 
(fixes #3382)
 2015-07-16 11:09:08 -07:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
 2015-06-02 19:13:38 +12:00
scott1702
6ec466edbf Remove 'important' from gridfield hover 2015-04-20 15:12:48 +12:00
Damian Mooyman
319b96b48b Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
 2015-03-11 11:40:06 +13:00
Sam Minnee
eb35f260c6 FIX: Corrected padding on non-sortable columns. 
span.non-sortable in the GridField header relies on there being other, sortable columns in the list to get the padding
right. If there are no such columns (e.g. in a simple header), then the header is shown without padding, which is ugly.

This small change fixes that. Tested on Chrome and Firefox. 1px smaller than a sortable header on Firefox but still looks fine.
 2015-03-04 22:14:00 +00:00
Loz Calver
4709b90864 FIX: UploadField description alignment 2015-03-03 09:28:36 +00:00
Nick Spiel
227ea82953 Update 'spinner' to an SilverStripe branded version 
PSD: http://nickspiel.me/uploads/silverstripe-assets/spinner.psd
 2015-01-14 20:29:07 +11:00
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
 2014-11-18 12:45:54 +13:00
Sean Harvey
2c25358828 Merge pull request #2866 from kinglozzer/2862-uploadfield-editform-height 
FIX: UploadField height calculation fix (fixes #2862 & #2863)
 2014-09-26 10:30:52 +12:00
Loz Calver
5f653a00eb Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
 2014-08-14 09:08:26 +12:00
Sean Harvey
329dffd22d BUG AssetUploadField hides "generic" file upload messages. 
If an upload fails, the error is not shown correctly, it gets hidden
off the table because of absolute positioning. This currently worked
because it relied upon known errors not showing a "size" element next
to it.

"ui-state-warning-text" and "ui-state-success-text" don't need this
CSS, so it's probably not necessary anyway as it shows the error text
correctly without it.
 2014-07-29 10:06:27 +12:00
Naomi Guyer
46a5ee7d1d CSS: Fix upload field display for preview open 2014-07-25 16:15:49 +12:00
Loz Calver
58f8c2944a Fix: Incorrect calculation of UploadField height (fixes #2862) 2014-06-25 16:12:32 +01:00
Simon Welsh
fe8dc50ffc Merge branch '3.1' 
Conflicts:
	tests/view/SSViewerTest.php
 2014-03-30 18:17:24 +13:00
Loz Calver
86a69f9118 NEW: Show loading indicator when attaching files to UploadField 2014-03-25 14:53:30 +00:00
Simon Welsh
8f31352039 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
 2014-03-16 09:36:48 +13:00
colymba
02bceca9b4 FIX UploadField validation error and styles 
UploadField now return the validator's error message instead of 403. Plus nicer layout for error messages.
 2014-01-04 22:30:35 +02:00
Ingo Schommer
f29d51f433 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/reference/dataobject.md
	lang/es.yml
 2013-12-19 20:23:09 +01:00
Loz Calver
06d7bb77c0 FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 
Also addresses issue #1439.

I don’t like the binding iframe.on('load') events in the onclick handler, but apparently Entwine doesn't support binding on iframes.

AssetAdmin and HtmlEditorField support added
 2013-12-19 09:11:31 +00:00
Ingo Schommer
b56ca812dc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/security/MemberTest.php
 2013-10-23 14:53:29 +02:00
Loz Calver
e9fdfb05b2 GridField 'Add existing' action styling improvements 2013-10-22 16:44:28 +01:00
Ingo Schommer
455e550d9a Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/topics/testing/create-silverstripe-test.md
	forms/Form.php
	i18n/i18n.php
	model/Image.php
 2013-09-27 19:22:14 +02:00
Ingo Schommer
20b49e215c Merge pull request #2136 from nedmas/fix-remove-export-button-padding 
FIX: GridField button styling
 2013-08-30 00:24:21 -07:00
Ingo Schommer
4ff7b43c44 Merge pull request #2364 from adrexia/tree-dropdown-search 
API: Treedropdownfield showsearch default true, provide better ui
 2013-08-29 05:00:14 -07:00
Naomi Guyer
8b5f89f3b9 API: Treedropdownfield showsearch default true, provide better ui 
Set search option true on treedropdown fields by default, to provide a
fallback solution when trees fail to render (too many children errors)

Provide better indication/more meaningful styling to search (match
chosen styles for consistency)
 2013-08-29 16:21:04 +12:00
Arno Poot
2df060e1be FIX Make sure that debug always shows up first 2013-08-24 12:14:11 +02:00
Simon Welsh
fbce9fd7cd Merge branch '3.1' 
Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js
 2013-07-05 10:22:58 +12:00
Ingo Schommer
755a95e3f7 FIX UploadField: IE10 single click for upload trigger 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/644.
See d45deb15f4
 2013-06-25 15:35:45 +02:00
Tom Densham
3596892001 FIX: GridField button styling 
Remove all top/bottom margins from buttons and apply to GridFieldButtonRow component. Ensure that all buttons are added to a suitable GridFieldButtonRow in ModelAdmin, SecurityAdmin and Group.
 2013-06-21 14:22:00 +01:00
Ingo Schommer
94b4237372 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:33 +02:00
Sam Minnée
34287895ef Merge pull request #2099 from chillu/pulls/insert-media-tweaks 
Various "Insert Media" dialog tweaks
 2013-06-18 21:32:00 -07:00
Ingo Schommer
1fd8a55012 Form.scss reformatting (no functional changes) 2013-06-15 11:24:22 +02:00
Ingo Schommer
7c3e1a43e3 Removed unused '.right form' styles (2.x CMS) 2013-06-15 11:22:16 +02:00
Ingo Schommer
e3e828d15f Center aligning GridField pagination input text 2013-06-15 10:13:46 +02:00
Ingo Schommer
be62c731f5 Compressed layout in "Insert Media" detail screen 
- Same font size as other CMS UI
 - Smaller thumbnail height
 - Less label width and padding for file info
 2013-06-15 10:13:45 +02:00
Ingo Schommer
071f30ded7 Consistent dropdown styles between chosen.js and treedropdown 
Removed trigger background. Incidentally this also makes it less
obvious that the trigger has too much padding on the right
(which I can't figure out ...)
 2013-06-15 10:13:45 +02:00
Ingo Schommer
ea4f8cec07 Tighten "Insert Media" dialog layout 
Reduce space usage to fit into typical dialog dimensions without scrolling
 2013-06-15 10:13:44 +02:00
Ingo Schommer
7ce9677dcb Moved GridField table padding to buttons 
Avoid double padding when no bottom buttons exist
 2013-06-15 10:13:43 +02:00
Ingo Schommer
5a1d476e8d Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr 2013-05-31 19:27:19 +02:00
Ingo Schommer
77d65ba761 Fixed UploadField width (same as textual fields) 
Was getting too wide due to padding which isn't applied
to other fields (e.g. TextField)
 2013-05-29 17:25:46 +02:00
Damian Mooyman
7f057ce343 API UploadField functions on new records 
Fixed regression from 1e5d40474d (UploadField::canPreviewFolder).
Merged in pull request #2009 - (6018bdd631).
Merged pull request #1259 (34bfc862ee).
 2013-05-27 15:22:59 +12:00
Will Rossiter
831a507c90 FIX: Update references to ID values from 79c9433 2013-05-26 11:11:55 +12:00
Will Rossiter
9c1638a353 Remove references to ComplexTableField 2013-05-26 11:11:53 +12:00
Ingo Schommer
67d1327b90 Avoid collision of status flags in tree items when updating tree nodes 
Fixes silverstripe/silverstripe-cms#445
See https://github.com/silverstripe/silverstripe-framework/pull/1996
Thanks to Jean-Fabien for getting this started
 2013-05-25 11:27:50 +02:00
Julian Seidenberg
22c7bbfcd4 NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true). 2013-05-25 19:07:06 +12:00