diff --git a/bigbluebutton-html5/.meteor/.finished-upgraders b/bigbluebutton-html5/.meteor/.finished-upgraders index dacc2c0d7ae50fd443ecc0c76ba46469b33179d5..11fc14e301d1fade5b536b5b60b3c45936b53529 100644 --- a/bigbluebutton-html5/.meteor/.finished-upgraders +++ b/bigbluebutton-html5/.meteor/.finished-upgraders @@ -11,3 +11,4 @@ notices-for-facebook-graph-api-2 1.2.0-cordova-changes 1.2.0-breaking-changes 1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link diff --git a/bigbluebutton-html5/.meteor/.gitignore b/bigbluebutton-html5/.meteor/.gitignore index 40830374235df1c19661a2901b7ca73cc9499f3d..501f92e4b5eb1a0eea1c21c7a6317095beb52bc9 100644 --- a/bigbluebutton-html5/.meteor/.gitignore +++ b/bigbluebutton-html5/.meteor/.gitignore @@ -1 +1,2 @@ +dev_bundle local diff --git a/bigbluebutton-html5/.meteor/packages b/bigbluebutton-html5/.meteor/packages index b636238af17ea88c0c531c272a2df5fd7efe9752..cccab7bbb73e07dafb7de5af8aa35c0f6de93b3b 100755 --- a/bigbluebutton-html5/.meteor/packages +++ b/bigbluebutton-html5/.meteor/packages @@ -3,11 +3,10 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -standard-app-packages -mrt:redis@0.1.3 +standard-app-packages@1.0.9 arunoda:npm@0.2.6 amplify -blaze +blaze@2.1.8 francocatena:status mrt:external-file-loader@0.1.4 brentjanderson:winston-client@0.0.4 @@ -17,9 +16,9 @@ clinical:nightwatch cfs:power-queue cfs:reactive-list cfs:micro-queue -reactive-var -ecmascript +reactive-var@1.0.10 +ecmascript@0.5.7 react-meteor-data -standard-minifier-css -standard-minifier-js +standard-minifier-css@1.1.8 +standard-minifier-js@1.1.8 nathantreid:css-modules diff --git a/bigbluebutton-html5/.meteor/release b/bigbluebutton-html5/.meteor/release index 940e0b5d4faa99bbd9e371a35355467af124aa78..810628dc6dd71272b8968bedf91ff0cd6e93fcf5 100644 --- a/bigbluebutton-html5/.meteor/release +++ b/bigbluebutton-html5/.meteor/release @@ -1 +1 @@ -METEOR@1.3.2.4 +METEOR@1.4 diff --git a/bigbluebutton-html5/.meteor/versions b/bigbluebutton-html5/.meteor/versions index 18e161c9b0d9966314ec99546248cac04a654d91..21cb5f10dd7a5bb729fbae1795372eebe326f188 100644 --- a/bigbluebutton-html5/.meteor/versions +++ b/bigbluebutton-html5/.meteor/versions @@ -1,91 +1,90 @@ aldeed:simple-schema@1.3.3 -allow-deny@1.0.4 +allow-deny@1.0.5 amplify@1.0.0 arunoda:npm@0.2.6 -autoupdate@1.2.9 -babel-compiler@6.6.4 -babel-runtime@0.1.8 -base64@1.0.8 -binary-heap@1.0.8 -blaze@2.1.7 -blaze-tools@1.0.8 -boilerplate-generator@1.0.8 +autoupdate@1.2.11 +babel-compiler@6.9.0 +babel-runtime@0.1.10 +base64@1.0.9 +binary-heap@1.0.9 +blaze@2.1.8 +blaze-tools@1.0.9 +boilerplate-generator@1.0.9 brentjanderson:winston-client@0.2.1 -caching-compiler@1.0.4 +caching-compiler@1.0.6 caching-html-compiler@1.0.6 -callback-hook@1.0.8 +callback-hook@1.0.9 cfs:http-methods@0.0.32 cfs:micro-queue@0.0.6 cfs:power-queue@0.9.11 cfs:reactive-list@0.0.9 cfs:reactive-property@0.0.4 -check@1.2.1 +check@1.2.3 clinical:nightwatch@2.0.1 coffeescript@1.0.17 ddp@1.2.5 -ddp-client@1.2.7 -ddp-common@1.2.5 -ddp-server@1.2.6 +ddp-client@1.2.9 +ddp-common@1.2.6 +ddp-server@1.2.10 deps@1.0.12 -diff-sequence@1.0.5 +diff-sequence@1.0.6 duongthienduc:meteor-winston@1.0.0 -ecmascript@0.4.3 -ecmascript-runtime@0.2.10 -ejson@1.0.11 -fastclick@1.0.11 -francocatena:status@1.5.1 -geojson-utils@1.0.8 -html-tools@1.0.9 -htmljs@1.0.9 -http@1.1.5 -id-map@1.0.7 +ecmascript@0.5.7 +ecmascript-runtime@0.3.12 +ejson@1.0.12 +fastclick@1.0.12 +francocatena:status@1.5.3 +geojson-utils@1.0.9 +html-tools@1.0.10 +htmljs@1.0.10 +http@1.1.8 +id-map@1.0.8 infinitedg:winston@0.7.3 -jquery@1.11.8 -launch-screen@1.0.11 +jquery@1.11.9 +launch-screen@1.0.12 livedata@1.0.18 -logging@1.0.12 -meteor@1.1.14 +logging@1.0.14 +meteor@1.2.16 meteor-platform@1.2.6 meteorspark:util@0.2.0 -minifier-css@1.1.11 -minifier-js@1.1.11 -minimongo@1.0.16 -mizzao:timesync@0.3.4 +minifier-css@1.2.13 +minifier-js@1.2.13 +minimongo@1.0.17 +mizzao:timesync@0.4.0 mobile-status-bar@1.0.12 -modules@0.6.1 -modules-runtime@0.6.3 -mongo@1.1.7 -mongo-id@1.0.4 +modules@0.7.5 +modules-runtime@0.7.5 +mongo@1.1.9_1 +mongo-id@1.0.5 mrt:external-file-loader@0.1.4 -mrt:redis@0.1.3 -nathantreid:css-modules@1.1.1 -nathantreid:css-modules-import-path-helpers@0.1.2 -npm-mongo@1.4.43 -observe-sequence@1.0.11 -ordered-dict@1.0.7 -promise@0.6.7 +nathantreid:css-modules@2.1.3 +nathantreid:css-modules-import-path-helpers@0.1.4 +npm-mongo@1.4.45 +observe-sequence@1.0.12 +ordered-dict@1.0.8 +promise@0.8.3 raix:eventemitter@0.1.3 ramda:ramda@0.19.0 -random@1.0.9 +random@1.0.10 react-meteor-data@0.2.9 -reactive-dict@1.1.7 -reactive-var@1.0.9 -reload@1.1.8 -retry@1.0.7 -routepolicy@1.0.10 -session@1.1.5 -spacebars@1.0.11 -spacebars-compiler@1.0.11 +reactive-dict@1.1.8 +reactive-var@1.0.10 +reload@1.1.10 +retry@1.0.8 +routepolicy@1.0.11 +session@1.1.6 +spacebars@1.0.12 +spacebars-compiler@1.0.12 standard-app-packages@1.0.9 -standard-minifier-css@1.0.6 -standard-minifier-js@1.0.6 -tap:i18n@1.6.1 -templating@1.1.9 +standard-minifier-css@1.1.8 +standard-minifier-js@1.1.8 +tap:i18n@1.7.0 +templating@1.1.14 templating-tools@1.0.4 tmeasday:check-npm-versions@0.2.0 -tracker@1.0.13 +tracker@1.0.15 ui@1.0.11 -underscore@1.0.8 -url@1.0.9 -webapp@1.2.8 +underscore@1.0.9 +url@1.0.10 +webapp@1.2.11 webapp-hashing@1.0.9 diff --git a/bigbluebutton-html5/client/stylesheets/bbb-icons.css b/bigbluebutton-html5/client/stylesheets/bbb-icons.css old mode 100644 new mode 100755 index 9f9762697d109d20e53599826660a783c737b91b..ae03c95d85255f55b799f49839c6101b8fd6ea16 --- a/bigbluebutton-html5/client/stylesheets/bbb-icons.css +++ b/bigbluebutton-html5/client/stylesheets/bbb-icons.css @@ -1,10 +1,10 @@ @font-face { font-family: 'bbb-icons'; - src: url('/html5client/fonts/BbbIcons/bbb-icons.eot?j1ntjp'); - src: url('/html5client/fonts/BbbIcons/bbb-icons.eot?j1ntjp#iefix') format('embedded-opentype'), - url('/html5client/fonts/BbbIcons/bbb-icons.ttf?j1ntjp') format('truetype'), - url('/html5client/fonts/BbbIcons/bbb-icons.woff?j1ntjp') format('woff'), - url('/html5client/fonts/BbbIcons/bbb-icons.svg?j1ntjp#bbb-icons') format('svg'); + src: url('/fonts/BbbIcons/bbb-icons.eot?j1ntjp'); + src: url('/fonts/BbbIcons/bbb-icons.eot?j1ntjp#iefix') format('embedded-opentype'), + url('/fonts/BbbIcons/bbb-icons.ttf?j1ntjp') format('truetype'), + url('/fonts/BbbIcons/bbb-icons.woff?j1ntjp') format('woff'), + url('/fonts/BbbIcons/bbb-icons.svg?j1ntjp#bbb-icons') format('svg'); font-weight: normal; font-style: normal; } diff --git a/bigbluebutton-html5/imports/startup/server/RedisPubSub.js b/bigbluebutton-html5/imports/startup/server/RedisPubSub.js index 991eacfceacff5b525efc8fbfac345ed6749950d..b169de6d3a26b5e884fd7e5b9fc1e901b26667d6 100755 --- a/bigbluebutton-html5/imports/startup/server/RedisPubSub.js +++ b/bigbluebutton-html5/imports/startup/server/RedisPubSub.js @@ -2,6 +2,7 @@ import { logger } from '/imports/startup/server/logger'; import { redisConfig } from '/config'; import { myQueue } from '/imports/startup/server'; import { indexOf, publish } from '/imports/api/common/server/helpers'; +import redis from 'redis'; export class RedisPubSub { constructor() { diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss old mode 100644 new mode 100755 index 0c45a2177e535089eef82e07099937ca450f978a..5f3f3992878f8023448368f6b72a30d9ba0876bf --- a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; .actionsbar { padding: $line-height-computed / 2; diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss index 9a7fabf08cd96017b1db0261910133d651faac39..f75796836f2300311ccbcaa1e0824427af6013ff 100755 --- a/bigbluebutton-html5/imports/ui/components/app/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; $navbar-height: 60px; // TODO: Change to NavBar real height $actionsbar-height: 50px; // TODO: Change to ActionsBar real height diff --git a/bigbluebutton-html5/imports/ui/components/button/styles.scss b/bigbluebutton-html5/imports/ui/components/button/styles.scss old mode 100644 new mode 100755 index 17d15268029c74a6e3b8e2e658882692efeca3dd..d9ec3144b70dad321bcb826e503a9ab3522aa11e --- a/bigbluebutton-html5/imports/ui/components/button/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/button/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; $btn-default-color: $color-gray; $btn-default-bg: $color-white; diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/styles.scss old mode 100644 new mode 100755 index f6f5be773517e3099e74801aba1ec47c50091165..e522d8b85467c88a1c4197b9a0b99574c11faa92 --- a/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/styles.scss @@ -1 +1 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../../../stylesheets/variables/_all"; diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-form/styles.scss old mode 100644 new mode 100755 index dcdb06a8f8be0cb10730be51724c513c7f18dfb0..f832067b4d5a44dd3ff681b291c5f78d1d10e7f4 --- a/bigbluebutton-html5/imports/ui/components/chat/message-form/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/chat/message-form/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../../stylesheets/variables/_all"; .form { flex-grow: 0; diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss old mode 100644 new mode 100755 index aeea052b31e76ec9235ec30fd4b81beb5a3426b0..c1482c4751e8ef03ec422c8e166b6da54bb15475 --- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../../../stylesheets/variables/_all"; .item { display: flex; diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss old mode 100644 new mode 100755 index 5b50bed1b3237de3458e551da8665627d22d7407..884cf17507e82c059b2a3fa10ec3161663620d2f --- a/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss @@ -1,5 +1,5 @@ -@import "imports/ui/stylesheets/variables/_all"; -@import "imports/ui/stylesheets/mixins/_scrollable"; +@import "../../../stylesheets/variables/_all"; +@import "../../../stylesheets/mixins/_scrollable"; .messageListWrapper { display: flex; diff --git a/bigbluebutton-html5/imports/ui/components/chat/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/styles.scss old mode 100644 new mode 100755 index 2d7db8f90b02077cd67060c42cfcd111111d9ecf..c78dacd11f4642bed6af22517109349d2f046aae --- a/bigbluebutton-html5/imports/ui/components/chat/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/chat/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; .chat { background-color: #fff; diff --git a/bigbluebutton-html5/imports/ui/components/media/styles.scss b/bigbluebutton-html5/imports/ui/components/media/styles.scss index fe72284e48bd276c4f1a2cde8394ab01aa952956..f8a416e729da921991bbde449cd87cbea2fb887c 100755 --- a/bigbluebutton-html5/imports/ui/components/media/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/media/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; .container { position: relative; diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss index 76ebede26280e898c5431094795327079223d530..6f3f2dd6cddb53f2d4dc6d9db16c71a35237a076 100755 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss @@ -1,9 +1,9 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; .navbar { padding: $line-height-computed / 2; display: flex; - flex-direction: row; + flex-direction: row; } .left, @@ -28,19 +28,19 @@ .center { width:70%; - flex: 1; + flex: 1; } -.presentationTitle { +.presentationTitle { font-weight: 200; color: $color-white; font-size: $font-size-base * 1.2; margin: 0; - padding: 0; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} + padding: 0; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .divideBar { color: $color-white; diff --git a/bigbluebutton-html5/imports/ui/components/polling/styles.scss b/bigbluebutton-html5/imports/ui/components/polling/styles.scss index 99cafd24ceceda82f5021f02e2fd6cddf1bd0e4b..02e4abd6fbb4d01f54c19b2b3fdb9db6e756d8ce 100755 --- a/bigbluebutton-html5/imports/ui/components/polling/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/polling/styles.scss @@ -1,29 +1,29 @@ -@import "imports/ui/stylesheets/variables/_all"; - -.pollingContainer { - order: 2; - width: 100%; - margin-top: 1%; - margin-bottom: 1%; - display: flex; - flex-direction: row; - justify-content: center; -} - -.pollingButton { - width: 100%; - height: 100%; -} - -.pollingTitle { - color: $color-white; -} - -.hidden { - display: none; -} - -.pollButtonWrapper { - text-align: center; - max-width: 150px; -} +@import "../../stylesheets/variables/_all"; + +.pollingContainer { + order: 2; + width: 100%; + margin-top: 1%; + margin-bottom: 1%; + display: flex; + flex-direction: row; + justify-content: center; +} + +.pollingButton { + width: 100%; + height: 100%; +} + +.pollingTitle { + color: $color-white; +} + +.hidden { + display: none; +} + +.pollButtonWrapper { + text-align: center; + max-width: 150px; +} diff --git a/bigbluebutton-html5/imports/ui/components/user-list/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/styles.scss old mode 100644 new mode 100755 index 03625f5cbf1ef5b66da0e68fee23e4712b2dbebb..ea6ecd39fbbdb52db909ee4746894ac42b83c6be --- a/bigbluebutton-html5/imports/ui/components/user-list/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/styles.scss @@ -1,5 +1,5 @@ @import '../../stylesheets/variables/palette'; -@import "imports/ui/stylesheets/mixins/_scrollable"; +@import "../../stylesheets/mixins/_scrollable"; /* Variables * ========== diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss b/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss old mode 100644 new mode 100755 index 0d1604deb3afd596db0d8797a2c3d2790aebd5e8..0e2ddb19940049281cc6a9e4e4ebe8cb0a3e6f64 --- a/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; .videoDock { position: absolute; diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/default-content/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/default-content/styles.scss index 5ea5c169cd7e5db997a81db3db9ea880d1d06078..ae44a5bcfdcaabd46b1667fb6792e02a02aa8e4b 100755 --- a/bigbluebutton-html5/imports/ui/components/whiteboard/default-content/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/whiteboard/default-content/styles.scss @@ -1,46 +1,46 @@ -@import "imports/ui/stylesheets/variables/_all"; - -.contentRatio { - position: relative; - display: block; - height: 0; - padding: 0; - padding-bottom: calc(100% * 9 / 16); -} - -.contentWrapper { - flex-basis: 90%; - - @include mq($large-up) { - flex-basis: 90%; - } -} - -.content { - height: 100%; - width: 100%; -} - -.defaultContent { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - - padding: $line-height-computed; - border: 0.25rem dashed; - border-radius: 1.5rem; - color: rgba(255, 255, 255, .5); - text-align: center; - overflow: auto; -} - -.appear { - opacity: 0.01; -} - -.appearActive { - opacity: 1; - transition: opacity 700ms ease-in; -} +@import "../../../stylesheets/variables/_all"; + +.contentRatio { + position: relative; + display: block; + height: 0; + padding: 0; + padding-bottom: calc(100% * 9 / 16); +} + +.contentWrapper { + flex-basis: 90%; + + @include mq($large-up) { + flex-basis: 90%; + } +} + +.content { + height: 100%; + width: 100%; +} + +.defaultContent { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + + padding: $line-height-computed; + border: 0.25rem dashed; + border-radius: 1.5rem; + color: rgba(255, 255, 255, .5); + text-align: center; + overflow: auto; +} + +.appear { + opacity: 0.01; +} + +.appearActive { + opacity: 1; + transition: opacity 700ms ease-in; +} diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss index b720efc78ba7eb9ff2ba4253ea856a38d40442f0..f6befe50140fba2da4e81d3fef8cf9b0122856ba 100755 --- a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss @@ -1,4 +1,4 @@ -@import "imports/ui/stylesheets/variables/_all"; +@import "../../stylesheets/variables/_all"; .enter { opacity: 0.01; diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json index 8e4d52e4a47414032630b4773ca9ac4a3245412c..878ab2f91af7f2d1503622143e5426ed0c7e115a 100755 --- a/bigbluebutton-html5/package.json +++ b/bigbluebutton-html5/package.json @@ -10,19 +10,22 @@ }, "dependencies": { "classnames": "^2.2.3", + "grunt-cli": "~1.2.0", + "hiredis": "^0.5.0", "history": "^2.1.1", + "image-size": "~0.5.0", "meteor-node-stubs": "^0.2.3", + "node-sass": "^3.8.0", "react": "~15.2.1", + "react-addons-css-transition-group": "~15.2.1", "react-addons-pure-render-mixin": "~15.2.1", + "react-autosize-textarea": "~0.3.1", "react-dom": "~15.2.1", - "image-size": "~0.5.0", "react-intl": "~2.1.3", "react-modal": "~1.4.0", "react-router": "~2.5.2", - "react-addons-css-transition-group": "~15.2.1", - "underscore": "~1.8.3", - "react-autosize-textarea": "~0.3.1", - "grunt-cli": "~1.2.0" + "redis": "^2.6.2", + "underscore": "~1.8.3" }, "devDependencies": { "autoprefixer": "^6.3.6",