Anton Georgiev
|
7e798b96dd
|
clearing some linting issues
|
2017-06-28 15:24:19 -04:00 |
|
Anton Georgiev
|
56da45f071
|
handle adding presentation, slide 2.0
|
2017-06-28 15:05:50 -04:00 |
|
Anton Georgiev
|
f9f50cddec
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-28 13:37:57 -04:00 |
|
Klaus
|
4fe5a074df
|
Userlist working correct
|
2017-06-28 14:16:04 -03:00 |
|
Klaus
|
d3a50416cc
|
Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages
|
2017-06-28 13:56:33 -03:00 |
|
Anton Georgiev
|
858e541984
|
Merge branch 'bbb-2x-mconf' into handle-messages
|
2017-06-28 12:55:33 -04:00 |
|
Klaus
|
894fd70e68
|
Fix presenter assigned message handle
|
2017-06-28 13:44:11 -03:00 |
|
Anton Georgiev
|
d899a573a6
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-28 11:37:54 -04:00 |
|
Anton Georgiev
|
e0a5fa48f4
|
add default webcam_stream and adjust emoji
|
2017-06-28 11:33:03 -04:00 |
|
Richard Alam
|
e9b669349e
|
Merge pull request #4033 from ritzalam/refactor-client
Merging Anton's poll PR and fixes
|
2017-06-28 11:03:07 -04:00 |
|
Richard Alam
|
04e55a1dd4
|
Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x
|
2017-06-28 07:47:56 -07:00 |
|
Richard Alam
|
c2c6b19e95
|
- group messages into it's own file
|
2017-06-28 07:23:49 -07:00 |
|
Richard Alam
|
30827f680e
|
- move messages into different package
|
2017-06-27 19:44:47 -07:00 |
|
Anton Georgiev
|
724e21a0d6
|
we do not have 1.0 user messages coming from bbb so use 2.0 only
|
2017-06-27 18:14:53 -04:00 |
|
Richard Alam
|
a32193bd68
|
- reorganize messages
|
2017-06-27 15:01:42 -07:00 |
|
Richard Alam
|
03010eedb2
|
- put users messages in one file
- put guest policy into it's own class
|
2017-06-27 13:05:38 -07:00 |
|
Klaus
|
83cbb47195
|
Fix pencil update, thanks to @capilkey
|
2017-06-27 14:36:37 -03:00 |
|
Klaus
|
c90d94d5ac
|
Handle presenterAssigned and emojiStatus
|
2017-06-27 09:40:28 -03:00 |
|
Chad Pilkey
|
02e8c4f4cb
|
forgot a semi-colon
|
2017-06-26 18:29:21 -04:00 |
|
Chad Pilkey
|
4c66393dbd
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x
|
2017-06-26 18:09:56 -04:00 |
|
Richard Alam
|
f4bcb2421a
|
- send poll voting to client
|
2017-06-26 14:39:52 -07:00 |
|
Anton Georgiev
|
91cfc02d13
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
|
2017-06-26 17:21:42 -04:00 |
|
Anton Georgiev
|
ff01a66228
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-26 17:11:57 -04:00 |
|
Richard Alam
|
4baf8369ff
|
- apply voice status to correct user
|
2017-06-26 14:01:25 -07:00 |
|
Richard Alam
|
00cee79501
|
- do not show when user joins listen-only
|
2017-06-26 14:00:51 -07:00 |
|
Richard Alam
|
2316e73c26
|
Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls
|
2017-06-26 14:00:38 -07:00 |
|
Chad Pilkey
|
adfdd3c230
|
add try/catch block to client message receiver
|
2017-06-26 16:48:05 -04:00 |
|
Chad Pilkey
|
7c19972d24
|
remove pre-2.0 caption server code
|
2017-06-26 16:47:18 -04:00 |
|
Chad Pilkey
|
d690b49898
|
clear transcript owner when they leave the meeting
|
2017-06-26 16:46:09 -04:00 |
|
Anton Georgiev
|
a43a2c8eed
|
Merge pull request #3993 from oswaldoacauan/git-hooks-linter
[HTML5] Add a hook to run linters agains staged git files
|
2017-06-26 16:34:11 -04:00 |
|
Oswaldo Acauan
|
404598d735
|
Fix conflicts
|
2017-06-26 20:24:58 +00:00 |
|
Anton Georgiev
|
16168ddd5b
|
Merge pull request #3997 from Klauswk/DetectSystemLang
[HTML5] Add support to default system/browser language
|
2017-06-26 16:18:22 -04:00 |
|
Anton Georgiev
|
1d1a4c31f9
|
Merge pull request #4016 from MaximKhlobystov/grunt-to-npm-scripts-move
[HTML5 Client] Transition from Grunt to NPM Scripts
|
2017-06-26 16:11:09 -04:00 |
|
Anton Georgiev
|
3cf46a94a8
|
Merge pull request #3964 from KDSBrowne/x0-userlist-accessibility-suggestions
[HTML5] - Userlist Accessibility Fix
|
2017-06-26 15:59:31 -04:00 |
|
Anton Georgiev
|
f98bd01c3f
|
send poll result without extra stringify
|
2017-06-26 15:45:15 -04:00 |
|
Richard Alam
|
692609df97
|
Merge pull request #4031 from ritzalam/refactor-client
Refactor client
|
2017-06-26 15:43:00 -04:00 |
|
Richard Alam
|
99046fb685
|
- handle emoji status changed message in client
|
2017-06-26 12:38:00 -07:00 |
|
Chad Pilkey
|
76026da06c
|
moved caption messages to 2.0 format
|
2017-06-26 15:00:32 -04:00 |
|
Richard Alam
|
9dc41437e8
|
- handle user left
|
2017-06-26 10:34:22 -07:00 |
|
Klaus
|
e9d13e3b1e
|
A few fixes
|
2017-06-26 13:15:28 -03:00 |
|
Richard Alam
|
dfa1557116
|
- display default presentation
|
2017-06-26 07:24:38 -07:00 |
|
Richard Alam
|
f7376e11c0
|
- get presentation info
|
2017-06-25 16:11:29 -07:00 |
|
Richard Alam
|
2931b719c6
|
- get presentation info
|
2017-06-25 13:26:37 -07:00 |
|
Richard Alam
|
9317cdfcc0
|
Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation
|
2017-06-25 11:25:23 -07:00 |
|
Richard Alam
|
34cab65b2e
|
Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x
|
2017-06-24 15:46:22 -07:00 |
|
Richard Alam
|
6eac47fe47
|
Merge branch 'riadvice-layout-2x-messages' into bbb-2x-mconf
|
2017-06-24 15:19:10 -07:00 |
|
Richard Alam
|
503e37d22a
|
Merge branch 'layout-2x-messages' of https://github.com/riadvice/bigbluebutton into riadvice-layout-2x-messages
|
2017-06-24 15:09:24 -07:00 |
|
Richard Alam
|
dd175bee89
|
- mute user
|
2017-06-24 14:56:06 -07:00 |
|
Richard Alam
|
ae4fc536b1
|
- fix use leaving voice conf
|
2017-06-24 06:47:19 -07:00 |
|
Richard Alam
|
77da487c60
|
- handle user muted and talking messages
|
2017-06-23 18:14:55 -07:00 |
|