Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

Commit

Permalink
Merge pull request #22 from Azure/mergeazxp
Browse files Browse the repository at this point in the history
Features and bug fixes:
- SE ordering
- SE info policies update
- Dyn Enc / PR / Token bug fix
- AME Adv mode: reordering of assets and files
- MP grid refresh
- Auto version check
- File name check for Indexer
  • Loading branch information
xpouyat committed Oct 16, 2014
2 parents f6bc3c8 + 362dd7a commit 2e5362d
Show file tree
Hide file tree
Showing 51 changed files with 2,117 additions and 950 deletions.
26 changes: 16 additions & 10 deletions AMSExplorer/AMSExplorer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,17 @@
<Compile Include="AMSLogin.Designer.cs">
<DependentUpon>AMSLogin.cs</DependentUpon>
</Compile>
<Compile Include="BathUploadFrame2.cs">
<Compile Include="BatchUploadFrame2.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BathUploadFrame2.Designer.cs">
<DependentUpon>BathUploadFrame2.cs</DependentUpon>
<Compile Include="BatchUploadFrame2.Designer.cs">
<DependentUpon>BatchUploadFrame2.cs</DependentUpon>
</Compile>
<Compile Include="BathUploadFrame1.cs">
<Compile Include="BatchUploadFrame1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BathUploadFrame1.Designer.cs">
<DependentUpon>BathUploadFrame1.cs</DependentUpon>
<Compile Include="BatchUploadFrame1.Designer.cs">
<DependentUpon>BatchUploadFrame1.cs</DependentUpon>
</Compile>
<Compile Include="Bitmaps.Designer.cs">
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -348,11 +348,11 @@
<EmbeddedResource Include="AMSLogin.resx">
<DependentUpon>AMSLogin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BathUploadFrame2.resx">
<DependentUpon>BathUploadFrame2.cs</DependentUpon>
<EmbeddedResource Include="BatchUploadFrame2.resx">
<DependentUpon>BatchUploadFrame2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BathUploadFrame1.resx">
<DependentUpon>BathUploadFrame1.cs</DependentUpon>
<EmbeddedResource Include="BatchUploadFrame1.resx">
<DependentUpon>BatchUploadFrame1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Bitmaps.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down Expand Up @@ -448,6 +448,12 @@
<Content Include="BitmapsPNG\modetaskjob2.png" />
<Content Include="BitmapsPNG\modetaskjob3.png" />
<Content Include="BitmapsPNG\xenio.png" />
<Content Include="Configurations\CrossDomainPolicy.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configurations\ClientAccessPolicy.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configurations\MediaIndexer.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
19 changes: 18 additions & 1 deletion AMSExplorer/AMSLogin.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
using System;
//-----------------------------------------------------------------------
// <copyright file="AMSLogin.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright>
// <license>
// Azure Media Services Explorer Ver. 3.0
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </license>

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
Expand Down
19 changes: 18 additions & 1 deletion AMSExplorer/AboutBox.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
using System;
//-----------------------------------------------------------------------
// <copyright file="AboutBox.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright>
// <license>
// Azure Media Services Explorer Ver. 3.0
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </license>

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
Expand Down
19 changes: 18 additions & 1 deletion AMSExplorer/AddDynamicEncryption.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
using System;
//-----------------------------------------------------------------------
// <copyright file="AddDynamicEncryption.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright>
// <license>
// Azure Media Services Explorer Ver. 3.0
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </license>

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
Expand Down
62 changes: 51 additions & 11 deletions AMSExplorer/AssetInformation.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2e5362d

Please sign in to comment.