Skip to content

Commit

Permalink
Changed version
Browse files Browse the repository at this point in the history
  • Loading branch information
eduwardpost committed Jan 6, 2024
1 parent 6d34ac3 commit 1590270
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'use strict';

function dashboardController($controller,
$scope, $timeout, navigationService, eventsService, uSync8DashboardService) {
$scope, $timeout, navigationService, eventsService) {

var vm = this;

Expand Down Expand Up @@ -41,44 +41,6 @@
$timeout(function () {
navigationService.syncTree({ tree: "uActivityPub", path: "-1" });
});

uSync8DashboardService.getAddOns()
.then(function (result) {

vm.version = 'v' + result.data.version;
if (result.data.addOnString.length > 0) {
vm.version += ' + ' + result.data.addOnString;
}

vm.page.description = vm.version;
vm.addOns = result.data.addOns;

var insertOffset = 1;
if (vm.version.indexOf('Complete') == -1) {
insertOffset = 2;
vm.page.navigation.push(
{
'name': 'Add ons',
'alias': 'expansion',
'icon': 'icon-box',
'view': _settingsFolder + '/expansion.html'
});
}

vm.addOns.forEach(function (value, key) {
if (value.view !== '') {
vm.page.navigation.splice(vm.page.navigation.length - insertOffset, 0,
{
'name': value.displayName,
'alias': value.alias,
'icon': value.icon,
'view': value.view
});
}
});

vm.page.navigation[0].active = true;
});
}

angular.module('umbraco')
Expand Down
1 change: 0 additions & 1 deletion uActivityPub/build/uActivityPub.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
<uSyncPackageFolder Include="$(MSBuildProjectDirectory)\App_Plugins\uActivityPub\" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion uActivityPub/uActivityPub.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void Filter(List<PackageManifest> manifests)
],
// Stylesheets = new[]
// {
// $"{uSyncConstants.Package.PluginPath}/usync.{version}.min.css"
// $"{uSyncConstants.Package.PluginPath}/uactivitypub.{version}.min.css"
// }
});
}
Expand Down
13 changes: 7 additions & 6 deletions uActivityPub/uActivityPub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<PackageReadmeFile>README.md</PackageReadmeFile>
<Product>uActivityPub</Product>
<PackageId>uActivityPub</PackageId>
<Version>1.0.9</Version>
<AssemblyVersion>1.0.9</AssemblyVersion>
<Version>1.0.10</Version>
<AssemblyVersion>1.0.10</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand All @@ -45,8 +45,9 @@
<PackageReference Include="Umbraco.Cms.Web.Common" Version="13.0.3" />
</ItemGroup>

<!-- <ItemGroup>-->
<!-- <Content Include="App_Plugins\uActivityPub\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="Always" />-->
<!-- </ItemGroup>-->

<ItemGroup>
<Content Include="App_Plugins\uActivityPub\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="Always" CopyToOutputDirectory="PreserveNewest" />
<None Include="build\**" Pack="true" PackagePath="buildTransitive" />
</ItemGroup>

</Project>

0 comments on commit 1590270

Please sign in to comment.