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

904 Commits

Author SHA1 Message Date
Shannon
282550f402 Fixes: U4-6080 Server side email validation doesn't occur on existing members when they are saved 2015-01-07 13:17:44 +11:00
Shannon
485621b03a Revert "Merge branch '7.2.0-U4-4049' into dev-v7" 
This reverts commit 2ad86ec83d, reversing
changes made to 70ddf646be.
 2015-01-06 11:22:40 +11:00
Shannon
459d9b34e7 Fixes: U4-5974 User which is not administrator getting logged out when clicking recycle bin 2015-01-05 12:22:49 +11:00
Shannon
2ad86ec83d Merge branch '7.2.0-U4-4049' into dev-v7 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-01-05 10:26:27 +11:00
Shannon
73e9ff04e8 Fixes: U4-5943 Cannot render a macro on a virtual page when using UmbracoVirtualNodeRouteHandler and assigning virtual Ids 2015-01-02 15:34:51 +11:00
Shannon
8f35c8fb57 Fixes: U4-5996 CDF reference issue 2014-12-11 17:55:53 +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
f08320bd81 Fixes: U4-5976 When no Examine indexes exist they are rebuilt at startup, however the rebuilding happens too soon before any Examine event handlers are actually wired up. 
Updates examine version to facilitate this. Adds ability to tokenize the {machinename} in an examine index path.
 2014-12-09 19:07:14 +11:00
Shannon
d2dbd91b17 Fixes merge issues 2014-12-08 17:19:48 +11:00
Shannon
0a7bbfb1ca Merge remote-tracking branch 'origin/6.2.5' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-08 17:16:16 +11:00
Shannon
4d8732d925 The only way i could get this project to build and run was to change the transform to explicitly target 4.0.0.1 for mvc and webapi, otherwise nothing works and horribly cryptic build errors. Added the tests for the BackgroundTaskRunner 2014-12-08 14:59:32 +11:00
Sebastiaan Janssen
4eb9a54fa5 Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon 
#U4-5728
 2014-12-07 16:16:29 +01:00
Shannon
6555fd5791 Updated U4-4049 - we now use media formatters instead of IModelBinder (this is actually the preferred way anyways). The validation is then moved to just a filter instead of done in the model binder. This way a media formatter is pure async, so we can ReadFromStreamAsync in a completely native async operation which should hopefuly fix this issue. 2014-12-03 21:06:01 +11:00
Shannon
dc27368397 Fixes: U4-5891 2014-11-27 17:57:33 +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
e2cc342adf Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:44 +11:00
yannisgu
df0c297f55 Fix dotless reference in csproj 
In the packages.config the version 1.4.1 of dotless is referenced while in the csproj the version 1.4.0 was referenced.
 2014-11-14 11:16:20 +01: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
b1d4a99510 U4-5728 - Do not run KeepAlive, ScheduledPublishing, without an url 
Updates the scheduler and the scheduled tasks to use a background task runner (ported from new courier codebase with tests) so that they are web aware and wind down properly.
 2014-11-12 16:00:17 +11:00
Shannon
4a1ea6e2d8 Fixes: U4-5710 UmbracoVirtualNodeRouteHandler does not allow for SurfaceController forms 2014-10-29 18:20:01 +10:00
Sebastiaan Janssen
f0256e2bd5 Makes the check for Microsoft.WebApplication.targets file explicit 2014-10-25 17:06:35 +02:00
Sebastiaan Janssen
c273c94d57 Should fix the build for real now. Sets GenerateSerializationAssemblies to Off which then doesn't produce umbraco.XmlSerializers.dll any more. 
Should be safe as this is only used for updatechecker and packageinstaller. From:  http://hashtagfail.com/post/5255977780/sgen-loaderexceptions-error - "Visual Studio attempts to generate a serialization assembly containing the types in your solution, to improve XmlSerializer serialization performance, should you choose to serialize your types."
 2014-10-23 17:08:35 +02:00
Sebastiaan Janssen
231b3062b8 Should fix Teamcity build, Umbraco 7 can't build on VS10 anyway 2014-10-23 10:35:03 +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
86e82c7674 Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros) 2014-10-22 16:44:45 +10:00
Sebastiaan Janssen
043139caae Fixes build for people without git in path and with various VS versions installed (no more need to have at least VS2012 installed) 2014-10-19 13:00:54 +02: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
Shannon
ca58e8f98f Fixes: U4-4176 v7, cannot disable users in right-click-menu. 2014-10-16 18:45:02 +10:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Sebastiaan Janssen
340328aeba Fixes merge issue 2014-10-02 11:44:41 +02:00
Shannon
f875dc15f7 Merge branch '6.2.3' into 7.1.7 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx
 2014-10-01 16:47:49 +10:00
Shannon
2ec8d124fd renames new ssl attribute and updates proj 2014-10-01 16:06:19 +10:00
Shannon
fc47cdf9b0 proj file update 2014-10-01 10:25:06 +10:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02: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
Shannon
d87a426294 Implements the ability to have customized and configurable list views for specific content types 2014-09-22 18:18:09 +10:00
Shannon
7c76cbf509 Allows for email and username to be fields in list view, fixes up the list view usage to display members from a custom membership provider. 2014-09-19 15:34:26 +10:00
Shannon
b12985558a Fixes up all list views for all content types with regards to the delete button, now if you delete an child of a list view while viewing it it will redirect to it's container. 2014-09-19 13:55:30 +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
6ab2f8300c Fixes: U4-5473 Image cropper data type is not installed by default, ensures the List View data type is created on install, creates a new migration to ensure it exists when upgrading, fixes an old migration with improper use of a transaction. 2014-09-12 12:51:41 +10:00
Shannon
1844b048be Adds new method to IContentTypeService to return all user defined property type aliases, updates the default pre-values for the list view to underscore system aliases, 2014-09-12 11:35:20 +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
Shannon
4230668c8b creates new UmbracoTreeAuthorizeAttribute which helps make tree and editor security with webapi a bit more flexible with a different option to authorize against an assigned app based on a tree alias. 2014-09-05 16:08:41 +10:00
Sebastiaan Janssen
03ba8c9e14 Update to 6.2.2, removes airinstallbadge 2014-08-25 13:46:21 +02: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
Sebastiaan Janssen
2d5e5e9b3c Refactored initial relationtype creation as well and "Relate on copy" is now also using the relationservice so it fires events 2014-08-20 17:01:12 +02:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00