yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,499 Commits 4 Branches 7 Tags
d3232a09fbfcbebcb1abf86a43c0c06f09c3dd34
Commit Graph

4815 Commits

Author SHA1 Message Date
Claus
9c50e1c48d fixing bug in U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item 2017-10-17 23:52:34 +02:00
Sebastiaan Janssen
dc937ec942 Fix the "Add media" box no longer being square 2017-10-16 16:13:47 +02:00
Mads Rasmussen
315690e758 fixes breadcrumbs and search when start node is set 
(cherry picked from commit 1ec07aa205)
 2017-10-16 15:14:24 +02:00
Mads Rasmussen
fb8c519f71 fixes: U4-10521 Creating new folders from the media picker no longer works 
(cherry picked from commit 1cc3b39601)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
 2017-10-16 15:13:56 +02:00
Claus
4bd263e7bc U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item 
U4-10533 Show warning in UI for the link picker that is referencing a trashed or deleted item
cherrypicked from dev-v7.
 2017-10-16 13:52:17 +02:00
Shannon
33d7598d3c Adding key fallback to list view select functions to fix issue when selecting multiple items with an ID of int.MaxValue 2017-09-29 13:16:53 +10:00
Shannon
d2d43255aa U4-5222 Rollback Feature fails to update the UI to show the rolled back content - requires refresh 2017-09-28 02:38:53 +10:00
Sebastiaan Janssen
018a066f86 U4-10428 Can't drag Image in Image Cropper (in Umbraco 7.6.7) 2017-09-19 14:10:20 +02:00
Sebastiaan Janssen
c321d6dd44 Adds files missing from build output 2017-09-18 16:52:43 +02:00
Sebastiaan Janssen
3efba6b576 Update title of preview window 2017-09-15 13:52:26 +02:00
Sebastiaan Janssen
54407a66a4 Fixes canvas designer 2017-09-15 13:50:43 +02:00
Sebastiaan Janssen
bca46f11ad Makes the sort order input same size as the one on tabs 2017-09-14 16:11:23 +02:00
Warren Buckley
a86b8f786d Merge pull request #1817 from marcemarc/temp-U4-6738 
Relates to Issue U4-6738 - Allow viewing/sorting of composition properties.
 2017-09-14 14:55:48 +01:00
Warren Buckley
ac3eaf43cb Forgot to revert the logic for the extra button/label click to show the sort order on properties 2017-09-14 14:16:47 +01:00
Robert
f6d4170010 Merge pull request #1633 from bjarnef/dev-v7-U4-9149 
fixes: U4-9149 - Fix z-index of focal point
 2017-09-14 15:15:51 +02:00
Warren Buckley
2b0ea45da9 Remove the extra button/click in the UI & show the property sortOrder value when we are sorting 2017-09-14 14:13:42 +01:00
Warren Buckley
07d05c9e0d Revert "toggle the show ordinals label button to hide, when in show ordinal mode" 
This reverts commit 51215f11af.
 2017-09-14 14:09:00 +01:00
Mads Rasmussen
9c2b0a3ef6 fixes: U4-10413 Composition/Reorder bar gets in the way when editing or adding a property 2017-09-14 11:04:34 +02:00
Sebastiaan Janssen
83f08538c2 U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode 
# Conflicts:
#	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2017-09-13 12:05:02 +02:00
Shannon
65b44137d4 Fixes JS unit test runner 2017-09-12 16:02:40 +10:00
Sebastiaan Janssen
c23160f915 Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10006 
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
 2017-09-11 15:08:15 +02:00
Mads Rasmussen
3e3a180fe4 found better check for unit test fixes 2017-09-11 14:35:17 +02:00
Claus
082e399293 Merge pull request #1215 from IurieM/Add-error-calback-handler-for-unpublish-even-in-contetn.edit.controller 
Add error callback handler for unpublish event in content.edit.controller
 2017-09-11 11:51:09 +02:00
Mads Rasmussen
c4ab25f1ac fixing first round of unit tests 2017-09-11 10:50:54 +02:00
Sebastiaan Janssen
34e3257ddb Ignore failing unit tests to check if VSTS will continue 2017-09-09 15:54:24 +02:00
Sebastiaan Janssen
32999b7e19 Correction, we don't need this file after all :-) 2017-09-08 14:58:50 +02:00
Sebastiaan Janssen
ce63251206 Adds missing file to gulp build 2017-09-08 14:53:33 +02:00
Mads Rasmussen
35fc997d9f fix stylesheets for canvas designer/preview 2017-09-08 13:13:26 +02:00
Mads Rasmussen
96c9ecbdd7 fix calc functions 2017-09-07 21:39:41 +02:00
Sebastiaan Janssen
56dc10a4f7 Merge pull request #2158 from umbraco/temp-gulp-spike 
U4-10261 Change frontend build setup from grunt to gulp
 2017-09-06 23:52:48 +02:00
Warren Buckley
df8c75438a Merge pull request #2168 from ronaldbarendse/U4-9374 
U4-9374 Navigation panel header and editor panel header don't line up properly in Firefox
 2017-09-06 12:37:45 +01:00
Tom Fulton
1578bc8cc7 U4-8886 - TinyMCE - highlight media picker toolbar icon when image selected 2017-09-05 13:20:18 -04:00
Sebastiaan Janssen
a9cda9d651 Merge branch 'dev-v7' into temp-gulp-spike 2017-09-04 21:37:49 +02:00
Sebastiaan Janssen
e511554a42 Adds less as a dependency so that the build can complete 2017-09-04 20:10:19 +02:00
Ronald Barendse
207d6b53b5 Fixed .umb-panel-header-content-wrapper height 
The .umb-panel-header-content-wrapper was 1 pixel higher than the parent .umb-panel-header, now both heights are 99px.
 2017-09-04 11:22:56 +02:00
Shannon Deminick
88f332f5c7 Merge pull request #2157 from umbraco/temp-U4-10367 
U4-10367 417 missing token error due to cookie being overwritten
 2017-08-30 10:54:29 +10:00
Mads Rasmussen
06a87bc341 update readme 2017-08-29 14:56:17 +02:00
Mads Rasmussen
b10e646ade remove grunt file 2017-08-29 14:53:44 +02:00
Mads Rasmussen
110a3b2a12 add small interval to file watcher to keep windows calm 2017-08-29 14:35:54 +02:00
Mads Rasmussen
1bda9f32c1 only copy minified version of font-awesome 2017-08-29 14:27:43 +02:00
Mads Rasmussen
ce8390768e Source maps gets cached really hard in the browser so I will remove them for now until we find a solution to clear them 2017-08-29 14:17:41 +02:00
Mads Rasmussen
ed850629da Merge branch 'dev-v7' into temp-gulp-spike 2017-08-29 11:47:17 +02:00
Mads Rasmussen
1307cb1173 add themes for tinymce - they are needed for loading it 2017-08-29 11:39:16 +02:00
Sebastiaan Janssen
a1b9842215 Merge pull request #2131 from bjarnef/dev-v7-U4-10281 
U4-10281 - Fix maxchars javascript errors on macro parameter editors
 2017-08-29 11:23:16 +02:00
Sebastiaan Janssen
d300bf8d6d U4-10367 417 missing token error due to cookie being overwritten 
Changes the cookie and header names to be Umbraco specific
 2017-08-29 11:17:52 +02:00
Mads Rasmussen
70231fcee2 fix codemirror folder structure 2017-08-29 10:26:11 +02:00
Mads Rasmussen
aa5d7fc9fc only use source maps when developing 2017-08-28 15:42:31 +02:00
Mads Rasmussen
5cbe2b6ce0 Add tasks for karma testing 2017-08-28 14:41:54 +02:00
Mads Rasmussen
0089f79bd7 add tasks for ngdocs 2017-08-25 14:22:42 +02:00
Mads Rasmussen
c468e4736e bower name should be lowercase 2017-08-25 14:19:25 +02:00