Shannon
|
82820284f3
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10
# Conflicts:
# src/Umbraco.Web/Features/DisabledFeatures.cs
# src/Umbraco.Web/Features/EnabledFeatures.cs
|
2018-03-16 14:30:55 +11:00 |
|
Shannon
|
3e2fa64820
|
Changes the Preview Index.cshtml to use a real model instead of viewdata, adds the correct razor web.config for these preview views, changes the enabled feature to be able to inject a razor view instead of strings
|
2018-03-14 13:56:49 +11:00 |
|
Shannon
|
509d27f93b
|
Merge branch 'dev-v7.10' into temp-UAASSCRUM-1405
# Conflicts:
# src/Umbraco.Web/Features/EnabledFeatures.cs
|
2018-03-14 13:38:25 +11:00 |
|
Shannon
|
f42b122e73
|
adding missing files
|
2018-03-14 13:35:51 +11:00 |
|
Shannon
|
171e0d87db
|
Updates some of the variable names, removes the EnabledFeatures since we don't really need that
|
2018-03-13 14:31:30 +11:00 |
|
Claus
|
52684b6189
|
allowing to extend html used in preview view.
|
2018-02-28 13:41:49 +01:00 |
|
Claus
|
c1cfea7ebd
|
removing constructor.
|
2018-02-12 11:12:46 +01:00 |
|
Claus
|
633d1bb0ae
|
changing the template check to an enabled check instead.
|
2018-02-09 13:19:56 +01:00 |
|