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

1235 Commits

Author SHA1 Message Date
Warren Buckley
f2cc0eebf5 Remove the dashboard XML config file 2019-01-23 14:43:05 +00:00
Warren Buckley
5d34ee271c Forgot to remove my test App_Plugin Dashboard 2019-01-23 14:42:49 +00:00
Warren Buckley
69a3c85bbc Refactor of dashboards 
* Remove dashboards from Configs().Dashboards
* Remove dashboard.config XML file & associated code reading from XML
* Load Dashboards from TypeLoader into a CollectionBuilder
* Load merge/concat C# Dashboard Types with package.manifest
* Add buildercolletion to an extension method on Composition
 2019-01-23 14:37:33 +00:00
Bjarke Berg
70010bc344 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
 2019-01-22 10:19:43 +01:00
Warren Buckley
f6154a38d9 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Web.UI.Client/gulpfile.js
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
 2019-01-21 11:17:14 +00:00
Sebastiaan Janssen
9e7eb2ad75 Remove MySQL support 2019-01-18 15:47:22 +01:00
Shannon
9df1773b78 more cleanup 2019-01-17 17:08:58 +11:00
Stephan
da079cf393 Merge branch 'temp8' into temp8-packages-ui 2019-01-16 10:42:52 +01:00
Stephan
d0016d6a7e Upgrade to MB -alpha.33 supporting elements 2019-01-16 10:40:04 +01:00
Shannon
b34582b35c Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
 2019-01-16 02:00:44 +11:00
Stephan
93ba694106 Upgrade ModelsBuilder (bugfix) 2019-01-15 13:36:30 +01:00
Shannon
430c95dfad Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-15 22:59:49 +11:00
Warren Buckley
a8638f5f43 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-01-14 11:10:58 +00:00
Warren Buckley
fded793f8e Removes the accidently Web.UI.csproj V7 port numbers for IISExpress when merging up from V7 to V8 2019-01-11 13:32:45 +00:00
Warren Buckley
ab565f1d27 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-11 12:18:29 +00:00
Sebastiaan Janssen
dcf2e4830f Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Core/Media/Exif/ImageFile.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
 2019-01-11 10:23:27 +01:00
Sebastiaan Janssen
9e33581391 Merge branch 'patch-7.13.1' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2019-01-11 09:53:50 +01:00
Shannon
687aa8cc99 Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-11 10:37:22 +11:00
Warren Buckley
2e8a6c88a6 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-10 19:18:28 +00:00
Stephan
95ef6cd249 Merge branch 'temp8' into temp8-examine-updates-3920 2019-01-10 15:44:16 +01:00
Stephan
7db3644fcd Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901 2019-01-10 14:04:52 +01:00
Shannon
b8d2309b9c Gets the IPackageBuilder working and tested, now the controller can create and update packages, validation is also working, need to do some more tests for adding other entities , removes more of the old packaging code. 2019-01-10 17:18:47 +11:00
Stephan
49668a48bc Upgrade ModelsBuilder (bugfix) 2019-01-09 15:09:16 +01:00
Sebastiaan Janssen
ff085c97ce Revert "Added eslintignore file" 
This reverts commit 673735c2fe.
 2019-01-09 14:57:17 +01:00
Stephan
39028cd240 Upgrade ModelsBuilder (bugfix) 2019-01-09 14:09:31 +01:00
Warren Buckley
6d808cb121 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-09 10:46:44 +00:00
Shannon
b3414166a6 webforms and legacy file cleanup 2019-01-09 20:43:46 +11:00
Sebastiaan Janssen
0f61de8bcd Bumps version to 7.14.0 2019-01-08 21:49:17 +01:00
Sebastiaan Janssen
5b17072d55 Bump version to 7.13.1 2019-01-08 21:45:34 +01:00
Shannon
801e9da028 Fixes issue with dynamically creating/storing field definitions, latest examine update 2019-01-08 16:37:16 +11:00
Shannon
4a1ae0573f Gets definitions dynamically applied for culture specific fields. 2019-01-08 13:25:07 +11:00
Stephan
a1400d33fd Fixes, version 8.0.0-alpha.58 2019-01-07 19:41:23 +01:00
Shannon
f7c70bde1e Fixing up the PublishedContentQuery.Search implementation 3920 2019-01-07 23:49:29 +11:00
Warren Buckley
9ce35d25d2 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
 2019-01-07 09:59:15 +00:00
Stephan
4fa43abe23 Fix nuspec 2019-01-07 09:46:11 +01:00
Shannon
0356e5a224 Updates to latest examine, fixes issue with rebuilding indexes in the back office seeming to timeout but was a problem with the callback registration in examine 2019-01-07 18:16:06 +11:00
Shannon
118ad5361a Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901 
# Conflicts:
#	src/Umbraco.Examine/UmbracoExamineIndex.cs
 2019-01-07 16:17:58 +11:00
Stephan
2705de5d60 Revert "Temporary downgrade of MB due to missing onlien pkg" 
This reverts commit b8191c3652.
 2019-01-04 11:13:41 +01:00
Lars-Erik Aabech
b8191c3652 Temporary downgrade of MB due to missing onlien pkg 2019-01-03 21:38:56 +01:00
Warren Buckley
baa37549fb Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-03 13:52:14 +00:00
Stephan
a434ac8c74 Upgrade to ModelsBuilder -alpha.26 2019-01-03 09:11:11 +01:00
Stephan
986a7f368f Merge branch 'temp8' into temp8-removes-config-based-indexes-3901 2019-01-02 15:37:20 +01:00
Claus
fb9d5a3c5d Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access 2019-01-02 11:58:24 +01:00
Warren Buckley
4651325d77 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
 2019-01-01 19:08:59 +00:00
Stephan
d0623bc494 Merge branch 'temp8' into temp8-removes-config-based-indexes-3901 2018-12-21 09:25:37 +01:00
Stephan
5286e02f11 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-20 10:19:02 +01:00
Tristan Thompson
2a61d0d988 Remove/Replace ping.aspx 
Remove ping.aspx
Add KeepAliveController to receive ping requests
Update KeepAlive.cs to call new MVC route rather than ping.aspx
 2018-12-19 16:13:23 +01:00
Stephan
fd6a5f60d2 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-19 16:06:35 +01:00
Tristan Thompson
65f7e44338 Remove/Replace endPreview.aspx with MVC endpoint 2018-12-19 15:47:31 +01:00
Thomas Morris
c79f557e94 Remove ClientRedirect.aspx 2018-12-19 15:43:57 +01:00