Shannon
d11e787624
updates Nuspec with IP version
2017-01-10 11:37:31 +11:00
Stephan
5e6f1a92ca
Merge branch origin/dev-v7 into dev-v7.6
2017-01-09 15:31:41 +01:00
Sebastiaan Janssen
770f96b6d5
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
2017-01-05 09:47:51 +01:00
Shannon
c2359a96f8
missed nuspec update
2017-01-05 17:09:37 +11:00
Sebastiaan Janssen
dc62272e6e
Revert "Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)"
...
Keep the version the same as what ImageProcessor relies on to avoid confusion and conflicts
This reverts commit 56d2230251
2017-01-03 17:04:38 +01:00
Sebastiaan Janssen
6a374cbfa6
Make the NuGet install and upgrade work
2017-01-03 15:57:21 +01:00
Claus
d866f1d74a
Merge branch 'dev-v7' into dev-v7.6
2017-01-03 11:58:23 +01:00
Sebastiaan Janssen
84c0682f16
Not necessary to install Microsoft.IO.RecyclableMemoryStream, the ImageProcessor dependency will do that for us
2017-01-03 10:20:22 +01:00
Stephan
d8b70d79e8
Version 7.6.0-alpha044 on MyGet
2017-01-03 09:29:22 +01:00
Sebastiaan Janssen
56d2230251
Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)
2017-01-03 09:25:10 +01:00
Sebastiaan Janssen
62f21d3cee
Update nuspec to install latest version of ImageProcessor
2017-01-03 09:17:05 +01:00
Shannon
6b038186be
Fixes SignalR registration, the mapping was registered in the wrong place and too early so security was not working, bumps version for MyGet
2017-01-03 13:11:05 +11:00
Shannon
95187becaf
bumps to next alpha for MyGet
2017-01-03 11:50:29 +11:00
Shannon
ee925692e5
Bumps version to put on MyGet
2016-12-30 16:06:40 +11:00
Shannon
ffefe417db
bumps version
2016-12-29 12:23:30 +11:00
Shannon
59f39fd535
Ensures we remove the new DLL with the install script like other files
2016-12-28 19:48:35 +11:00
Shannon
fae5dd517e
bumps version to next alpha
2016-12-28 18:57:25 +11:00
Shannon
8e06a88a2c
bumps version, publicizes method
2016-12-23 14:52:18 +11:00
Shannon
0aa8a5c243
more whitespace fixing
2016-12-23 09:41:23 +11:00
Shannon
c5326fc5c9
fixes whitespace in version file
2016-12-23 09:31:54 +11:00
Stephan
9431e878f3
Version 7.6.0-alpha035
2016-12-22 11:34:33 +01:00
Shannon
bd4f3ad0d9
bumps umb version so the build works.
2016-12-22 18:44:47 +11:00
Shannon
5c40a1f9e9
bumps version
2016-12-19 16:42:05 +11:00
Sebastiaan Janssen
4855466b38
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v8
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Persistence/UmbracoDatabase.cs
# src/Umbraco.Core/Services/ContentTypeService.cs
# src/Umbraco.Core/UmbracoApplicationBase.cs
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web/Scheduling/LogScrubber.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Search/ExamineEvents.cs
# src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
# src/Umbraco.Web/UI/Controls/UmbracoControl.cs
# src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/library.cs
# src/Umbraco.Web/umbraco.presentation/macro.cs
# src/Umbraco.Web/umbraco.presentation/template.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs
# src/UmbracoExamine/DataServices/UmbracoContentService.cs
# src/umbraco.businesslogic/BasePages/BasePage.cs
# src/umbraco.businesslogic/Log.cs
# src/umbraco.businesslogic/User.cs
# src/umbraco.cms/businesslogic/CMSNode.cs
# src/umbraco.cms/businesslogic/Content.cs
# src/umbraco.cms/businesslogic/ContentType.cs
# src/umbraco.cms/businesslogic/Dictionary.cs
# src/umbraco.cms/businesslogic/Packager/Package.cs
# src/umbraco.cms/businesslogic/Property/Property.cs
# src/umbraco.cms/businesslogic/RecycleBin.cs
# src/umbraco.cms/businesslogic/Tags/Tag.cs
# src/umbraco.cms/businesslogic/datatype/BaseDataType.cs
# src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs
# src/umbraco.cms/businesslogic/datatype/DefaultData.cs
# src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
# src/umbraco.cms/businesslogic/datatype/PreValue.cs
# src/umbraco.cms/businesslogic/datatype/PreValues.cs
# src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
# src/umbraco.cms/businesslogic/member/Member.cs
# src/umbraco.cms/businesslogic/member/MemberGroup.cs
# src/umbraco.cms/businesslogic/propertytype/propertytype.cs
# src/umbraco.cms/businesslogic/relation/Relation.cs
# src/umbraco.cms/businesslogic/relation/RelationType.cs
# src/umbraco.cms/businesslogic/template/Template.cs
# src/umbraco.cms/businesslogic/web/Document.cs
# src/umbraco.cms/businesslogic/web/DocumentType.cs
# src/umbraco.cms/businesslogic/workflow/Notification.cs
# src/umbraco.cms/packages.config
# src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs
# src/umbraco.editorControls/BaseDataType.cs
# src/umbraco.editorControls/DefaultData.cs
# src/umbraco.editorControls/DefaultDataKeyValue.cs
# src/umbraco.editorControls/DefaultPrevalueEditor.cs
# src/umbraco.editorControls/KeyValuePrevalueEditor.cs
# src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs
# src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs
# src/umbraco.editorControls/SettingControls/Pickers/Field.cs
# src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
# src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
# src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs
# src/umbraco.editorControls/memberpicker/memberPicker.cs
# src/umbraco.editorControls/packages.config
# src/umbraco.editorControls/tags/PrevalueEditor.cs
# src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
# src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs
# src/umbraco.editorControls/umbraco.editorControls.csproj
# src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs
# src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
2016-11-29 18:01:43 +01:00
Stephan
a77763ee89
Merge origin/dev-v7 into dev-v7.6
2016-11-23 11:03:52 +01:00
Sebastiaan Janssen
64978dbe89
Merge pull request #1560 from mikkelhm/dev-v7
...
U4-9209 - Updates web.config.install.xdt to re-add the assemblyBinding for Html…
2016-11-21 22:54:49 +01:00
Sebastiaan Janssen
77e9643a09
Update NuGet CDF dependency
2016-11-21 08:17:18 +01:00
Stephan
6c8a033a56
Fix build.bat
2016-11-15 13:46:49 +01:00
Stephan
2b9ffdb6b9
Merge branch origin/dev-v7 into dev-v7-deploy
2016-11-14 18:53:53 +01:00
Sebastiaan Janssen
5b714572e3
Bump version
2016-11-14 17:04:55 +01:00
Stephan
b9d39db995
Refactor build, put tests in the right place
2016-11-05 17:57:29 +01:00
Stephan
dc75b20bc6
Refactor build, tests configuration is always Debug
2016-11-05 15:40:45 +01:00
Stephan
ed9abcf181
Refactor build, better to build tests
2016-11-05 15:33:27 +01:00
Stephan
8fa1499a2f
Merge origin/dev-v7 into dev-v7-deploy
2016-11-04 12:18:39 +01:00
Stephan
b26b415096
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
2016-11-03 10:31:44 +01:00
mikkelhm
e9724c8785
Updates web.config.install.xdt to re-add the assemblyBinding for HtmlAgilityPack after removing it earlier
2016-10-30 20:46:18 +01:00
Stephan
e330d40005
U4-9090 - Upgrade to ModelsBuilder 3.0.5 (reuse compiled live dll on restart)
2016-10-25 12:40:27 +02:00
Stephan
e8538cc035
Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy
2016-10-20 12:23:22 +02:00
Stephan
b7ef002da5
Cleanup SignalR
2016-10-19 15:35:25 +02:00
Stephan
20fc78419e
Refactor / fix SignalR integration, add nuspec dependency
2016-10-19 15:07:48 +02:00
Sebastiaan Janssen
097f5355e2
U4-9050 Update to latest Examine 0.1.70.0
2016-10-18 18:03:43 +02:00
Sebastiaan Janssen
7b5670f275
U4-9076 Update to latest ImageProcessor
2016-10-18 16:45:16 +02:00
Stephan
60a172343f
Build TLC
2016-10-17 12:40:43 +02:00
Stephan
172ae81924
Build TLC
2016-10-17 11:00:09 +02:00
Stephan
a279be1b47
Build TLC
2016-10-05 14:35:44 +02:00
Stephan
3fd918d381
Refacetor BackgroundTaskRunner, fix async issues
2016-10-04 14:12:06 +02:00
Sebastiaan Janssen
b8aaebf51a
Fix automapper remove/insert transform
2016-09-28 16:05:35 +02:00
Shannon
248177f518
Ensures Nuspec has correct AutoMapper, ensures config transform is correct (we cannot remove something that isn't there since it never existed before)
2016-09-28 15:33:32 +02:00
Claus
c9106065fd
config transform for nuget upgrade.
2016-09-20 09:12:44 +02:00
Stephan
3a34e1fb90
Introduce Umbraco.Compat7
2016-09-19 16:33:48 +02:00
