Skip to content

Commit 6fac76e

Browse files
author
ActiveDbSoft
committed
3.4.3.0
1 parent f781143 commit 6fac76e

File tree

169 files changed

+408
-723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+408
-723
lines changed

‎CookieStorage/CookieStorage.csproj‎

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -64,54 +64,10 @@
6464
<Reference Include="System.Xml" />
6565
<Reference Include="System.Web.Services" />
6666
<Reference Include="System.EnterpriseServices" />
67-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<Private>True</Private>
69-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
70-
</Reference>
7167
<Reference Include="System.Net.Http">
7268
</Reference>
7369
<Reference Include="System.Net.Http.WebRequest">
7470
</Reference>
75-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<Private>True</Private>
77-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
78-
</Reference>
79-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<Private>True</Private>
81-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
82-
</Reference>
83-
<Reference Include="System.Web.Optimization">
84-
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
85-
</Reference>
86-
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<Private>True</Private>
88-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
89-
</Reference>
90-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91-
<Private>True</Private>
92-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
93-
</Reference>
94-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<Private>True</Private>
96-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
97-
</Reference>
98-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99-
<Private>True</Private>
100-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
101-
</Reference>
102-
<Reference Include="WebGrease">
103-
<Private>True</Private>
104-
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
105-
</Reference>
106-
<Reference Include="Antlr3.Runtime">
107-
<Private>True</Private>
108-
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
109-
</Reference>
110-
</ItemGroup>
111-
<ItemGroup>
112-
<Reference Include="Newtonsoft.Json">
113-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
114-
</Reference>
11571
</ItemGroup>
11672
<ItemGroup>
11773
<Compile Include="App_Start\BundleConfig.cs" />
@@ -173,18 +129,17 @@
173129
<Content Include="fonts\glyphicons-halflings-regular.eot" />
174130
</ItemGroup>
175131
<ItemGroup>
176-
<None Include="packages.config" />
177132
<Content Include="Scripts\jquery-1.10.2.min.map" />
178133
</ItemGroup>
179134
<ItemGroup>
180135
<Reference Include="ActiveQueryBuilder.Core">
181-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.12.1120\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
136+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.14.1126\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
182137
</Reference>
183138
<Reference Include="ActiveQueryBuilder.View">
184-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.View.dll</HintPath>
139+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.View.dll</HintPath>
185140
</Reference>
186141
<Reference Include="ActiveQueryBuilder.Web.Server">
187-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
142+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
188143
</Reference>
189144
</ItemGroup>
190145
<PropertyGroup>

‎CookieStorage/Views/Home/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
</div>
4040

4141
@section scripts {
42-
<script src="aqb.client.js"></script>
42+
<script src="/aqb.client.js"></script>
4343

4444
<script>
45-
AQB.Web.UI.QueryBuilder('', $('#qb'), { useDefaultTheme: false });
45+
AQB.Web.UI.QueryBuilder('', $('#qb'));
4646
AQB.Web.UI.ObjectTreeView('', $('#treeview'));
4747
AQB.Web.UI.SubQueryNavigationBar('', $('#navbar'));
4848
AQB.Web.UI.Canvas('', $('#canvas'));

‎CookieStorage/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CookieStorage/packages.config‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎CookieStorage/project.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"dependencies": {
3+
"ActiveQueryBuilder.Core": "3.5.14.1126",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.14.1126",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.14.1126",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.14.1126",
7+
"ActiveQueryBuilder.Web.MVC": "3.4.3",
8+
"Antlr": "3.4.1.9004",
9+
"bootstrap": "3.0.0",
10+
"jQuery": "1.10.2",
11+
"jQuery.Validation": "1.11.1",
12+
"log4net": "2.0.8",
13+
"Microsoft.AspNet.Mvc": "5.2.3",
14+
"Microsoft.AspNet.Razor": "3.2.3",
15+
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16+
"Microsoft.AspNet.WebPages": "3.2.3",
17+
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.3",
18+
"Microsoft.Web.Infrastructure": "1.0.0.0",
19+
"Modernizr": "2.6.2",
20+
"Newtonsoft.Json": "6.0.4",
21+
"Respond": "1.2.0",
22+
"WebGrease": "1.5.2"
23+
},
24+
"frameworks": {
25+
"net461": {}
26+
},
27+
"runtimes": {
28+
"win": {}
29+
}
30+
}

‎CrossDomain/CrossDomain.csproj‎

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -65,50 +65,10 @@
6565
<Reference Include="System.Web" />
6666
<Reference Include="System.Web.Abstractions" />
6767
<Reference Include="System.Web.Extensions" />
68-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
70-
</Reference>
71-
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
73-
</Reference>
74-
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
76-
</Reference>
77-
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
79-
</Reference>
80-
<Reference Include="System.Web.Routing" />
81-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
83-
</Reference>
84-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
86-
</Reference>
87-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
89-
</Reference>
9068
<Reference Include="System.Xml" />
9169
<Reference Include="System.Configuration" />
9270
<Reference Include="System.Web.Services" />
9371
<Reference Include="System.EnterpriseServices" />
94-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<Private>True</Private>
96-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
97-
</Reference>
98-
<Reference Include="System.Xml.Linq" />
99-
<Reference Include="WebGrease">
100-
<Private>True</Private>
101-
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
102-
</Reference>
103-
<Reference Include="Antlr3.Runtime">
104-
<Private>True</Private>
105-
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
106-
</Reference>
107-
</ItemGroup>
108-
<ItemGroup>
109-
<Reference Include="Newtonsoft.Json">
110-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
111-
</Reference>
11272
</ItemGroup>
11373
<ItemGroup>
11474
<Compile Include="App_Start\BundleConfig.cs" />
@@ -181,15 +141,14 @@
181141
<Content Include="fonts\glyphicons-halflings-regular.eot" />
182142
</ItemGroup>
183143
<ItemGroup>
184-
<None Include="packages.config" />
185144
<Content Include="Scripts\jquery-1.10.2.min.map" />
186145
</ItemGroup>
187146
<ItemGroup>
188147
<Reference Include="ActiveQueryBuilder.Core">
189-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.12.1120\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
148+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.14.1126\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
190149
</Reference>
191150
<Reference Include="ActiveQueryBuilder.Web.Server">
192-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
151+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
193152
</Reference>
194153
</ItemGroup>
195154
<PropertyGroup>

‎CrossDomain/FrontEnd/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CrossDomain/FrontEnd/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ <h1>Cross-domain QueryBuilder Request Demo</h1>
124124
localStorage.setItem('queryBuilderToken', token);
125125
}
126126

127-
AQB.Web.UI.QueryBuilder(instanceId, $('#qb'), { useDefaultTheme: false });
127+
AQB.Web.UI.QueryBuilder(instanceId, $('#qb'));
128128
AQB.Web.UI.ObjectTreeView(instanceId, $('#treeview'));
129129
AQB.Web.UI.SubQueryNavigationBar(instanceId, $('#navbar'));
130130
AQB.Web.UI.Canvas(instanceId, $('#canvas'));

‎CrossDomain/Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Sample of the XML file metadata specification:
1010

1111
<aspQueryBuilder>
1212
<syntaxProvider type="ActiveQueryBuilder.Core.MySQLSyntaxProvider, ActiveQueryBuilder.Core" />
13-
<metadataSource xml="C:\Parh\To\YourMetadataFile"></metadataSource>
13+
<metadataSource xml="C:\Path\To\YourMetadataFile"></metadataSource>
1414
</aspQueryBuilder>
1515

1616
*Note* that the path to the XML file must be **absolute**.

‎CrossDomain/packages.config‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)