yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,777 Commits 4 Branches 7 Tags
552cbada887dbed0e7027b94b753b13824fd427e
Commit Graph

12277 Commits

Author SHA1 Message Date
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
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
Shannon
b13b4953c3 U4-6890 New content type editor: Missing sorting of properties from server 2015-12-21 10:37:54 +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
Sebastiaan Janssen
cdce2a1180 Bump version 2015-12-17 14:27:37 +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
Shannon
4bd1cb0a3c Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-17 11:33:18 +01:00
Shannon
887bbdc3b0 dont' set applicationcontext to null on dispose for request based lifespan instances since applicationcontext is a singleton lifespan. 2015-12-17 11:32:50 +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
Shannon
c18ed7fa36 reverts the GetGroupedPropertyEditors method to return the data type definition for a property editor if it has no pre-values and is defined as a data type 2015-12-17 10:35:44 +01:00
Stephan
0df4949b82 Merge pull request #960 from umbraco/temp-deploy-31 
deploy-31 Implement DB changes for Umbraco Deploy
 2015-12-17 10:28:11 +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
9bff31c24a adds table create tests 2015-12-16 17:33:45 +01:00
Shannon
e61db40907 Changes to use a composite key for UmbracoDeployDependency 2015-12-16 17:31:38 +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
Sebastiaan Janssen
a0ac0b55d0 Update trees transform with new aliases and sorting, also re-ordered member tree to have member types first, think that was the intention 2015-12-16 17:02:10 +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
121d8c0279 Fixes reference to new member type tree alias "memberTypes" (breaking because of U4-7150) 2015-12-16 16:18:11 +01:00
Shannon
37a8cf7069 Removes unecessary items in the UI.xml file 2015-12-16 16:16:34 +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
Shannon
8260c12d64 deploy-31 Implement DB changes for Umbraco Deploy 2015-12-16 14:07:09 +01:00
Claus
2729069b00 Merge pull request #959 from umbraco/temp-U4-7477 
U4-7477 xss char stripping on data type names is being too agressive
 2015-12-16 14:01:12 +01:00
Claus
20c48a2daf Merge pull request #956 from umbraco/temp-U4-7538 
U4-7538 GetRemainingTimeoutSeconds is double setting the cookie in 7.4
 2015-12-16 13:42:54 +01:00
Sebastiaan Janssen
38e0a6e1bf Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-16 13:00:34 +01:00
Shannon
bdc7837f63 U4-7477 xss char stripping on data type names is being too agressive 2015-12-16 12:58:23 +01:00
Claus
7cf1491661 Merge branch 'temp-U4-6837' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
 2015-12-16 12:32:16 +01:00