Commit Graph

549 Commits

Author SHA1 Message Date
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
2015-09-09 14:35:29 +12:00
scott1702
9cbb235daa update cms notifications
New style - text now wraps instead of overflowing
Now stay on screen longer
Hovering causes notification to stay on screen
2015-09-02 15:47:48 +12:00
scott1702
5f56f204f1 Update view mode section w/ font icons 2015-09-01 10:54:52 +12:00
scott1702
17ab371ffa Update font icon library 2015-08-28 15:15:06 +12:00
scott1702
6180788f9d Fix alignment of logout area 2015-08-28 12:20:00 +12:00
Daniel Hensby
08dd8fda62 Merge pull request #4086 from xini/fix-remote-url-field
fix width of remote url field label to allow right-click-paste
2015-08-27 20:50:35 +01:00
scott1702
7bbe258b44 update the filtered tree styling 2015-08-25 13:01:17 +12:00
Damian Mooyman
1bb6b85280 Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	admin/javascript/LeftAndMain.BatchActions.js
2015-08-24 11:55:54 +12:00
scott1702
7182c50721 Fix overlaying border on header tabs 2015-08-21 09:52:10 +12:00
Dan Hensby
c5c8a6a720 Merge remote-tracking branch '3.2' into 3
Conflicts:
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	css/GridField.css
2015-08-17 11:59:24 +00:00
Damian Mooyman
e0a560051e Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	css/AssetUploadField.css
2015-07-31 14:33:16 +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
Dan Hensby
64ceba133c Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	admin/css/screen.css
2015-07-20 14:08:36 +00:00
scott1702
c51c52f61f Update button and tab styles 2015-07-15 10:35:21 +12:00
Damian Mooyman
560f9a6e39 API respect custom attributes on OptionsetField and CheckboxSetField 2015-07-10 14:49:05 +12:00
Jonathon Menz
2a9e7087eb Improved label clipping in site tree
Deeply nested site tree nodes show a few more characters and any clipped text in labels is marked as such (fixes https://github.com/silverstripe/silverstripe-cms/issues/1235)
2015-07-07 09:00:40 -07:00
Jonathon Menz
e5ac209e3e Expanded bulk action checkbox hit zone
Increased checkbox click area so it's harder to accidentally click underlying link. Also lightened selected checkbox background colour for consistency (fixes #4342, fixes https://github.com/silverstripe/silverstripe-cms/issues/400, closes #4352)
2015-07-03 16:16:48 -07:00
David Craig
ae3fc84181 Add three column layout to Page content view
- Content filters included in SiteTree view
 - View (tree/list) buttons included in SiteTree view
 - Update view button styles for new layout
 - Updated breadcrumbs for new layout
2015-07-02 10:22:24 +12:00
Jonathon Menz
74e6a67cfa Different status dots for draft and modified
Added a colour difference for status dots so status of draft vs modified can be distinguished at a glance
2015-06-26 11:00:48 -07:00
Loz Calver
3ebb73a675 Fix background size for spinner @2x 2015-06-24 12:04:21 +01:00
scott1702
3bdae22f63 Fix padding bug pushing out the 'post options' panel 2015-06-24 11:53:38 +12:00
David Craig
a6013ed1d0 Move filters from panel to header
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
  - Now called 'Bulk actions'
  - Styling updated
  - Added placeholder text / removed redundant option
  - Now also appears in SiteTree view
2015-06-23 13:08:23 +12:00
Damian Mooyman
1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
scott1702
6cc1c4580c Update styles for multi-selection button 2015-06-17 22:22:59 +12:00
Damian Mooyman
d0bd5bc225 Merge pull request #4292 from scott1702/drag-drop
Shorten space between page icons and child page dropdown arrow
2015-06-17 12:33:45 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
scott1702
d36d0f348f Shorten space between page icons and child page dropdown arrow 2015-06-17 10:23:07 +12:00
Matthew Hailwood
d673fdf497 Float labels with ss-ui-button class in accordion
Currently things like the upload field etc break when you use them inside a ToggleCompositeField:

![Broken](http://i.imgur.com/abUopVf.png)

This fixes it by adding the float back

![Fixed](http://i.imgur.com/7P0muen.png)
2015-06-12 14:13:47 +12:00
Damian Mooyman
54f4ef0e9f Merge pull request #4249 from scott1702/tinymce-linkform-uploadfield
Update #2908 for 3.2
2015-06-09 12:38:46 +12:00
Damian Mooyman
a72bd16f42 API Deprecate delete in favour of archive
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
2015-06-03 14:24:27 +12:00
scott1702
a9d22f1fbf NEW: Files can be uploaded directly in the 'Insert Link' form 2015-06-03 11:20:29 +12: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
f9bd068ffe Fix broken share draft button 2015-05-26 10:19:47 +12:00
David Craig
3bac6fadfe Add 'sticky' behaviour to left menu 2015-05-25 12:09:14 +12:00
scott1702
fe15016e2b Updated SiteTree status overlay colours 2015-05-21 11:34:33 +12:00
scott1702
2670828cdc Change drag/drop icons and only appear on hover 2015-05-20 11:00:16 +12:00
Sean Harvey
2a04713323 Merge pull request #4153 from tractorcow/pulls/3/filter-page-highlight
API Enable tree filter highlighting
2015-05-07 10:14:33 +12:00
scott1702
8107e86d01 Change cursor for drag + drop icon on hover/active 2015-05-05 16:43:47 +12:00
Damian Mooyman
8863797b76 API Enable tree filter highlighting
Decoupling of CMS / Framework
2015-05-04 17:06:16 +12:00
David Craig
fa6f446867 Add styling to handle toggleable descriptions for files 2015-04-28 10:49:17 +12:00
David Craig
3122226273 Add toggleable description to CMS fields 2015-04-24 11:40:29 +12:00
Florian Thoma
3e69ae84c3 fix width of remote url field label to allow right-click-paste 2015-04-21 12:30:10 +10:00
Daniel Hensby
cb7aed46cd Adding loading spinner to ui-autocomplete fields when making ajax reqests 2015-04-17 11:38:04 +01:00
scott1702
25c9e9141e Fix z-index bug with sidebar 2015-04-16 15:31:48 +12:00
Jonathon Menz
8ee9130bcf NEW: CMS site tree status icons
Added coloured status 'dots' to overlay page icons and improved visibility of status labels
2015-03-04 08:43:00 -08:00
David Craig
33930597c0 Improve styling on modal dialogs 2015-02-16 08:58:23 +13:00
Elvinas L
730c4d3733 Dropdowns admin styling 2015-02-08 18:59:38 +13:00
Loz Calver
9944e82e51 Merge pull request #3712 from nickspiel/3
Update 'spinner' to a SilverStripe branded version
2015-01-27 09:33:12 +00:00
Damian Mooyman
88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00