浏览代码

Small changes and updates.

KrisVos130 9 年之前
父节点
当前提交
e3554e2f75
共有 3 个文件被更改,包括 22 次插入22 次删除
  1. 1 1
      app/.meteor/release
  2. 20 20
      app/.meteor/versions
  3. 1 1
      app/app.js

+ 1 - 1
app/.meteor/release

@@ -1 +1 @@
-METEOR@1.2.0.2
+METEOR@1.2.1

+ 20 - 20
app/.meteor/versions

@@ -1,10 +1,10 @@
-accounts-base@1.2.1
+accounts-base@1.2.2
 accounts-facebook@1.0.6
 accounts-facebook@1.0.6
 accounts-github@1.0.6
 accounts-github@1.0.6
-accounts-oauth@1.1.7
-accounts-password@1.1.3
+accounts-oauth@1.1.8
+accounts-password@1.1.4
 altapp:recaptcha@2.0.0
 altapp:recaptcha@2.0.0
-autoupdate@1.2.3
+autoupdate@1.2.4
 babel-compiler@5.8.24_1
 babel-compiler@5.8.24_1
 babel-runtime@0.1.4
 babel-runtime@0.1.4
 base64@1.0.4
 base64@1.0.4
@@ -16,20 +16,20 @@ boilerplate-generator@1.0.4
 caching-compiler@1.0.0
 caching-compiler@1.0.0
 caching-html-compiler@1.0.2
 caching-html-compiler@1.0.2
 callback-hook@1.0.4
 callback-hook@1.0.4
-check@1.0.6
-coffeescript@1.0.10
+check@1.1.0
+coffeescript@1.0.11
 ddp@1.2.2
 ddp@1.2.2
 ddp-client@1.2.1
 ddp-client@1.2.1
-ddp-common@1.2.1
+ddp-common@1.2.2
 ddp-rate-limiter@1.0.0
 ddp-rate-limiter@1.0.0
-ddp-server@1.2.1
+ddp-server@1.2.2
 deps@1.0.9
 deps@1.0.9
 diff-sequence@1.0.1
 diff-sequence@1.0.1
-ecmascript@0.1.5
-ecmascript-collections@0.1.6
+ecmascript@0.1.6
+ecmascript-runtime@0.2.6
 ejson@1.0.7
 ejson@1.0.7
-email@1.0.7
-es5-shim@4.1.13
+email@1.0.8
+es5-shim@4.1.14
 facebook@1.2.2
 facebook@1.2.2
 fastclick@1.0.7
 fastclick@1.0.7
 geojson-utils@1.0.4
 geojson-utils@1.0.4
@@ -54,7 +54,7 @@ launch-screen@1.0.4
 livedata@1.0.15
 livedata@1.0.15
 localstorage@1.0.5
 localstorage@1.0.5
 logging@1.0.8
 logging@1.0.8
-meteor@1.1.9
+meteor@1.1.10
 meteor-base@1.0.1
 meteor-base@1.0.1
 meteorhacks:async@1.0.0
 meteorhacks:async@1.0.0
 minifiers@1.1.7
 minifiers@1.1.7
@@ -62,7 +62,7 @@ minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
 mobile-status-bar@1.0.6
 momentjs:moment@2.10.6
 momentjs:moment@2.10.6
-mongo@1.1.2
+mongo@1.1.3
 mongo-id@1.0.1
 mongo-id@1.0.1
 npm-bcrypt@0.7.8_2
 npm-bcrypt@0.7.8_2
 npm-mongo@1.4.39_1
 npm-mongo@1.4.39_1
@@ -70,10 +70,10 @@ oauth@1.1.6
 oauth2@1.1.5
 oauth2@1.1.5
 observe-sequence@1.0.7
 observe-sequence@1.0.7
 ordered-dict@1.0.4
 ordered-dict@1.0.4
-promise@0.5.0
-random@1.0.4
+promise@0.5.1
+random@1.0.5
 rate-limit@1.0.0
 rate-limit@1.0.0
-reactive-dict@1.1.2
+reactive-dict@1.1.3
 reactive-var@1.0.6
 reactive-var@1.0.6
 reload@1.1.4
 reload@1.1.4
 retry@1.0.4
 retry@1.0.4
@@ -84,15 +84,15 @@ sha@1.0.4
 spacebars@1.0.7
 spacebars@1.0.7
 spacebars-compiler@1.0.7
 spacebars-compiler@1.0.7
 srp@1.0.4
 srp@1.0.4
-standard-minifiers@1.0.1
-templating@1.1.4
+standard-minifiers@1.0.2
+templating@1.1.5
 templating-tools@1.0.0
 templating-tools@1.0.0
 tracker@1.0.9
 tracker@1.0.9
 twbs:bootstrap@3.3.5
 twbs:bootstrap@3.3.5
 ui@1.0.8
 ui@1.0.8
 underscore@1.0.4
 underscore@1.0.4
 url@1.0.5
 url@1.0.5
-webapp@1.2.2
+webapp@1.2.3
 webapp-hashing@1.0.5
 webapp-hashing@1.0.5
 zimme:active-route@2.0.4_1
 zimme:active-route@2.0.4_1
 zimme:iron-router-active@2.0.1
 zimme:iron-router-active@2.0.1

+ 1 - 1
app/app.js

@@ -959,7 +959,7 @@ if (Meteor.isServer) {
                 }
                 }
             });
             });
         } else {
         } else {
-            throw "Room already exists";
+            return "Room already exists";
         }
         }
     }
     }