diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 61ee31323..dacc2c0d7 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -10,3 +10,4 @@ notices-for-facebook-graph-api-2 1.2.0-meteor-platform-split 1.2.0-cordova-changes 1.2.0-breaking-changes +1.3.0-split-minifiers-package diff --git a/.meteor/packages b/.meteor/packages index b86c0480e..6160241d0 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -30,16 +30,13 @@ nova:base-styles nova:api nova:rss nova:kadira +nova:email +nova-demo # nova:migrations -# nova:email -# nova:embedly # nova:invites # nova:post-by-feed -# nova:prerender -# nova:releases # nova:subscribe-to-posts -# nova-demo ############ Custom Packages ############ diff --git a/.meteor/release b/.meteor/release index 191978480..ef5046bd0 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.3 \ No newline at end of file +METEOR@1.3.1 diff --git a/.meteor/versions b/.meteor/versions index 05e309887..c0bbfbc93 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,89 +1,91 @@ -accounts-base@1.2.4 -accounts-oauth@1.1.10 -accounts-password@1.1.6 -accounts-twitter@1.0.7 +accounts-base@1.2.5 +accounts-oauth@1.1.11 +accounts-password@1.1.7 +accounts-twitter@1.0.8 aldeed:collection2@2.9.1 aldeed:collection2-core@1.1.1 aldeed:schema-deny@1.0.1 aldeed:schema-index@1.0.1 aldeed:simple-schema@1.5.3 -allow-deny@1.0.2 +allow-deny@1.0.3 arillo:flow-router-helpers@0.5.1 -autoupdate@1.2.6 -babel-compiler@6.5.2 -babel-runtime@0.1.6 -base64@1.0.6 -binary-heap@1.0.6 -blaze@2.1.5 -blaze-html-templates@1.0.2 -blaze-tools@1.0.6 -boilerplate-generator@1.0.6 -caching-compiler@1.0.2 -caching-html-compiler@1.0.4 -callback-hook@1.0.6 -cfs:http-methods@0.0.30 -check@1.1.2 +autoupdate@1.2.7 +babel-compiler@6.6.1 +babel-runtime@0.1.7 +base64@1.0.7 +binary-heap@1.0.7 +blaze@2.1.6 +blaze-html-templates@1.0.3 +blaze-tools@1.0.7 +boilerplate-generator@1.0.7 +caching-compiler@1.0.3 +caching-html-compiler@1.0.5 +callback-hook@1.0.7 +cfs:http-methods@0.0.32 +check@1.1.3 chuangbo:cookie@1.1.0 chuangbo:marked@0.3.5_1 -coffeescript@1.0.15 -cosmos:browserify@0.8.4 +coffeescript@1.0.16 +cosmos:browserify@0.10.0 dburles:collection-helpers@1.0.4 dburles:spacebars-tohtml@1.0.1 -ddp@1.2.3 -ddp-client@1.2.3 -ddp-common@1.2.3 -ddp-rate-limiter@1.0.2 -ddp-server@1.2.4 -deps@1.0.10 -diff-sequence@1.0.3 +ddp@1.2.4 +ddp-client@1.2.4 +ddp-common@1.2.4 +ddp-rate-limiter@1.0.3 +ddp-server@1.2.5 +deps@1.0.11 +diff-sequence@1.0.4 djedi:sanitize-html@1.11.3 -ecmascript@0.4.1 -ecmascript-runtime@0.2.8 -ejson@1.0.9 -email@1.0.10 -es5-shim@4.5.8 +ecmascript@0.4.2 +ecmascript-runtime@0.2.9 +ejson@1.0.10 +email@1.0.11 +es5-shim@4.5.9 fortawesome:fontawesome@4.5.0 fourseven:scss@3.4.1 -geojson-utils@1.0.6 -hot-code-push@1.0.2 -html-tools@1.0.7 -htmljs@1.0.7 -http@1.1.3 -id-map@1.0.5 +geojson-utils@1.0.7 +hot-code-push@1.0.3 +html-tools@1.0.8 +htmljs@1.0.8 +http@1.1.4 +id-map@1.0.6 idorecall:email-normalize@1.0.0 jparker:crypto-core@0.1.0 jparker:crypto-md5@0.1.1 jparker:gravatar@0.4.1 -jquery@1.11.6 -kadira:debug@2.2.4 +jquery@1.11.7 +kadira:debug@3.2.2 kadira:dochead@1.4.0 kadira:flow-router-ssr@3.12.2 -livedata@1.0.16 -localstorage@1.0.7 -logging@1.0.10 +kadira:runtime-dev@0.0.1 +livedata@1.0.17 +localstorage@1.0.8 +logging@1.0.11 matb33:collection-hooks@0.8.1 mdg:validation-error@0.5.1 -meteor@1.1.12 -meteor-base@1.0.2 +meteor@1.1.13 +meteor-base@1.0.3 meteorhacks:fast-render@2.13.0 meteorhacks:inject-data@2.0.0 meteorhacks:inject-initial@1.0.4 -meteorhacks:kadira@2.24.1 +meteorhacks:kadira@2.28.5 meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 meteorhacks:unblock@1.1.0 meteorspark:util@0.2.0 -minifier-css@1.1.9 -minifier-js@1.1.9 -minimongo@1.0.12 +minifier-css@1.1.10 +minifier-js@1.1.10 +minimongo@1.0.13 miro:mailchimp@1.1.0 -modules@0.5.1 -modules-runtime@0.6.1 -momentjs:moment@2.11.2 -mongo@1.1.5 -mongo-id@1.0.2 -mongo-livedata@1.0.10 +modules@0.5.2 +modules-runtime@0.6.2 +momentjs:moment@2.12.0 +mongo@1.1.6 +mongo-id@1.0.3 +mongo-livedata@1.0.11 +nova-demo@0.25.7 nova:api@0.25.7 nova:base-components@0.25.7 nova:base-styles@0.25.7 @@ -108,54 +110,54 @@ nova:share@0.25.7 nova:users@0.25.7 nova:voting@0.25.7 npm-bcrypt@0.7.8_2 -npm-mongo@1.4.41 -oauth@1.1.8 -oauth1@1.1.7 -observe-sequence@1.0.9 +npm-mongo@1.4.42 +oauth@1.1.9 +oauth1@1.1.8 +observe-sequence@1.0.10 ongoworks:speakingurl@9.0.0 -ordered-dict@1.0.5 +ordered-dict@1.0.6 peerlibrary:assert@0.2.5 peerlibrary:fiber-utils@0.6.0 peerlibrary:reactive-mongo@0.1.1 peerlibrary:reactive-publish@0.2.0 peerlibrary:server-autorun@0.5.2 percolatestudio:synced-cron@1.1.0 -promise@0.6.5 +promise@0.6.6 raix:eventemitter@0.1.3 -random@1.0.7 -rate-limit@1.0.2 -react-meteor-data@0.2.7 -reactive-dict@1.1.5 -reactive-var@1.0.7 -reload@1.1.6 -retry@1.0.5 -routepolicy@1.0.8 +random@1.0.8 +rate-limit@1.0.3 +react-meteor-data@0.2.8 +reactive-dict@1.1.6 +reactive-var@1.0.8 +reload@1.1.7 +retry@1.0.6 +routepolicy@1.0.9 sacha:juice@0.1.4 -service-configuration@1.0.7 -session@1.1.3 -sha@1.0.5 -softwarerero:accounts-t9n@1.3.2 -spacebars@1.0.9 -spacebars-compiler@1.0.9 -srp@1.0.6 -standard-minifier-css@1.0.4 -standard-minifier-js@1.0.4 -standard-minifiers@1.0.4 +service-configuration@1.0.8 +session@1.1.4 +sha@1.0.6 +softwarerero:accounts-t9n@1.3.3 +spacebars@1.0.10 +spacebars-compiler@1.0.10 +srp@1.0.7 +standard-minifier-css@1.0.5 +standard-minifier-js@1.0.5 +standard-minifiers@1.0.5 std:accounts-ui@1.1.12 -tap:i18n@1.7.0 -templating@1.1.7 -templating-tools@1.0.2 -tmeasday:check-npm-versions@0.2.0 +tap:i18n@1.8.0 +templating@1.1.8 +templating-tools@1.0.3 +tmeasday:check-npm-versions@0.3.0 tmeasday:publish-counts@0.7.3 -tracker@1.0.11 -twitter@1.1.7 -ui@1.0.9 -underscore@1.0.6 -url@1.0.7 +tracker@1.0.12 +twitter@1.1.8 +ui@1.0.10 +underscore@1.0.7 +url@1.0.8 utilities:avatar@0.9.2 utilities:react-list-container@0.1.7 utilities:smart-methods@0.1.2 utilities:smart-publications@0.1.4 -webapp@1.2.6 -webapp-hashing@1.0.7 +webapp@1.2.7 +webapp-hashing@1.0.8 zimme:active-route@2.3.2 diff --git a/package.json b/package.json index c02f2b96d..8ca180ef1 100644 --- a/package.json +++ b/package.json @@ -8,18 +8,18 @@ "formsy-react-components": "^0.6.6", "js-cookie": "^2.1.0", "load-script": "^1.0.0", - "react": "^0.14.7", - "react-addons-pure-render-mixin": "^0.14.7", - "react-bootstrap": "^0.28.4", - "react-dom": "^0.14.6", - "react-komposer": "^1.4.1", - "react-mounter": "^1.1.0", - "react-no-ssr": "^1.0.1", - "tracker-component": "^1.3.13" + "react": "^15.0.1", + "react-addons-pure-render-mixin": "^15.0.0", + "react-bootstrap": "^0.28.5", + "react-dom": "^15.0.0", + "react-komposer": "^1.8.0", + "react-mounter": "^1.2.0", + "react-no-ssr": "^1.1.0", + "tracker-component": "^1.3.14" }, "private": true, "devDependencies": { - "autoprefixer": "^6.3.4" + "autoprefixer": "^6.3.6" }, "postcss": { "plugins": { diff --git a/packages/nova-base-components/lib/debug/Settings.jsx b/packages/nova-base-components/lib/debug/Settings.jsx index 814146fd0..79d4ec6dc 100644 --- a/packages/nova-base-components/lib/debug/Settings.jsx +++ b/packages/nova-base-components/lib/debug/Settings.jsx @@ -1,6 +1,5 @@ import React from 'react'; - const renderSetting = (field, key) => { return (