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

4556 Commits

Author SHA1 Message Date
Stephan
918908a785 Merge branch 'temp8' into temp8-dashboards-collection 2019-01-28 10:35:34 +01:00
Stephan
c2a404c02d Update ModelsBuilder 2019-01-28 10:34:57 +01:00
Warren Buckley
9f79f1833f Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection 
# Conflicts:
#	src/Umbraco.Web/Services/DashboardService.cs
 2019-01-28 08:33:52 +00:00
Sebastiaan Janssen
7e8c0ed369 Apply changes from PR #4197 to v8 too 2019-01-27 15:17:08 +01:00
Chris Houston
0b6ba5aa52 Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148) 2019-01-26 16:52:19 +01:00
Warren Buckley
19d084e086 Localize dashboard tabs with a convention of dashboardsTabs_dashboardAlias as the localization key 2019-01-25 12:11:07 +00:00
Warren Buckley
3e69ceb487 Remove dashboard from web.config 2019-01-24 15:52:56 +00:00
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
26f43cda97 Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection 2019-01-23 14:38:26 +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
Bjarne Fyrstenborg
977423e094 Remove old delete dialog, add new dialog view + set delete button state 2019-01-22 22:57:46 +01:00
Bjarne Fyrstenborg
45735a5529 v8: Add missing localizations (#4199) 2019-01-22 21:57:16 +01:00
Stephan
c1e81fe40c Merge branch 'v8-fix-remove-element-type-template-assignment' of https://github.com/kjac/Umbraco-CMS into temp8-pr4117 2019-01-22 14:22:36 +01:00
Bjarke Berg
c8daf1d8db Merge branch 'temp8-logviewer' into tem8-logviewer-review 2019-01-22 10:20:26 +01: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
Bjarke Berg
025d0eae18 Logviewer code cleanup. 2019-01-22 10:14:07 +01:00
Stephan
c840895f90 Deal with more fixme 2019-01-22 09:49:35 +01:00
Bjarke Berg
2c86e87917 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-22 08:23:07 +01:00
Stephan
0c07af9a41 Merge branch temp8 into temp8-remove-mysql 2019-01-22 08:15:24 +01:00
Stephan
afd6236406 Merge pull request #4164 from umbraco/temp8-broken-view-fixes 
Fixes for broken views..
 2019-01-21 18:55:24 +01:00
Warren Buckley
3af859e020 Updates default log levels that we ship out of the box for V8 - It was a very chatty Verbose, now set to Info 2019-01-21 16:29:59 +00: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
Bjarke Berg
333c143005 GetPropertyValue change to Value 2019-01-21 07:59:05 +01:00
Bjarke Berg
46f7c76c0b Fixes for broken view.. 
- Create new UmbracoHelper (Missing parameter)
- string.replace can't handle string and IHtmlString
 2019-01-21 07:54:35 +01:00
Bjarne Fyrstenborg
a502be606b v8: Fix package localization (#4159) 2019-01-20 21:27:32 +01:00
Bjarne Fyrstenborg
d6855d18f9 v8: Nicer delete language confirm (#4108) 2019-01-20 21:19:06 +01:00
Callum Whyte
da58673b44 Removing unused insertMasterpage dialog language dictionary keys 2019-01-20 20:44:57 +01:00
Sebastiaan Janssen
c56e84af2d Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
 2019-01-20 20:28:52 +01:00
Sebastiaan Janssen
9e7eb2ad75 Remove MySQL support 2019-01-18 15:47:22 +01:00
Stephan
6f9a63d035 Merge branch 'temp8' into temp8-packaging-view-3996 2019-01-18 11:04:28 +01:00
Stephan
07238b54e1 Merge branch 'temp8-tree-sections-no-more-xml' into temp8 2019-01-18 10:59:04 +01:00
Callum Whyte
cee1171d39 Removing masterpages support from V8 (#3971) 2019-01-18 10:53:38 +01:00
Kenn Jacobsen
8f205e7d8f Hide list view config for element types 2019-01-17 20:57:18 +01:00
Nicholas-Westby
cefa2c9040 Typo ("thist"). 2019-01-17 15:34:52 +01:00
Kenn Jacobsen
bcda4c186f Don't allow templates on element types 2019-01-17 12:42:38 +01:00
Shannon
9df1773b78 more cleanup 2019-01-17 17:08:58 +11:00
Shannon
70574b6564 Merge remote-tracking branch 'origin/temp8-packages-ui' into temp8-packaging-view-3996 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
 2019-01-16 23:15:09 +11:00
Shannon
c4418185ec Gets the angular view loading and allows navigating back to the view, cleans up non used lang keys 2019-01-16 21:27:14 +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
Stephan
f56e2f0c72 Merge branch temp8 into temp8-packages-ui 2019-01-16 10:02:43 +01:00
Stephan
26b31f1fc8 Fix Git repository issue with casing of some filepaths 2019-01-16 10:01:04 +01:00
Shannon
90be93d948 Got upgrade status showing in the ui, started implementing merging the package definitions for upgrades but have decided to have an element for each install like we currenlty have in case there are problems installing. 2019-01-16 16:27:51 +11: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
Bjarke Berg
0b9705ca3f Revert "Revert "Support IContentType.IsElement"" 
This reverts commit a5efc25c
 2019-01-15 15:13:10 +01: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
Sebastiaan Janssen
05f1a24caf Fix duplicate IIS Express settings 2019-01-14 08:28:58 +01:00