yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,810 Commits 4 Branches 7 Tags
9edffa010ddc3a0e413ff2b01a8e23898fc6ee36
Commit Graph

1041 Commits

Author SHA1 Message Date
leekelleher
0c7826b250 Added 'Restore' action class 
+ menu option for items in the recycle bin.
 2015-01-03 19:52:06 +00:00
Shannon
8c619e92d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-12-29 14:30:01 +11:00
Chris Roberts
d5b6428cdc Fixed: U4-6051 HasAccces method tests the roles of the wrong user 2014-12-23 16:32:24 +00:00
Chris Roberts
7d5bce76c2 Fixed: U4-5193 HasAccess override method name error 2014-12-23 16:30:11 +00:00
Shannon
8f35c8fb57 Fixes: U4-5996 CDF reference issue 2014-12-11 17:55:53 +11:00
Shannon
d4fd58e038 Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too. 2014-12-05 17:29:47 +11:00
Shannon
2961370b83 Adds some more tests, the legacy template object should now be wrapping the new one completely in regards with business logic (db) 2014-12-05 14:34:34 +11:00
Shannon
641c7dfa04 WIP - more work on templates repository/service 2014-12-02 11:30:30 +11:00
Shannon
95845c8f2e Almost completed U4-5847 Ensure the path is set correctly for templates in the db but needs a db migration script as well, more unit tests 2014-12-01 17:34:22 +11:00
Shannon
c656bb632e WIP more template repo work and more unit tests 2014-12-01 16:22:18 +11:00
Shannon
bf82a70744 WIP - still working on getting the template repository and models working correctly and adding some more tests. 2014-12-01 14:14:44 +11:00
Shannon
520955a8db WIP - ported over viewhelper and MasterpageHelper to the Core lib, still wrapping new file service from old template class. 2014-12-01 12:59:36 +11:00
Shannon
2b25815eee Merge branch '7.2.0' into 7.3.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-01 12:22:19 +11:00
Sebastiaan Janssen
a1c223bc2b Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken. 
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
 2014-11-26 10:43:46 +01:00
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
072c77989f Completes: U4-5415, almost completes U4-5416 2014-11-21 17:05:39 +11:00
Shannon
c3523a09ec WIP WIP WIP. Started working on U4-5648 which led to quite a lot of other things, once IDataType was removed (U4-5858), this lead to U4-5546, U4-5416, U4-5484, U4-5805. So much of this stuff is etched deep into the codebase, so nice to get rid of it. Had to remove the codefirst tests too for now since they relied on old apis and we don't really support it/use it. Commented out all of the code relating to the document type editor UI bits since they need to be rewritten and removed. 2014-11-21 16:34:47 +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
854bf5acbf remove more obsolete code 2014-11-14 18:48:42 +11:00
Shannon
4fce47cff3 Completes: U4-5808 All old legacy 'datatypes' since they are not supported or used 2014-11-14 18:22:31 +11:00
Shannon
07fdd81801 Fixes up a bunch of code errors with 'hiding' members, i'm actually surprised our sln even built with this sort of stuff 2014-11-14 18:10:41 +11:00
Shannon
6a7c7d396b Completes: U4-5807 2014-11-14 17:27:07 +11:00
Shannon
fbb023f844 working on U4-5648 Remove legacy razor macro's entirely - removes lots of legacy 2014-11-14 17:15:38 +11: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