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

397 Commits

Author SHA1 Message Date
Per Ploug
6c218c3ab5 datatype controller methods for ct editor 2015-05-18 20:08:00 +02:00
Shannon
64cbeb4c9d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/EntityService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
	src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2015-05-13 12:20:43 +10:00
Shannon
0548a32405 adds some simple docs to umb settings 2015-05-12 17:32:26 +10:00
Shannon
1de9dbf18c Updates build process to include building a nuget Identity package to provide extensibility points in Umbraco. 2015-04-01 13:42:36 +11:00
Shannon
cd3191012f Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
 2015-03-27 15:15:49 +11:00
Sebastiaan Janssen
e775471013 Set disableFindContentByIdPath=false for local debugging of Umb source (the release config was already correct) 2015-03-25 17:08:53 +01:00
Sebastiaan Janssen
9dfccd86fd U4-2499 Remove the possibility for accessing pages with nodeid's or give a redirect option 
#U4-2499 Fixed Due in version 7.2.5
 2015-03-24 20:09:48 +01:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-19 17:37:00 +11:00
Sebastiaan Janssen
d24ef3650e U4-274 - Adds config option to disable alternative templates 2015-03-17 13:50:33 +01:00
Shannon
4eef90fe25 Merge remote-tracking branch 'origin/dev-v7-7.1.3-BetterXmlCacheFilePersisting' into 7.3.0 2015-02-17 15:15:29 +01:00
Stephan
e12984af4c refactor latched background tasks, now use a task for xml 2015-02-08 16:25:30 +01:00
Shannon
b899ab6557 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:49:58 +11:00
Shannon
c092d871c1 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:48:41 +11:00
Shannon
efab275c99 Fixes: U4-6188 umbracoNode.uniqueId needs to be changed to not allow nulls, U4-6187 umbracoNode.uniqueID needs a Unique index - currently it is a non-unique index, Gets the public access repository built and started testing 2015-01-27 19:47:30 +11:00
Shannon
e88264d0f7 Decouples more LogHelper 2015-01-16 11:08:00 +11:00
Shannon
c41c727e06 WIP - working on getting the legacy StyleSheet business logic class wrapping the new services. 2015-01-13 20:18:02 +11:00
Shannon
519b06fe30 Moves logging interface to Logging namespace called ILogger, creates a resolver for it, updates the boot process to ensure it exists first and anything during the boot process that is logging ensures that if it is not resolved that it logs elsewhere. Wraps LogHelper to use the ILogger based on the resolver. Updates all services that used LogHelper to have an ILogger injected into them. This is really only the start, there's a ton of places that use LogHelper (508) other places so we'll need to start looking at changing those over. All base classes will need to expose an Ilogger so people can use that. 2015-01-07 17:23:24 +11:00
Shannon
fff1da2a12 Merge branch 'dev-v7' into 7.3.0 2015-01-02 16:25:52 +11:00
Shannon
2286c0899c reverts UseTempStorage sync from examine settings on dev branch. 2015-01-02 11:55:18 +11: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
Shannon
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
a700258d92 WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility. 2014-12-11 15:58:54 +11:00
Shannon
c71e00b3dc Merge branch '7.2.1' into 7.3.0 2014-12-05 13:57:23 +11:00
Sebastiaan Janssen
8442b2e8e7 Updates installer backgrounnd and nonodes page 2014-12-03 16:51:16 +01: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
ef6a4139de Whoops, period should've been comma 2014-11-28 07:44:19 +01:00
Sebastiaan Janssen
adea6dd2f6 Final addition to disallowed upload files 2014-11-27 15:28:38 +01:00
Sebastiaan Janssen
cad0650223 #U4-5901 Fixed Due in version 7.2.0 
Remote Code Execution
 2014-11-27 14:29:49 +01:00
Sebastiaan Janssen
08432e8b23 U4-5895 follow up on U4-5889 2014-11-27 12:05:38 +01:00
Sebastiaan Janssen
caee5c6baf #U4-5889 Fixed Due in version 7.2.0 
Cross Site Scripting through umbraco uploader
 2014-11-26 14:42:24 +01:00
Shannon
8328f09d6b Works on U4-2866 - converted template tree to new tree structure. 2014-11-25 17:59:59 +11:00
Shannon
e6d1eb0ba0 Converts languages tree to new structure 2014-11-20 16:28:50 +11:00
Shannon
2d9bd394ae Updates the codemirror plugin for tinymce so that it uses it's own alias: codemirror, so the code and codemirror plugins can be enabled individually. 2014-11-18 14:06:43 +11:00
Shannon
9019c49ee8 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
	src/UmbracoExamine/BaseUmbracoIndexer.cs
	src/UmbracoExamine/DataServices/UmbracoContentService.cs
	src/UmbracoExamine/DataServices/UmbracoMediaService.cs
	src/UmbracoExamine/UmbracoContentIndexer.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2014-11-13 16:32:50 +11:00
Shannon
dd143681f1 By default, changes all log output for NH to be Warn 2014-11-12 16:02:02 +11:00
Shannon
f6c39362cd reverts codemirror tinymce editor from release until we can fix the IE issue with it, people can still enable it if they want though. 2014-11-12 10:05:20 +11:00
per ploug
3ec6e8a1ea Adds forms to the default app.config 2014-10-25 01:10:08 +02:00
Shannon
b4be203b2a Added a new dashboard to rebuild xml structures for content, members, media. I haven't put it in the release dashboard config for now. Also added methods to the examine controller to check the index integrity which we can use for th 7.3 task. 2014-10-23 18:52:11 +10:00
Shannon
26059ebad0 updated some of the table styling, updated the path to be relative and updated the release config. 2014-10-16 17:38:36 +10:00
Shannon
f48a218456 Merge branch 'tinymce-codemirror' of https://github.com/pynej/Umbraco-CMS into pynej-tinymce-codemirror 2014-10-16 17:06:22 +10:00
Shannon
10c0d26a17 Fixes: U4-4828 Disable "Scripting Files" tree and don't ship the macroScripts folder 2014-10-16 15:37:32 +10:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
antoine
a9cf1aa874 contour reference deleted 2014-09-23 20:18:46 +02:00
per ploug
b3769e4117 Removes 3rd party app + trees from app+tree.config 2014-09-23 19:53:12 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
per ploug
e1793ad95c merge 2014-09-23 08:48:36 +02:00
Shannon
fa2ed768db Adds forms dashboards and sections to normal development config 2014-09-23 12:40:10 +10:00
per ploug
872aff0c96 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:06:15 +02:00
per ploug
375fda2007 Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:03:09 +02:00
per ploug
5f5c8c7693 Forms section + dashboard 2014-09-22 20:07:35 +02:00