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
15,788 Commits 31 Branches 527 Tags 162 MiB
2299b8e67a
Commit Graph

1666 Commits

Author SHA1 Message Date
Damian Mooyman
44728d1c76 Merge pull request #4740 from chillu/pulls/3.2/batch-action-url-fix 
Batch actions break with Translatable installed
 2015-11-04 09:31:21 +13:00
Ingo Schommer
acdcf8ca02 Batch actions break with Translatable installed 
Due to ?locale GET parameter being appended to the action URL,
and naive string concatenation of additional GET parameters.
 2015-11-04 08:35:25 +13:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
 2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	lang/cs.yml
	lang/sk.yml
 2015-11-03 11:10:46 +13:00
Ed Linklater
42d2e0ebbf Don't try to unbind events from inside top-level iframes 2015-11-01 06:14:30 +13:00
Stephen Shkardoon
6030854725 Fix page reordering bug with ParentID 
If you are viewing PageA in the CMS, but move PageB into PageC,
the edit form will recieve an edit form ParentID of PageC.
This is incorrect, as only PageB had it's ParentID change.
 2015-10-12 20:10:48 +13:00
Damian Mooyman
0cd3569fb9 Update translations 2015-10-06 18:33:16 +13:00
Loz Calver
8f0f6475da FIX: Issues with field focus in edit forms (fixes #4621) 2015-09-23 15:19:24 +01:00
Nicola Fontana
c39cf2d55f Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
Damian Mooyman
00caeb700d Added 3.1.14 changelog 
Update translations
 2015-09-15 10:58:15 +12:00
scott1702
48c48d703d Disable split view mode when not enough room 2015-09-15 10:28:37 +12:00
Damian Mooyman
45b22c788e BUG Fix missing framework/admin/tests 2015-09-10 11:06:15 +12:00
Damian Mooyman
13e1f52b37 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-09 16:14:28 +12:00
Damian Mooyman
6ad277c412 Fix merge regressions 2015-09-09 16:12:12 +12:00
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
Damian Mooyman
96d20bc180 BUG Fix missing framework/admin/tests 2015-09-07 18:04:56 +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
Damian Mooyman
92f9af1984 Update translations 2015-09-02 11:15:53 +12:00
scott1702
5f56f204f1 Update view mode section w/ font icons 2015-09-01 10:54:52 +12:00
Daniel Hensby
ea757e72a6 Merge pull request #4560 from willmorgan/bugfixes/localstorage-win81-ie11 
Fix localStorage for Windows 8.1 IE11 desktop mode
 2015-08-29 21:15:19 +01:00
James Bolitho
0cb98bcce2 Fix localStorage for Windows 8.1 IE11 desktop mode 
In IE11 windows 8 call to window.localStorage was throwing out an access denied error.  Using try and catch manages the issue and allows the script to execute in IE 11 in desktop mode.

I think it is a problem with IE11 rather than the way Silverstripe is implementing the preview via an iframe from what I have been reading. http://blogs.msdn.com/b/ieinternals/archive/2009/09/16/bugs-in-ie8-support-for-html5-postmessage-sessionstorage-and-localstorage.aspx.  It seems that the way IE11 deals with localStorage is broken in certain cases but I am not 100% certain of the cause yet as I have not been able to find a definitive answer.  I only noticed it was a problem when a new client said they couldn't view the admin screen properly in IE11.  I took a look in IE11 and I was experiencing the same problem which makes the admin interface layout screw up and the preview doesn't work due the error mentioned in the first post.

Instead of the original code I submitted I have amended it and added an additional function to test more robustly to see if localStorage is available and can be accessed properly.  It is a copy of the code on a blog post Mathias Bynens has written about detecting if localStorage is available and can be used: https://mathiasbynens.be/notes/localstorage-pattern

I have added a console.warn as you suggested if localStorage is not available so that at least you get a warning if localStorage tests fail.

I have tested this on Windows 8.1: Firefox, Chrome & Mac: Firefox, Safari, Chrome and it seems to work as expected.  On IE11 it displays the admin area correctly now but obviously doesn't save the preview settings between page loads if localStorage is not available.
 2015-08-29 15:54:14 +01:00
Sam Minnée
f4b7cd3f68 Merge pull request #4500 from stevie-mayhew/pulls/get-response 
FEATURE: implement getter and setter usage for response
 2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +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
Daniel Hensby
2d4b743090 FIX Members can access their own profiles in CMS 2015-08-26 15:47:51 +01:00
Damian Mooyman
445f1d4ccb Merge pull request #4529 from scott1702/filtered-tree 
update the filtered tree styling
 2015-08-25 14:50:39 +12:00
scott1702
7bbe258b44 update the filtered tree styling 2015-08-25 13:01:17 +12:00
Damian Mooyman
f7c19830d6 BUG Fix JS error on clicking collapsed panel 2015-08-24 17:36:29 +12:00
Sam Minnée
5c5dd7efce Merge pull request #4531 from tractorcow/pulls/3.2/block-archived-dragdrop 
BUG disable archived pages from being droppable
 2015-08-24 17:04:41 +12:00
Sam Minnée
942ef04664 Merge pull request #4532 from tractorcow/pulls/3.2/packages 
Add missing packages
 2015-08-24 17:04:39 +12:00
Damian Mooyman
f220adc3e0 Update translations 2015-08-24 16:52:39 +12:00
Damian Mooyman
4a011303b9 Add missing packages 2015-08-24 16:15:38 +12:00
Damian Mooyman
80ce5498d8 BUG disable archived pages from being droppable 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1257
 2015-08-24 15:59:59 +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
Damian Mooyman
b14794b780 BUG Fix bulk actions making sitetree unclickable 2015-08-21 16:24:13 +12:00
Damian Mooyman
0f81d5ece5 BUG Fix bulk actions making sitetree unclickable 2015-08-21 16:22:08 +12:00
scott1702
7182c50721 Fix overlaying border on header tabs 2015-08-21 09:52:10 +12:00
Daniel Hensby
0b177ad20f Merge branch '3.2' into 3 2015-08-18 16:40:20 +01:00
Daniel Hensby
af5ef13e6c Merge branch '3.1' into 3.2 2015-08-18 16:39:35 +01:00
Loz Calver
8b638f56fb FIX: Using undefined var in ModelAdmin 2015-08-18 15:37:15 +01: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
Daniel Hensby
a8ab5a468d Merge branch '3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
 2015-08-17 11:43:28 +01:00
Sam Minnée
5911d50bca Merge pull request #4477 from nickbooties/nickbooties-patch-1 
Fixes #4424
 2015-08-11 17:34:35 +12:00
Nick
c4c4d79c26 Fix for Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces.
Uses className for element ID on ImportSpec template.
 2015-08-11 14:56:13 +10:00
Stevie Mayhew
ea7b0714c2 MINOR: be more specific with background class for menu 2015-08-07 13:22:57 +12:00
Daniel Hensby
009458e342 Fixing rubbish login message when trying to access the CMS 2015-08-04 12:23:22 +01:00
Nick
1438a53900 Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
 2015-08-04 15:57:38 +10:00
Nick
9ad64716cc Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
 2015-08-04 15:55:07 +10:00
Damian Mooyman
102892e247 Update translations 2015-08-04 13:02:20 +12:00
Damian Mooyman
f2c39aac20 API batch restore action 2015-08-03 18:26:44 +12:00
scott1702
dfaaa3353e Update batch archive warning to incl children pages 2015-08-03 16:17:31 +12:00
Damian Mooyman
66ca5405d0 BUG Fix change detection on browser back button 2015-08-03 08:31:51 +12:00
Damian Mooyman
fa76f98d0c Merge pull request #4441 from jonom/choose-file-thumbnails-3.2 
FIX Missing thumbnails and inconsistencies
 2015-07-31 14:37:10 +12: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
Damian Mooyman
7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	filesystem/File.php
	model/DataObject.php
	model/DataQuery.php
	search/filters/FulltextFilter.php
	search/filters/SearchFilter.php
	tests/core/ClassInfoTest.php
	tests/filesystem/FileTest.php
	tests/model/DataListTest.php
 2015-07-31 11:38:18 +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
Daniel Hensby
1e20b7d698 Merge pull request #4390 from tractorcow/pulls/3.2/predictable-ids 
API respect custom attributes on OptionsetField and CheckboxSetField
 2015-07-30 11:15:15 +01:00
Damian Mooyman
ae783e9598 Merge pull request #4042 from selay/3.1 
Hardcoded http:// cause browser warnings in admin panel
 2015-07-28 09:14:34 +12:00
Loz Calver
a3fd150bd0 Upgrade template translation syntax 2015-07-22 14:17:03 +01:00
Daniel Hensby
cd560eee12 Merge pull request #4397 from flashbackzoo/pulls/batch-actions-tree-status-fix 
Update tree status after bulk action is applied
 2015-07-22 13:53:41 +01: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
Daniel Hensby
ca8d0f2818 Merge branch '3.1' into 3.2 
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
 2015-07-20 10:48:01 +01:00
Jonathon Menz
272f6d7700 Improved site tree tooltips 
Now shows full title and friendly singular name for page type
 2015-07-16 08:49:43 -07:00
David Craig
3c20b58067 Update tree status after bulk action is applied 2015-07-16 10:50:09 +12:00
Tom Densham
b17b186e93 Convert FQCNs to html safe strings 
Convert namespaced class names to html safe strings in `LeftAndMain.php` `CMSMenu.php` and `LeftAndMain.Main.js` by replacing backslashes (\) with dashes (\) and removing special characters with `Convert::raw2htmlname()`
 2015-07-15 15:33:00 +01: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
David Craig
e4447698b5 Update compass config 
- Add sourcemaps for debugging
- More consistant builds across environments
 2015-07-09 10:11:00 +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
Damian Mooyman
0ce92b0728 Merge remote-tracking branch 'origin/3.2' into 3 2015-06-23 17:35:29 +12:00
David Craig
f6745a3feb Fix new page SiteTree nesting 2015-06-23 16:53:38 +12:00
David Craig
ca039e15ef BUG Fix regressions in changes to batch action feature 2015-06-23 16:28:25 +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
bc8bc7d0c5 Update translations 2015-06-19 18:18:00 +12:00
Hamish Friedlander
4e8aa72702 Merge pull request #4310 from tractorcow/pulls/3.2/deprecations 
Set deprecation level for all changes in 3.x to 4.0
 2015-06-19 15:58:27 +12:00
Damian Mooyman
d9c7d4538b Update user help link for 3.2 2015-06-19 15:56:12 +12:00
Damian Mooyman
e14f743bf0 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +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
Daniel Hensby
ad04eeb5c4 Merge pull request #4259 from tractorcow/pulls/3/multi-htmleditor-config 
API Support for multiple HTMLEditorConfig per page
 2015-06-12 00:53:44 +01:00
Damian Mooyman
c877882f7e Merge pull request #4170 from kinglozzer/pulls/4137-leftandmain-tree 
Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135)
 2015-06-10 09:18:05 +12:00
scott1702
f0bc073848 Tidy up loading gif 2015-06-09 13:41:21 +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
a8ace75341 API Support for multiple HTMLEditorConfig per page 2015-06-09 12:17:55 +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
Jonathon Menz
869e69a9b2 BUG: Clicking icon in site tree link fails 
Code removed here intentonally prevented node selection when dragging but at the cost of clicks on site tree icons selecting the node but not loading the link. Since it's possible to drag a site tree item from the title, not just the icon, think it's better to remove this for now (choosing the lesser of two evils). A full fix to prevent node selection should follow, perhaps during an upgrade to jstree.
 2015-05-27 09:22:42 -07:00
Damian Mooyman
161cd5c14d Merge pull request #4203 from scott1702/sharedraftcontent-module-fix 
Fix broken inline buttons
 2015-05-26 13:24:59 +12:00
scott1702
f9bd068ffe Fix broken share draft button 2015-05-26 10:19:47 +12:00
David Craig
8b29732291 Fix left nav styling. 
- Incorrent collapsed state on reload, when 'flush' param is not present.
- The content area had a horizontal scroll in split-mode.
 2015-05-25 16:55:25 +12:00
David Craig
3bac6fadfe Add 'sticky' behaviour to left menu 2015-05-25 12:09:14 +12:00
scott1702
2f2ba8600b Run compass compile 2015-05-25 10:44:31 +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
Damian Mooyman
69a244e03f Update translations 2015-05-14 13:45:03 +12:00
David Craig
232ed3cb4f Fix panel collapse 2015-05-13 10:15:50 +12:00
Loz Calver
8b4a9a3988 Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135) 2015-05-07 16:01:24 +01:00
Loz Calver
f38836df37 Recompile SCSS 2015-05-07 12:38:18 +01: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
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
David Craig
fa6f446867 Add styling to handle toggleable descriptions for files 2015-04-28 10:49:17 +12:00
Loz Calver
120b983ad6 FIX: X-Reload & X-ControllerURL didn't support absolute URLs (fixes #4119) 2015-04-27 15:38:54 +01: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
Damian Mooyman
43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
 2015-03-31 19:54:15 +13:00
ielmin
b617ef1abd Hardcoded http:// cause browser warnings 2015-03-26 13:20:21 +11:00
Naomi Guyer
636cddb4bc BUG: export and print buttons outside button row 
Export and print buttons are appearing outside the button row in model admin, meaning that if the add button is removed (say, by removing the create permission), the buttons are flush with the gridfield.
 2015-03-26 14:08:46 +13:00
Loz Calver
2d1fa46be8 Merge pull request #4011 from dhensby/pulls/model-admin-import-naming 
Using sigular name for model import form rather than class name
 2015-03-19 21:09:19 +00:00
Daniel Hensby
13cec2ee81 Using sigular name for model import form rather than class name 2015-03-13 13:36:52 +00: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
Damian Mooyman
636784845e Update admin js translations 2015-03-10 09:13:35 +13:00
Damian Mooyman
a7bd6de2ec Update translations 2015-03-09 17:11:10 +13:00
Daniel Hensby
d2a3da2203 Making docs gender agnostic 2015-03-07 12:32:04 +00: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
Jonathon Menz
5216b67290 Compile latest scss 2015-03-04 08:43:00 -08:00
Ingo Schommer
7c4c30270a Merge pull request #3901 from flashbackzoo/pulls/ui-dialog-styling 
Improve styling on modal dialogs
 2015-02-21 16:27:32 +13:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
 2015-02-20 10:17:19 +13:00
Daniel Hensby
1d4150bee4 Merge pull request #3787 from uniun/patch-4 
FIX. Use i18n_plural_name() instead of plural_name()
 2015-02-17 10:54:45 +00:00
David Craig
33930597c0 Improve styling on modal dialogs 2015-02-16 08:58:23 +13:00
Aden Fraser
d555b5b26e Fixed JS error in lib.js (fixes #3481) 2015-02-11 16:59:53 +00:00
Ingo Schommer
d5bb290b8e Don't update CMS preview on a CMS redirect 
The CMS preview causes unnecessary browser processing by loading a URL
which should be considered "in transit" when a CMS redirect is set through
the X-ControllerURL HTTP header. The CMS history processing will
load this new URL, and cause a new preview URL to be loaded.

Fixes https://github.com/silverstripe/silverstripe-translatable/issues/158
 2015-02-08 19:58:55 +13:00
Oliver Shaw
7484b4f5d9 Trim ModelAdmin SearchForm values 2015-02-08 19:25:51 +13:00
Elvinas L
730c4d3733 Dropdowns admin styling 2015-02-08 18:59:38 +13:00
John Milmine
95d0ed486c fixing tab force active 
Wasn't getting li, plus was find tabs in child tabsets
 2015-01-29 13:18:39 +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
Damian Mooyman
aa445b8e5a Merge pull request #3564 from kinglozzer/pulls/3563-encode-backurl 
FIX: Ensure query string in X-Backurl is encoded (fixes #3563)
 2015-01-15 10:23:19 +13: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
Loz Calver
dae4de1169 Merge pull request #3780 from phptek/centre-pane-expand 
FIX: Expands the CMS' centre-pane when collapsed and it's clicked.
 2015-01-14 09:13:43 +00:00
Russell Michell
ef237f69cc FIX: Expands the CMS' centre-pane when collapsed and it's clicked. 2015-01-14 08:40:05 +13:00
Elvinas L.
ab24ed3bea FIX. Use i18n_plural_name() instead of plural_name() 2015-01-13 15:31:17 +02:00
Damian Mooyman
c2af23033f Update translations 2015-01-12 17:54:49 +13:00
Stevie Mayhew
11e48245c9 Remove "Filter" title if no search form is present 
Same as with the import form - you can overload the public function `SearchForm` in your model admin subclass to not return a form and the title currently remains there which makes no sense.
 2015-01-07 16:22:12 +13:00