Damian Mooyman
1e1a7a345c
Merge remote-tracking branch 'origin/3'
...
Conflicts:
control/Director.php
filesystem/File.php
filesystem/GD.php
filesystem/ImagickBackend.php
forms/HtmlEditorField.php
javascript/UploadField_uploadtemplate.js
model/Image.php
model/Image_Backend.php
model/fieldtypes/Enum.php
templates/AssetUploadField.ss
tests/model/ImageTest.php
tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +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
scott1702
9f9d0089df
Send user to new area when inserting url
2015-10-29 11:37:59 +13:00
scott1702
1f64631bfc
Update asset admin toolbar
2015-10-23 17:39:42 +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
scott1702
4f72b5cfb6
Add thumbnails font-icon
2015-10-08 10:22:14 +13:00
Damian Mooyman
0cd3569fb9
Update translations
2015-10-06 18:33:16 +13:00
scott1702
23baa288ba
Sticky footer on insert media/link elements
2015-10-01 15:35:56 +13:00
scott1702
3f85c57013
Move 'upload new file' section to main files area
...
Optimise and fix drag drop on upload fields
Combine 3 tabs from the 'insert media' dialog box into 1
2015-09-28 12:02:33 +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
34b71cf6c8
Merge remote-tracking branch 'origin/3'
2015-09-15 13:42:17 +12: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
812b5ecb62
Fix merge regressions
2015-09-09 16:18:39 +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
b552a7370f
Merge remote-tracking branch 'origin/3'
...
Conflicts:
tests/model/ImageTest.php
2015-09-09 15:44:47 +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
58409f64c0
Merge remote-tracking branch 'origin/3'
2015-08-24 11:59:21 +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
84b70422b6
Merge branch '3'
...
Conflicts:
.travis.yml
2015-08-18 16:41:21 +01:00
Daniel Hensby
0b177ad20f
Merge branch '3.2' into 3
2015-08-18 16:40:20 +01:00
