Permalink
Browse files

merged changes from MicrosoftWebMatrix

  • Loading branch information...
2 parents 29ea8ac + 23730ff commit 16f934efa41594b2fca8fbb1a0d02cbb91fdc6fc @JustinBeckwith committed Oct 2, 2012
Showing with 13,570 additions and 174 deletions.
  1. +1 −0 .gitignore
  2. BIN favicon.ico
  3. +198 −0 npm-shrinkwrap.json
  4. +8 −9 package.json
  5. BIN public/favicon.ico
  6. BIN public/images/NuGetGallery.png
  7. BIN public/images/aspNetHome.png
  8. BIN public/images/findHosting.png
  9. BIN public/images/npm.png
  10. +1,265 −0 public/javascripts/modernizr.js
  11. BIN public/jquery-mobile/images/ajax-loader.gif
  12. BIN public/jquery-mobile/images/ajax-loader.png
  13. BIN public/jquery-mobile/images/icons-18-black.png
  14. BIN public/jquery-mobile/images/icons-18-white.png
  15. BIN public/jquery-mobile/images/icons-36-black.png
  16. BIN public/jquery-mobile/images/icons-36-white.png
  17. +3 −1 public/jquery-mobile/{jquery.mobile-1.0rc3.css → jquery.mobile-1.0.css}
  18. +22 −8 public/jquery-mobile/{jquery.mobile-1.0rc3.js → jquery.mobile-1.0.js}
  19. +2 −2 public/jquery-mobile/{jquery.mobile-1.0rc3.min.css → jquery.mobile-1.0.min.css}
  20. +62 −61 public/jquery-mobile/{jquery.mobile-1.0rc3.min.js → jquery.mobile-1.0.min.js}
  21. +0 −1 public/jquery-mobile/jquery.mobile-1.0rc3.structure.min.css
  22. +2,053 −0 public/jquery-mobile/jquery.mobile-1.1.0.css
  23. +7,551 −0 public/jquery-mobile/jquery.mobile-1.1.0.js
  24. +2 −0 public/jquery-mobile/jquery.mobile-1.1.0.min.css
  25. +177 −0 public/jquery-mobile/jquery.mobile-1.1.0.min.js
  26. +3 −1 public/jquery-mobile/{jquery.mobile.structure-1.0rc3.css → jquery.mobile.structure-1.0.css}
  27. +2 −1 public/jquery-mobile/{jquery.mobile.structure-1.0rc3.min.css → jquery.mobile.structure-1.0.min.css}
  28. +946 −0 public/jquery-mobile/jquery.mobile.structure-1.1.0.css
  29. +2 −0 public/jquery-mobile/jquery.mobile.structure-1.1.0.min.css
  30. +1,167 −0 public/jquery-mobile/jquery.mobile.theme-1.1.0.css
  31. +2 −0 public/jquery-mobile/jquery.mobile.theme-1.1.0.min.css
  32. +5 −0 public/robots.txt
  33. +33 −16 public/stylesheets/style.css
  34. +1 −1 public/stylesheets/style.less
  35. +4 −4 readme.md
  36. +1 −0 routes/global.js
  37. +2 −1 server.js
  38. +1 −1 settings.example.json
  39. +11 −12 views/account/login.jade
  40. +7 −2 views/account/register.jade
  41. +1 −1 views/chat.jade
  42. +19 −28 views/index.jade
  43. +7 −5 views/layout.jade
  44. +5 −6 views/layout_mobile.jade
  45. +7 −13 web.config
View
@@ -2,3 +2,4 @@ node_modules
server.js.logs
server.js.debug
settings.json
+iisnode
View
Binary file not shown.
View
@@ -0,0 +1,198 @@
+{
+ "name": "WebMatrixExpressStarter",
+ "version": "0.1.0",
+ "dependencies": {
+ "everyauth": {
+ "version": "0.2.29",
+ "dependencies": {
+ "oauth": {
+ "version": "0.9.8"
+ },
+ "restler": {
+ "version": "2.0.1"
+ },
+ "request": {
+ "version": "2.11.1",
+ "dependencies": {
+ "form-data": {
+ "version": "0.0.3",
+ "dependencies": {
+ "combined-stream": {
+ "version": "0.0.3",
+ "dependencies": {
+ "delayed-stream": {
+ "version": "0.0.5"
+ }
+ }
+ },
+ "async": {
+ "version": "0.1.9"
+ }
+ }
+ },
+ "mime": {
+ "version": "1.2.7"
+ }
+ }
+ },
+ "connect": {
+ "version": "1.9.2",
+ "dependencies": {
+ "qs": {
+ "version": "0.5.0"
+ },
+ "mime": {
+ "version": "1.2.7"
+ },
+ "formidable": {
+ "version": "1.0.11"
+ }
+ }
+ },
+ "openid": {
+ "version": "0.4.2"
+ },
+ "xml2js": {
+ "version": "0.2.0",
+ "dependencies": {
+ "sax": {
+ "version": "0.4.2"
+ }
+ }
+ },
+ "node-swt": {
+ "version": "0.1.1"
+ },
+ "node-wsfederation": {
+ "version": "0.1.1"
+ }
+ }
+ },
+ "nconf": {
+ "version": "0.5.1",
+ "dependencies": {
+ "async": {
+ "version": "0.1.22"
+ },
+ "ini": {
+ "version": "1.0.4"
+ },
+ "optimist": {
+ "version": "0.3.4",
+ "dependencies": {
+ "wordwrap": {
+ "version": "0.0.2"
+ }
+ }
+ },
+ "pkginfo": {
+ "version": "0.2.3"
+ }
+ }
+ },
+ "express": {
+ "version": "2.5.9",
+ "dependencies": {
+ "connect": {
+ "version": "1.9.2",
+ "dependencies": {
+ "formidable": {
+ "version": "1.0.11"
+ }
+ }
+ },
+ "mime": {
+ "version": "1.2.4"
+ },
+ "qs": {
+ "version": "0.4.2"
+ },
+ "mkdirp": {
+ "version": "0.3.0"
+ }
+ }
+ },
+ "jade": {
+ "version": "0.26.3",
+ "dependencies": {
+ "commander": {
+ "version": "0.6.1"
+ },
+ "mkdirp": {
+ "version": "0.3.0"
+ }
+ }
+ },
+ "less": {
+ "version": "1.3.0"
+ },
+ "socket.io": {
+ "version": "0.9.0",
+ "dependencies": {
+ "socket.io-client": {
+ "version": "0.9.0",
+ "dependencies": {
+ "uglify-js": {
+ "version": "1.2.5"
+ },
+ "ws": {
+ "version": "0.4.0",
+ "dependencies": {
+ "commander": {
+ "version": "0.5.0"
+ },
+ "options": {
+ "version": "0.0.3"
+ }
+ }
+ },
+ "xmlhttprequest": {
+ "version": "1.2.2"
+ }
+ }
+ },
+ "policyfile": {
+ "version": "0.0.4"
+ },
+ "redis": {
+ "version": "0.6.7"
+ }
+ }
+ },
+ "connect": {
+ "version": "2.3.5",
+ "dependencies": {
+ "qs": {
+ "version": "0.4.2"
+ },
+ "mime": {
+ "version": "1.2.4"
+ },
+ "formidable": {
+ "version": "1.0.11"
+ },
+ "crc": {
+ "version": "0.2.0"
+ },
+ "cookie": {
+ "version": "0.0.4"
+ },
+ "fresh": {
+ "version": "0.0.1"
+ },
+ "bytes": {
+ "version": "0.0.1"
+ },
+ "range-parser": {
+ "version": "0.0.4"
+ },
+ "debug": {
+ "version": "0.7.0"
+ }
+ }
+ },
+ "recaptcha": {
+ "version": "1.1.0"
+ }
+ }
+}
View
@@ -20,15 +20,14 @@
"express"
],
"dependencies" : {
- "node-uuid": ">= 1.3.3",
- "everyauth": ">= 0.2.29",
- "nconf": ">= 0.5.1",
- "express": ">= 2.5.0",
- "jade": ">= 0.18.0",
- "less": ">= 1.1.5",
- "socket.io": ">= 0.8.7",
- "connect": ">=1.8.5",
- "recaptcha": ">=1.1.0"
+ "everyauth": "0.2.29",
+ "nconf": "0.5.1",
+ "express": "2.5.9",
+ "jade": "0.26.3",
+ "less": "1.3.0",
+ "socket.io": "0.9.0",
+ "connect": "2.3.5",
+ "recaptcha": "1.1.0"
},
"noAnalyze": true,
"license": "Apache",
View
Binary file not shown.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
View
Deleted file not rendered
Oops, something went wrong. Retry.

0 comments on commit 16f934e

Please sign in to comment.