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

3503 Commits

Author SHA1 Message Date
Per Ploug
88f6722b9d ContentType EditController typo 2015-12-30 10:40:48 +01:00
Shannon
1040700bfd Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/ContentTypeController.cs
 2015-12-29 11:26:15 +01:00
Shannon Deminick
198033ff22 Merge pull request #974 from umbraco/temp-U4-7569 
Temp u4 7569
 2015-12-28 10:36:18 +01:00
Mads Rasmussen
c11b09d2d6 Merge pull request #975 from umbraco/temp-U4-7573 
Fix for http://issues.umbraco.org/issue/U4-7573
 2015-12-23 11:11:10 +01:00
Mads Rasmussen
c7e9e99373 Merge pull request #978 from umbraco/temp-U4-6854 
Fix for http://issues.umbraco.org/issue/U4-6854
 2015-12-23 09:53:53 +01:00
Mads Rasmussen
292887d9eb Merge pull request #967 from umbraco/temp-U4-7571 
Fix for http://issues.umbraco.org/issue/U4-7571
 2015-12-23 09:35:29 +01:00
Simon Busborg
7a112c43d8 Fix for http://issues.umbraco.org/issue/U4-6854 
Grid editor - insert control: Make blue area clickable
 2015-12-22 20:05:29 +01:00
Jeremy Pyne
9649e6d9bf Add code to manually update the model. 2015-12-22 11:17:53 -05:00
Jeremy Pyne
0d7363af23 Fix for MarkdownEditor no seeing changes from button clicks. 2015-12-22 10:47:04 -05:00
Simon Busborg
552cbada88 Fix for http://issues.umbraco.org/issue/U4-7573 2015-12-22 15:07:57 +01:00
Shannon Deminick
7883a3720b Merge pull request #964 from umbraco/temp-U4-6890 
U4-6890 New content type editor: Missing sorting of properties from s…
 2015-12-22 15:04:47 +01:00
Mads Rasmussen
bb5812ba54 remove front-end sorting of properties in content types 2015-12-22 14:46:57 +01:00
Simon Busborg
a0c552d289 Moved media "remove file" and "Choose file" on one line. UI Sugar 2015-12-22 14:26:52 +01:00
Mads Rasmussen
8eb3122409 remove fadeOut class from load indicator directive to make in animate more than once 2015-12-22 14:08:31 +01:00
Mads Rasmussen
89e2bb1d0a Fixes: U4-7569 Listview should not loose focus after filtering and U4-7582 When searching in media with no results, show a no results message + make empty state directive 2015-12-22 14:07:12 +01:00
Shannon Deminick
41879e28ef Merge pull request #971 from umbraco/temp-U4-7567 
Fix for http://issues.umbraco.org/issue/U4-7567
 2015-12-22 11:26:05 +01:00
Simon Busborg
2bf83c2cce Added proper hierachy to intro screen 2015-12-22 10:46:21 +01:00
Simon Busborg
42db79bdf6 Added .btn-link -underline for dashboard links, removed global link styling from umb-dashboard-control 
Added .btn-link -underline to dashboards
 2015-12-22 10:39:49 +01:00
Simon Busborg
e77e0c6704 added posibility to use border radius variables 2015-12-21 15:52:13 +01:00
Simon Busborg
f5fc4eacd4 Fix for http://issues.umbraco.org/issue/U4-7566# 2015-12-21 15:33:20 +01:00
Simon Busborg
0ba9054412 Removed border-radius 2015-12-21 15:25:22 +01:00
Simon Busborg
9bbaf4a20e Removed rounded corners on elements 2015-12-21 15:21:11 +01:00
Mads Rasmussen
6a9f6bc91b make it possible to select folders in media picker, fix issue with deselecting image in some cases + a bit code clean up. 2015-12-21 14:48:46 +01:00
Simon Busborg
8e3b6ffd59 added blue hover state 2015-12-21 12:38:22 +01:00
Simon Busborg
4a660433de Removed hover state 2015-12-21 12:37:21 +01:00
Simon Busborg
3a640c7a78 Added hover state 2015-12-21 12:32:15 +01:00
Simon Busborg
632bccb9dd Added new mediapicker ui for consistency through the backoffice, removing text-decoration problem 2015-12-21 12:22:14 +01:00
Wincent
53f9e104ec Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into U4-7312-2 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs - Removed changes from upstream
 2015-12-19 11:16:30 +01:00
Simon Busborg
8008a3b7c5 Fix for http://issues.umbraco.org/issue/U4-7574 2015-12-18 11:22:40 +01:00
Simon Busborg
da02b1330c Fix for http://issues.umbraco.org/issue/U4-7572 2015-12-18 10:33:22 +01:00
Mads Rasmussen
8830faedfd remove gradient from orange buttons 2015-12-17 14:19:34 +01:00
Mads Rasmussen
087ad2e1fa grid: remove the + from add content button 2015-12-17 14:01:33 +01:00
Mads Rasmussen
549881bfb7 Merge pull request #961 from umbraco/temp-U4-7551 
U4-7551 New Content type editor dialog to select an editor for a prop…
 2015-12-17 13:18:39 +01:00
Mads Rasmussen
afd5b2e8d3 fix missing eventService injection 2015-12-17 12:38:31 +01:00
Mads Rasmussen
c7ac6e5e70 Loading grouped datatypes when reusing in content type editor. Create new data type from available editor, get data type from reuse. 2015-12-17 12:32:18 +01:00
Mads Rasmussen
6d30c89757 fix merge conflict 2015-12-17 11:20:40 +01:00
Shannon
62db58110a re-reverts GetGroupedPropertyEditors and adds GetGroupedDataTypes 2015-12-17 11:13:49 +01:00
Claus
1655749c5d Merge branch 'temp-U4-7549' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
 2015-12-17 10:41:44 +01:00
Mads Rasmussen
87109b0747 rename umb-list-view directive to umb-list-view-settings. Because the other was just confusing 2015-12-17 10:17:34 +01:00
Simon Busborg
d89defe23b Added correct cursors to elements that can be moved in the grid 2015-12-17 09:03:48 +01:00
Mads Rasmussen
e16a1a2459 content type editor: switch settings and remove buttons to follow same convention as grid + fix small html bug. 2015-12-16 20:04:23 +01:00
Mads Rasmussen
48c963985a Hide editor sub headers in content type property preview. This will prevent it from scrolling down on long content types (and look weird) 2015-12-16 20:01:29 +01:00
Mads Rasmussen
57d78aac70 remove before stop event in grid sorting. The code doesn't work and it makes an js error in Edge which makes sorting fail. 2015-12-16 19:58:17 +01:00
Mads Rasmussen
5ec5afd16f Fixes: U4-7554 Compositions are not loaded in media types + move icon converter for composition to prevent js error 2015-12-16 19:51:25 +01:00
Shannon
fcbac0138a U4-7549 For new installs make the Image use the image cropper instead of upload 
Also fixes issue with media type editor which was a bug resulting fromn(U4-6837)
 2015-12-16 17:23:50 +01:00
Shannon
07533e0145 U4-7551 New Content type editor dialog to select an editor for a property type needs the "Default" and "Reuse" tab functionality changed 
Removes unused/non-required methods from data type controller/service.
 2015-12-16 16:51:12 +01:00
Shannon Deminick
9cc57479da Merge pull request #957 from umbraco/temp-U4-7186 
Fixes: U4-7186 Go through the remaining dialogs and check for consistency
 2015-12-16 16:35:02 +01:00
Shannon
790727e952 Fixes reference to new data type tree alias "dataTypes" (breaking because of U4-7150) 2015-12-16 16:19:16 +01:00
Shannon
a2e64b3485 Fixes reference to new document type tree alias "documentTypes" (breaking because of U4-7150) 2015-12-16 16:16:21 +01:00
Shannon
ea86c8bcff Fixes reference to new member group tree alias "memberGroups" (breaking because of U4-7150) 2015-12-16 16:07:56 +01:00