Skip to content

Commit

Permalink
Merge pull request #67 from leekelleher/dev/v1.1.3
Browse files Browse the repository at this point in the history
Preparing v1.1.3 release
  • Loading branch information
leekelleher authored Dec 30, 2020
2 parents 6f532cc + 5811295 commit 2f04352
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.2
1.1.3
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
- file, You can obtain one at https://mozilla.org/MPL/2.0/. -->

<div class="umb-contentpicker umb-readonlyvalue">
<umb-node-preview name="model.value.name" description="model.value.description" icon="model.value.icon" />
<umb-node-preview name="model.value.name" description="model.value.description" icon="model.value.icon"></umb-node-preview>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="umb-rte row-fluid span8" ng-if="vm.loading === true">
<umb-load-indicator></umb-load-indicator>
</div>
<div ng-if="!vm.loading && !vm.html && !vm.error"><lee-was-here /></div>
<div ng-if="!vm.loading && !vm.html && !vm.error"><lee-was-here></lee-was-here></div>
<div ng-bind-html="vm.html | safe_html" ng-if="vm.loading === false && vm.html"></div>
<div class="well umb-contentpicker__min-max-help" ng-if="vm.loading === false && vm.error">
<h5 ng-bind="vm.error.title"></h5>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Community.Contentment/Properties/VersionInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Reflection;

[assembly: AssemblyVersion("1.1")]
[assembly: AssemblyFileVersion("1.1.2")]
[assembly: AssemblyInformationalVersion("1.1.2-develop")]
[assembly: AssemblyFileVersion("1.1.3")]
[assembly: AssemblyInformationalVersion("1.1.3-develop")]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="umb-panel-header-name" ng-bind="vm.title"></div>
<div class="umb-panel-header-locked-description" ng-bind="vm.version"></div>
</div>
<div style="padding: 0 20px"><lee-was-here /></div>
<div style="padding: 0 20px"><lee-was-here></lee-was-here></div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<h5 ng-bind="vm.populate(item, $index, 'name')"></h5>
</div>
<div class="lk-content-blocks__preview--markup" ng-if="vm.previews[item.key]">
<umb-load-indicator ng-show="vm.previews[item.key].loading" />
<umb-load-indicator ng-show="vm.previews[item.key].loading"></umb-load-indicator>
<div ng-bind-html="vm.previews[item.key].markup | safe_html"></div>
</div>
</div>
Expand Down

0 comments on commit 2f04352

Please sign in to comment.