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

970 Commits

Author SHA1 Message Date
Shannon
7cfcab4011 WIP working on getting the template services up to par and wrapping the new ones from old ones. 2014-11-25 18:48:19 +11:00
Shannon
f32a46c546 Working on U4-1979 - language service 2014-11-20 13:41:34 +11:00
Shannon
613f56107d Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
 2014-11-18 10:52:50 +11:00
Shannon
d61d6008da Adds internal event for when a package is installed which gives access to the InstalledPackage instance which contains a PackageInstance reference that contains all of the files installed in the package 2014-11-17 18:00:51 +11:00
Sebastiaan Janssen
b20fc22577 U4-5814 Apply MVC 4.0.0.1 security update 2014-11-14 16:51:51 +01:00
Shannon
3853e086a0 Fixes: U4-5654 U7.2 - Creating a media type with inheritance throws a YSOD and also fixes legacy icons with media/content types 2014-10-28 16:45:59 +10:00
Shannon
2babb2373d ensures new member types have correct default icon 2014-10-28 12:17:05 +10:00
Shannon
4494d8cc91 Merge branch 'partial-view-folders' of https://github.com/pynej/Umbraco-CMS into 7.2.0 2014-10-21 13:21:12 +10:00
Sebastiaan Janssen
f4231b1692 Upgrade to System.Web.Mvc 4.0.0.1 (or 4.0.40804.0 whatever you want to call it) 2014-10-17 17:24:32 +02:00
Morten Christensen
e6820ad52a Fixes U4-5077 Umbraco 7.2 Alpha - doc types with compositions get moved in doc type tree 
Return 0 if parent is the root
 2014-10-07 13:59:22 +02:00
Shannon
737f2fb707 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-03 00:07:40 +10:00
Shannon
8a65ea7e97 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-01 15:40:48 +10:00
Shannon
43603d0f97 fixes up the usage of the Repository.cs class since it is not disposing of the web service correctly. 2014-09-23 11:43:04 +10:00
Shannon
96d570e760 Gets most of the configurable list view working, need to add some validation to the pre-value editor, some styling for the sorting of a field, add another system field for 'published date' (if possible), fix up the localized text for return to list view, fix up the persisting of the last page viewed in a list view 2014-09-15 13:53:33 +10:00
Shannon
9bb5869cde reverting all things to do with additional list view column in db which is no longer necessary and removing additions to ui changes in the content tyep editor which are also no longer necessary 2014-09-12 11:50:56 +10:00
Shannon
7422238087 Merge branch 'AndyButland-u4-4972' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Editors/MediaTypeController.cs
 2014-09-10 15:35:57 +10:00
Shannon
6afead5207 Merge branch 'u4-4972' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-4972 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
 2014-09-10 15:35:05 +10:00
Jeremy Pyne
fbed14a9e0 Partial Views and Partial View Macro's should allow for folder hierarchy for organization. This changes makes them work much like the Scripts and css folders. 
I didn't add a Type drop down like the scripts screen has.  This is unnecessary and cumbersome.  Instead it works like other screens and the user can generate a hierarchy in their files by adding /'s in the names.  This is how it works in Stylesheets works and its a lot cleaner.  I added a note of this to the creation dialogs as well.

For example create a view file with the name myFolder/myView and the system will take care of folder creation automatically.  There is also a delete option.

Other errors fixed:
 Selecting a folder in the scripts lists was generating an error.
 Stylesheets would not create a new folder(but they wold make nested children in existing folders.
 Partial and Macro Views would not use the proper elpers for generating syncTree code.
 2014-09-04 10:17:54 -04:00
Shannon
3f4fa8b8ed Fixes: U4-5380 Booting.aspx security issue 2014-08-25 14:31:04 +02:00
Shannon
d2c7420c4c Merge remote-tracking branch 'origin/6.2.2' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
 2014-08-25 16:42:19 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
Shannon
89b5774106 Fixes: U4-5380 Booting.aspx security issue 2014-08-21 14:39:06 -06:00
Sebastiaan Janssen
3a4d0a02eb Fix redirect issue 2014-08-21 14:16:58 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Shannon
9bb8ee5f95 ensure even when using the legacy api that the icon for media folder is correct 2014-08-15 11:57:01 -06:00
Sebastiaan Janssen
5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
Sebastiaan Janssen
dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
 2014-08-04 13:32:44 +02:00
AndyButland
332220acc4 Amend of container page size from structure tab of document type editing screen 2014-07-27 10:28:52 +02:00
Stephan
8729156fbf U4-4931 - lock contention & potential application lockdown 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/umbraco.cms/Actions/Action.cs
 2014-07-10 10:34:17 +02:00
Stephan
43669e62b4 Merge branch '6.2.2' into 6.2-4931 2014-07-10 10:25:12 +02:00
Shannon
68b17bff08 Ensures no membership user writing when checking public access 2014-07-01 10:52:29 +10:00
Shannon
9b2b961f83 Ensures no membership user writing when checking public access 2014-07-01 10:51:56 +10:00
Shannon
59116fc7fa un-does the tag export/import, instead need to look at the internal of a simple publish (without save) to see if tags get written or not. 2014-06-30 17:05:34 +10:00
Shannon
a66670263f fixes null check 2014-06-30 17:04:59 +10:00
Shannon
1e1d49f305 fixes U4-5140 Package installation for content does not respect tags, however need to check with Morten if it's required because if we never actually publish content on package install then this wouldn't really matter. But surely we must publish on package install for some thing because starter kits are published... hrm. 2014-06-30 16:43:51 +10:00
Shannon
1be2706c30 fix merge 2014-06-30 15:09:41 +10:00
Shannon
eaf2956524 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
 2014-06-30 14:26:33 +10:00
Stephan
3c8517edcb Merge branch '6.2.2' into 6.2-4931 2014-06-28 16:26:44 +02:00
Stephan
45e6127d00 U4-4866 - fix the build 2014-06-28 16:26:27 +02:00
Stephan
6eb5d3f7ef Merge branch '6.2.2' into 6.2-4931 2014-06-28 16:06:30 +02:00
Shannon
b404cc6438 Fixes: U4-5141 Packager doesn't respect 'allow at root' or 'list view' 2014-06-26 17:18:00 +10:00
Shannon
80103e6155 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:55:44 +10:00
Shannon
4fbf65e684 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:45:59 +10:00
Shannon
0aeac407c5 removes extremely silly try catch all when using the packager - why was this here !? So that nobody would ever know why creating their package failed? 2014-06-26 16:33:56 +10:00
Shannon
27764a2c82 merge issue 2014-06-25 18:58:29 +10:00
Shannon
0b678f1d3b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2014-06-25 15:59:20 +10:00
Shannon
72991334c4 little bit of code cleanup 2014-06-25 15:55:52 +10:00
Shannon
bb655afd72 Fixes: U4-5080 Error deleting property type that references tags 2014-06-19 17:39:31 +10:00
Morten Christensen
81e56bed9e Implementing Document Type Compositions in the Document Type Editor. 
Adds changes to the CMSNode and doc type related class which improves the internal usage of the new model based on IUmbracoEntity.
 2014-06-11 07:08:38 +02:00
Niels Hartvig
32cfdbe968 Fixes: U4-4892 Inconsistent (lack of) instructions regarding file extensions in the UI 2014-06-08 19:18:37 +02:00