yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,825 Commits 4 Branches 7 Tags
2203db548ae08eb17d053bf7d9fb855c8a8dc813
Commit Graph

513 Commits

Author SHA1 Message Date
Per Ploug
2ca894f605 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-07 13:48:21 +02:00
Per Ploug
55385d6374 Removes hardcoded reference to shannons users dir from sln file 2013-08-07 13:48:12 +02:00
Shannon
0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
 2013-08-07 10:29:34 +10:00
Sebastiaan Janssen
898d25f3cb Include lang files in project so they'll actually end up in the final build 2013-07-31 18:31:39 +02:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
 2013-07-31 18:52:14 +10:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Shannon
53891a69af Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want. 2013-07-23 16:43:08 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon
80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Sebastiaan Janssen
914005b2b6 Merge pull request #46 from michielvoo/u4-2417 
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-07-19 15:09:07 +02:00
Shannon
d3fe37a080 Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer. 2013-07-18 17:05:40 +10:00
Sebastiaan Janssen
60867af1a7 Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico 
Also fixes casing of folder names
 2013-07-15 16:31:19 +02:00
Shannon
e2ef802f65 Got delete working for legacy items... just need to get the tree to respond, do tree syncing, etc... but it is working. 2013-07-12 14:36:35 +10:00
Shannon
de2660cfb2 Merge branch '4.11.7---ITask-updates' into 7.0.0 
Conflicts:
	.gitignore
	.hgtags
	src/Umbraco.Core/XmlExtensions.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-12 11:30:06 +10:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Shannon
0f06308efc removed VS build events, hopefully that can kick start the build server 2013-07-04 12:36:28 +10:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Morten Christensen
9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Shannon
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Shannon
388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
AndyButland
d3562b797e Back-office UI for change of document type for content item 2013-06-27 21:29:27 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Shannon
68a648d3ba Merge remote-tracking branch 'origin/6.1.2' into 7.0.0 
Conflicts:
	.hgignore
 2013-06-25 10:01:23 +10:00
Sebastiaan Janssen
09d9728fb8 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2013-06-23 15:16:44 +02:00
Sebastiaan Janssen
c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally 
(you don't have to re-map your port to the correct folder)
 2013-06-23 15:13:27 +02:00
Shannon
b6cbd521ce Merge branch '6.1.2' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-20 16:06:23 +10:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon
2650740fa7 moved umbraco property editors into the core and outside the manifest (as c# declarations). Changed property editor names to not be editor.html and instead be the name of the folder as a convention. 2013-06-19 16:42:50 +10:00
Shannon
f0f394263f Removed all build files, updated sln to not try to build website project, 2013-06-18 14:11:23 +10:00
Shannon
6ecfcd3767 Moves main controller into separate file, ignore file removes a bunch of build files that don't need to be there. 2013-06-17 17:02:36 +10:00
Shannon
a7b546527c Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though). 2013-06-17 16:03:27 +10:00
Shannon
ab0ad9b255 Fixed drag drop upload for media in vdir 2013-06-11 16:04:28 +02:00
Shannon
a656911061 Updating media picker to work and look properly 2013-06-11 12:16:37 +02:00
Shannon
da146891ef Updated ignore file and ignored all Belle build files. 2013-06-11 09:32:51 +02:00
Shannon
655a280cf1 Ensures the tree expansion doesn't happen when there are no child nodes. 2013-06-10 15:03:25 -02:00
Shannon
b12e59cbac Removed temp committed files for belle, added build scripts 2013-06-10 14:46:49 -02:00
Shannon
df72297429 Got media picker working with real media items. 2013-06-10 11:15:33 -02:00
Shannon
47d70e858b Getting media picker working 2013-06-10 10:36:59 -02:00
Shannon
1b59c1ba6e Got content item creation working and rte property editor working/saving 2013-06-09 11:40:52 -02:00
Shannon Deminick
55521458b4 Fixed up some merge issues 2013-06-04 14:29:41 -10:00
Shannon Deminick
9e928ef0fa Merged in latest changes from Belle repo 2013-06-04 14:05:13 -10:00
Shannon Deminick
76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Shannon Deminick
edfffad122 updates proj file 2013-06-03 13:09:49 -10:00
Shannon Deminick
dd3490a2ab added extension.js, trying to add legacy sprites for tree icons, updates tree icon filters (still not working) 2013-06-02 20:34:06 -10:00