Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 8e876b3

Browse files
committed
Merge branch 'master' of https://github.com/ServiceStack/Admin
2 parents fdfa063 + a2902a5 commit 8e876b3

22 files changed

+21
-787
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -238,3 +238,5 @@ _Pvt_Extensions
238238

239239
# FAKE - F# Make
240240
.fake/
241+
src/ServiceStack.Admin.WebHost/src/*.map
242+
src/ServiceStack.Admin.WebHost/src/*.js

README.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -303,4 +303,20 @@ Other classes worth reviewing is the
303303
[StackOverflowTasks.cs](https://github.com/ServiceStack/Admin/blob/master/tests/Admin.Tasks/StackOverflowTasks.cs)
304304
containing the NUnit tests used to create the test sqlite database on-the-fly, directly from the GitHub and
305305
StackOverflow JSON APIs, the ease of which speaks to the simplicity of
306-
[ServiceStack's code-first POCO approach](http://stackoverflow.com/a/32940275/85785).
306+
[ServiceStack's code-first POCO approach](http://stackoverflow.com/a/32940275/85785).
307+
308+
## Building this solution
309+
310+
This project is based on jspm as said earlier. You can install this through nodeJS:
311+
312+
1. open command line in `src\ServiceStack.Admin.WebHost`
313+
2. run command `npm install jspm -g` to install jspm
314+
3. run command `jspm init` do boot up jspm
315+
4. run command `jspm install` to download all packages
316+
317+
Now open the project solution:
318+
319+
1. Restore all the nuget packages.
320+
2. Set ServiceStack.Admin.WebHost as startup project
321+
3. Run Solution
322+

src/ServiceStack.Admin.WebHost/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ System.config({
124124
"process": "github:jspm/[email protected]"
125125
},
126126
127-
"jquery": "npm:jquery@2.2.0"
127+
"jquery": "npm:jquery@3.1.1"
128128
},
129129
130130
"events": "github:jspm/[email protected]",

src/ServiceStack.Admin.WebHost/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"jspm": {
33
"dependencies": {
44
"es6-shim": "github:es-shims/es6-shim@^0.34.4",
5-
"jquery": "npm:jquery@^2.2.0",
5+
"jquery": "npm:jquery@^3.1.1",
66
"react": "npm:react@^0.14.7",
77
"react-dom": "npm:react-dom@^0.14.7",
88
"react-redux": "npm:react-redux@^4.4.0",

src/ServiceStack.Admin.WebHost/src/AutoQuery.js

-221
This file was deleted.

0 commit comments

Comments
 (0)