Gabriel Carvalho de Campes
1dde9f25e8
Merge remote-tracking branch 'origin/master' into user-avatar-changes
...
* origin/master:
Remove unused imports
upgrade sip.js to 0.7.5
Moved polling files back to components folder
Adds link to meteor issue on comment, remove unused import
Remove logs, and add some removed code back
Changes Router in order for the livereloading to work again
Fixed a small issue with reduce() in the poll annotation
Made polling buttons accessible
try to fix the reload issue
Updated packages and fixed some of the warnings introduced by React 15.2.0
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
Centering polling buttons
Title and calculated styling for the polling UI
Replaced polling under the whiteboard
fixes html5 clinet logout and nav-bar
fixes html5 clinet logout and nav-bar
fixes html5 clinet logout and nav-bar
fixes html5 clinet logout and nav-bar
2016-07-08 12:40:25 +00:00
Anton Georgiev
1d451f1e09
Merge pull request #3203 from Gcampes/router-changes
...
Changes to router and subscriptions
2016-07-08 08:29:43 -04:00
Gabriel Carvalho de Campes
352011e92c
Remove unused imports
2016-07-08 12:22:49 +00:00
Gabriel Carvalho de Campes
537d8753fe
Merge remote-tracking branch 'origin/master' into router-changes
...
* origin/master:
upgrade sip.js to 0.7.5
Moved polling files back to components folder
Fixed a small issue with reduce() in the poll annotation
Made polling buttons accessible
Updated packages and fixed some of the warnings introduced by React 15.2.0
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
Centering polling buttons
Title and calculated styling for the polling UI
Mark open chat as active
Remove some old code
Changes the way user actions are rendered
Replaced polling under the whiteboard
Solve issues from github comments
Remove color-generator because it is not being used
polish code
Updates the userlist
Conflicts:
bigbluebutton-html5/imports/ui/components/app/container.jsx
2016-07-08 11:59:05 +00:00
Anton Georgiev
107e49caba
Merge pull request #3202 from OZhurbenko/polling-ui
...
HTML5 Polling UI
2016-07-07 17:24:59 -04:00
Fred Dixon
ef0dc056a4
Merge pull request #3205 from capilkey/upgrade-sipjs
...
Upgrade sip.js to 0.7.5
2016-07-07 17:17:11 -04:00
Chad Pilkey
5dd6d86b36
upgrade sip.js to 0.7.5
2016-07-07 21:06:11 +00:00
Oleksandr Zhurbenko
3522e1039e
Moved polling files back to components folder
2016-07-07 10:08:26 -07:00
Gabriel Carvalho de Campes
6c4eae35bb
Adds link to meteor issue on comment, remove unused import
2016-07-07 16:15:12 +00:00
Gabriel Carvalho de Campes
e8f1a877c4
Remove logs, and add some removed code back
2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes
ac3353d855
Changes Router in order for the livereloading to work again
2016-07-07 14:01:40 +00:00
Oleksandr Zhurbenko
6266da7ccd
Fixed a small issue with reduce() in the poll annotation
2016-07-06 12:38:13 -07:00
Oleksandr Zhurbenko
92db94099d
Made polling buttons accessible
2016-07-05 14:49:31 -07:00
Gabriel Carvalho de Campes
7f8f4417e4
try to fix the reload issue
2016-07-05 18:59:18 +00:00
Gabriel Carvalho de Campes
5bb53547a9
Changes the avatar component
2016-07-05 16:54:45 +00:00
Oleksandr Zhurbenko
4bd63fd79f
Updated packages and fixed some of the warnings introduced by React 15.2.0
2016-07-04 17:06:18 -07:00
Gabriel Carvalho de Campes
d1cb48768a
Adds colored avatars to the userlist
2016-07-04 20:44:29 +00:00
Anton Georgiev
0ca61cd105
Merge pull request #3191 from Gcampes/userlist-update
...
Show open chats and user actions
2016-07-04 09:52:26 -04:00
Fred Dixon
b36e767df3
Merge pull request #3197 from ffdixon/updates-for-11
...
Updates BigBlueButton 1.1-dev
2016-07-02 17:59:16 -04:00
Fred Dixon
ecc1623a54
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
2016-07-02 17:57:49 -04:00
Oleksandr Zhurbenko
93e4f3e66c
Centering polling buttons
2016-06-30 15:26:42 -07:00
Oleksandr Zhurbenko
f26ab0ac52
Title and calculated styling for the polling UI
2016-06-30 15:21:46 -07:00
Gabriel Carvalho de Campes
a62d520ef6
Mark open chat as active
2016-06-30 14:45:19 +00:00
Gabriel Carvalho de Campes
fedbbee910
Remove some old code
2016-06-30 13:02:34 +00:00
Gabriel Carvalho de Campes
b50fd3d080
Changes the way user actions are rendered
2016-06-30 13:01:02 +00:00
Oleksandr Zhurbenko
83fff53269
Replaced polling under the whiteboard
2016-06-29 15:00:06 -07:00
Gabriel Carvalho de Campes
50e5bdf62f
Solve issues from github comments
2016-06-29 14:24:27 +00:00
Gabriel Carvalho de Campes
76e98d2ae5
Remove color-generator because it is not being used
2016-06-29 14:09:23 +00:00
Anton Georgiev
be73090ee9
Merge pull request #3178 from JaeeunCho/logOut
...
fixes HTML5 client logout
2016-06-29 09:08:22 -04:00
Gabriel Carvalho de Campes
445849217b
Merge remote-tracking branch 'upstream/master' into userlist-update
...
* upstream/master:
Changed 'let' to 'const' where it was possible and adjusted imports
Fixed a bug with Polls deletion from all meetings
Fixed all the 120+ linter warnings
Fixed a bug with the deletion of the Poll
Conflicts:
bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
2016-06-28 19:55:31 +00:00
Gabriel Carvalho de Campes
a4d0f691dd
polish code
2016-06-28 19:52:03 +00:00
Jaeeun Cho
9eacf32497
fixes html5 clinet logout and nav-bar
2016-06-28 15:30:43 -04:00
Jaeeun Cho
eded89d5f0
fixes html5 clinet logout and nav-bar
2016-06-28 14:50:44 -04:00
Anton Georgiev
0d8d404886
Merge pull request #3189 from OZhurbenko/meteor-react
...
Linting and a fix for clearPollCollection method
2016-06-28 09:29:17 -04:00
Gabriel Carvalho de Campes
6e88731ebc
Updates the userlist
2016-06-28 13:10:20 +00:00
Oleksandr Zhurbenko
390935e304
Changed 'let' to 'const' where it was possible and adjusted imports
2016-06-27 14:48:46 -07:00
Oleksandr Zhurbenko
3d0132685f
Fixed a bug with Polls deletion from all meetings
...
Which happened when we published a poll, cleared a collection, and then received a poll_stopped_message
2016-06-27 11:30:37 -07:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Oleksandr Zhurbenko
40cedc28bc
Fixed a bug with the deletion of the Poll
...
It was always undefined here
2016-06-27 09:31:15 -07:00
Anton Georgiev
1181ad1d4a
Merge pull request #3184 from OZhurbenko/meteor-react
...
Whiteboard functionality
2016-06-27 11:34:36 -04:00
Oleksandr Zhurbenko
2b4aced77d
Fixed naming according to the BBB's style guide
2016-06-27 07:48:17 -07:00
Fred Dixon
88ad0fb09b
Merge pull request #3186 from bigbluebutton/ffdixon-patch-1
...
Update bbb-0.9-beta-recording-update
2016-06-26 08:52:32 -07:00
Fred Dixon
4628fd3a7a
Update bbb-0.9-beta-recording-update
2016-06-26 11:52:09 -04:00
Jaeeun Cho
3d36d3fed2
fixes html5 clinet logout and nav-bar
2016-06-24 19:09:32 -04:00
Oleksandr Zhurbenko
29e8524de0
Polishing
2016-06-24 14:30:37 -07:00
Jaeeun Cho
991034b5bf
Merge remote-tracking branch 'upstream/master' into logOut
2016-06-24 10:48:52 -04:00
Jaeeun Cho
3325ac4974
fixes html5 clinet logout and nav-bar
2016-06-24 10:48:09 -04:00
Oleksandr Zhurbenko
1e694b2a01
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
2016-06-23 13:55:40 -07:00
Oleksandr Zhurbenko
6920d8b2a6
Added a check for unknown shape types
2016-06-22 15:58:28 -07:00
Oleksandr Zhurbenko
22ab079f5c
Optimized polling strings and centered the strings
2016-06-22 15:20:08 -07:00
