lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merged branch '1.9.x' into dev.

Browse Source
This commit is contained in:
Daniel Stolt
2015-07-26 01:28:38 +01:00
parent 5420a038ba 6da6c5c214
commit f023f66d63
269 changed files with 13071 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
View File

@@ -79,34 +79,28 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Content Include="gulpfile.js" />
<None Include="Assets\CSS\DynamicForms-Admin.css" />
<None Include="Assets\CSS\DynamicForms.css" />
<Content Include="Scripts\LayoutEditor.js" />
<Content Include="Scripts\LayoutEditor.min.js" />
<Content Include="Scripts\LayoutEditor\Directives\Fieldset.js" />
<Content Include="Scripts\LayoutEditor\Directives\Form.js" />
<Content Include="Scripts\LayoutEditor\Models\Fieldset.js" />
<Content Include="Scripts\LayoutEditor\Models\Form.js" />
<None Include="Assets\JavaScript\LayoutEditor\Directives\Fieldset.js" />
<None Include="Assets\JavaScript\LayoutEditor\Directives\Form.js" />
<None Include="Assets\JavaScript\LayoutEditor\Models\Fieldset.js" />
<None Include="Assets\JavaScript\LayoutEditor\Models\Form.js" />
<Content Include="Scripts\Lib.js" />
<Content Include="Scripts\Lib.min.js" />
<Content Include="Scripts\Lib\jquery.validate.js" />
<Content Include="Scripts\Lib\jquery.validate.min.js">
<DependentUpon>jquery.validate.js</DependentUpon>
</Content>
<Content Include="Scripts\Lib\jquery.validate.unobtrusive.additional.js" />
<Content Include="Scripts\Lib\jquery.validate.unobtrusive.js" />
<Content Include="Scripts\Lib\jquery.validate.unobtrusive.min.js">
<DependentUpon>jquery.validate.unobtrusive.js</DependentUpon>
</Content>
<Content Include="Styles\forms-admin.min.css" />
<Content Include="Styles\forms.css" />
<Content Include="Styles\forms-admin.css" />
<Content Include="Styles\forms.min.css" />
<None Include="Assets\JavaScript\Lib\jquery.validate.js" />
<None Include="Assets\JavaScript\Lib\jquery.validate.unobtrusive.additional.js" />
<None Include="Assets\JavaScript\Lib\jquery.validate.unobtrusive.js" />
<Content Include="Styles\DynamicForms-Admin.css" />
<Content Include="Styles\DynamicForms-Admin.min.css" />
<Content Include="Styles\DynamicForms.css" />
<Content Include="Styles\DynamicForms.min.css" />
<Content Include="Styles\menu.dynamicforms-admin.css" />
<Content Include="Styles\menu.dynamicforms-admin.min.css" />
<Content Include="Styles\menu.dynamicforms.png" />
<Content Include="Styles\workflows-activity-dynamic-form-validating.css" />
<Content Include="Styles\workflows-activity-dynamic-form-submitted.css" />
<Content Include="Styles\workflows-activity-add-model-error.css" />
<Content Include="Styles\workflows-activity-dynamic-form-submitted.css" />
<Content Include="Styles\workflows-activity-dynamic-form-validating.css" />
<Content Include="Web.config" />
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />
@@ -461,16 +455,6 @@
<ItemGroup>
<Content Include="Views\Elements\ReCaptcha.Design.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Scripts\Lib\jquery.validate.min.js.map">
<DependentUpon>jquery.validate.min.js</DependentUpon>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Scripts\Lib\jquery.validate.unobtrusive.min.js.map">
<DependentUpon>jquery.validate.unobtrusive.min.js</DependentUpon>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Views\LayoutEditor.Template.Form.cshtml" />
</ItemGroup>
@@ -516,20 +500,21 @@
<ItemGroup>
<Content Include="Views\LayoutEditor.Template.Fieldset.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="package.json" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Elements\Button.Design.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Elements\Label.Design.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets.json" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.