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

14753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
Sebastiaan Janssen
7e5ffdf0ca Update in case people have 64bit git installed 2015-12-16 13:00:28 +01:00
Sebastiaan Janssen
96b33cb071 Merge branch 'temp-U4-7365' into 7.4.0 2015-12-16 12:59:55 +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
Shannon
aa91b5c68d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-12-16 11:06:37 +01:00
Sebastiaan Janssen
c3f309c146 Merge branch '7.4.0' into temp-U4-7365 2015-12-16 10:25:19 +01:00
Shannon Deminick
e89cc24d51 Merge pull request #958 from lars-erik/overridable-domain-repository 
Can't log into youtrack. Simple changes to repositoryfactory and umbr…
 2015-12-16 10:19:25 +01:00
Claus
61f3b2ae4a Added CultureInvariant to regex. 2015-12-16 09:53:15 +01:00
Claus
a752c7ee4b Merge branch 'rasmusjp-U4-7462' into dev-v7 2015-12-16 09:52:36 +01:00
Lars-Erik Aabech
a14f0021bd Can't log into youtrack. Simple changes to repositoryfactory and umbraco.web.ui assemblyinfo. 2015-12-16 09:50:17 +01:00
Claus
5eb5549448 Merge branch 'U4-7462' of git://github.com/rasmusjp/Umbraco-CMS into rasmusjp-U4-7462 2015-12-16 09:36:49 +01:00
Sebastiaan Janssen
f00d89616a Merge branch 'temp-U4-7448' into 7.4.0 2015-12-15 17:17:54 +01:00
Shannon
3f796791cc uses the main property value instead of the param 2015-12-15 17:17:11 +01:00
Sebastiaan Janssen
5b825bdeae Merge branch '7.4.0' into temp-U4-7448 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 17:16:15 +01:00
Sebastiaan Janssen
d87dd67c08 Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-15 17:12:59 +01:00
Sebastiaan Janssen
581027172f Merge branch 'temp-7134' into 7.4.0 2015-12-15 17:12:24 +01:00
Shannon
b74cab6f0b U4-7538 GetRemainingTimeoutSeconds is double setting the cookie in 7.4 2015-12-15 16:56:31 +01:00
Sebastiaan Janssen
f2e37abb22 Merge branch '7.4.0' into temp-7134 2015-12-15 16:47:54 +01:00
Sebastiaan Janssen
46e7112abd Merge pull request #955 from umbraco/temp-U4-7537 
U4-7537 File cleanup for old content type editor
 2015-12-15 16:08:11 +01:00
Sebastiaan Janssen
cdeb82e7cc Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-15 15:42:50 +01:00
Claus
f5e9151ffd Localized some texts on the slider configuration. 2015-12-15 15:42:14 +01:00
bjarnef
5a9dd11a7c Change margin-top for triangle and re-order config properties 2015-12-15 15:42:14 +01:00
bjarnef
9e6123abd3 Modify properties and styling 2015-12-15 15:42:13 +01:00
bjarnef
6c3ef2aaa9 Add more config properties 2015-12-15 15:42:13 +01:00
bjarnef
95ae504c9b Change "reversed" property to boolean 2015-12-15 15:42:12 +01:00