Commit Graph

3078 Commits

Author SHA1 Message Date
Stephan
2f7f22961b Version alpha.31 with ModelsBuilder alpha.14 2018-01-20 10:21:01 +01:00
Stephan
eea1392ef4 Fix UI namespaces issues 2017-12-02 13:13:02 +01:00
Stephan
9b9c7c8e3a Refactor content service 2017-11-30 13:57:40 +01:00
Stephan
ec6ba01cbf So long Facade 2017-10-31 12:48:24 +01:00
Stephan
ab758001ef Cleanup more build 2017-10-26 17:52:51 +02:00
Stephan
7463852202 Cleanup build 2017-10-26 12:49:49 +02:00
Stephan
2305426dda Version -alpha.30 with ModelsBuilder -alpha.13 2017-10-26 11:25:01 +02:00
Stephan
edc5b398bd Version 8.0.0-alpha.29 2017-10-25 14:25:52 +02:00
Stephan
cf46a51866 Getting NestedContent and ModelsBuilder happy 2017-10-25 13:23:14 +02:00
Stephan
bcbd4289ea Facade cleanup and refactoring 2017-09-29 18:33:34 +02:00
Stephan
101ba8f620 Facade cleanup and refactoring 2017-09-29 18:33:16 +02:00
Stephan
e7a0d79ea7 Bugfix, getting things to run 2017-09-27 16:14:11 +02:00
Stephan
477acb4de3 Fix build, version 8.0.0-alpha024 2017-09-27 11:35:51 +02:00
Stephan
05cb03af11 Fix, now boots and runs 2017-09-27 10:26:37 +02:00
Stephan
ca0d5e365a Port 7.7 - WIP 2017-09-19 16:46:49 +02:00
Stephan
9a28250a8d Port 7.7 - WIP 2017-09-15 18:22:19 +02:00
Stephan
1c96df83cd Port 7.7 - WIP 2017-09-08 19:39:13 +02:00
Stephan
ab8fc33691 Port 7.7 - WIP 2017-08-14 18:21:48 +02:00
Stephan
a0fe56ee7c Rename UmbracoExamine to Umbraco.Examine 2017-07-27 12:01:38 +02:00
Stephan
42a046b80c Cleanup AssemblyInfo 2017-07-27 11:18:41 +02:00
Stephan
76569d58fe Cleanup DotSettings 2017-07-26 19:26:55 +02:00
Stephan
db9eccc220 Cleanup versions 2017-07-25 18:06:28 +02:00
Stephan
c76403077f Normalize cr/lf/tab 2017-07-20 11:21:28 +02:00
Stephan
2a9072609d Update AutoMapper to v6 2017-07-19 18:23:23 +02:00
Stephan
6098ba42a2 Update common dependencies 2017-07-19 18:23:14 +02:00
Stephan
32d4d36847 Upgrade more dependencies 2017-06-30 21:39:26 +02:00
Stephan
534e11ae1e Upgrade ModelsBuilder 2017-06-30 21:29:30 +02:00
Stephan
b120bb929a Fix dependencies 2017-06-29 19:23:14 +02:00
Stephan
7126234e80 Fix build 2017-06-28 21:11:02 +02:00
Stephan
6c710dac93 Log4Net fixing 2017-06-28 20:57:23 +02:00
Stephan
8397fc8e1b Build with PS - fix 2017-06-28 20:57:22 +02:00
Stephan
f85a688a0b Remove unwanted dependencies 2017-06-28 12:41:47 +02:00
Stephan
a243af8a06 Consolidate and Update NuGet dependencies 2017-06-28 12:33:46 +02:00
Stephan
9e7b9ea5b5 From umbraco.dll to Umbraco.Web.dll 2017-06-28 12:33:45 +02:00
Stephan
e87be7ad9d Fixing tests - and all sorts of issues 2017-06-23 18:58:08 +02:00
Stephan
3bf232ec3c Remove legacy refs from Umbraco.Web.UI 2017-06-19 09:41:58 +02:00
Stephan
7ea9c9c8e2 Move Web.Current to Composing 2017-05-30 18:13:11 +02:00
Stephan
d34a425dd1 porting 7.6@5c5baca into 8 2017-05-30 12:54:22 +02:00
Stephan
13ec3db2d3 fix 7.6-rc1 port 2017-05-24 12:25:59 +02:00
Stephan
9c58410d6c vs2017 csproj wip 2017-05-24 12:25:44 +02:00
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Stephan
ade6c2f057 All projects use C# 7.0 2017-04-20 19:16:41 +02:00
Stephan
07a05317ff Merge dev-v7.6 into dev-v8 2016-12-14 14:06:30 +01:00
Stephan
cb09681cb0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-13 10:36:33 +01:00
Warren Buckley
4b39f490f3 Merge pull request #1602 from cheeseytoastie/U4-9148_-_Splash_screen_apostophe_typo
U4-9148 noNodes Splash screen apostrophe char typo fixed (in "Be a pa…
2016-12-09 13:32:53 +00:00
Sebastiaan Janssen
677cc74a61 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2016-11-29 18:02:49 +01: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
feea4430f6 Fix dependencies 2016-11-29 10:48:47 +01:00
Stephan
d407038141 Fix owin:AppStartup setting 2016-11-29 10:32:43 +01:00
Stephan
a77763ee89 Merge origin/dev-v7 into dev-v7.6 2016-11-23 11:03:52 +01:00