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 |
|
Richard Alam
|
002a447273
|
- user talking message
|
2017-06-23 15:18:30 -07:00 |
|
Richard Alam
|
ceb4d74e55
|
- handle user join and left voice conference
|
2017-06-23 14:34:05 -07:00 |
|
Anton Georgiev
|
9a0a4d5669
|
work on displaying poll result annotation in flash client
|
2017-06-23 17:26:53 -04:00 |
|
Richard Alam
|
4dda2543ac
|
- handle user joined voice conf
|
2017-06-23 12:26:28 -07:00 |
|
Richard Alam
|
7ffd1a80bd
|
- assign presenter when no presenter present
|
2017-06-23 11:12:17 -07:00 |
|
Chad Pilkey
|
1c226fd3af
|
2.0 presentation message work, presentation conversion msgs in bbb-web missing
|
2017-06-23 13:27:56 -04:00 |
|
Richard Alam
|
c4616f1ce0
|
- load modules after validate token
|
2017-06-22 14:42:10 -07:00 |
|
Richard Alam
|
48b6fcdb09
|
- use LiveMeeting to store state
|
2017-06-22 13:52:39 -07:00 |
|
Klaus
|
8b6cb71854
|
Shapes add correct in the collection
|
2017-06-22 14:24:00 -03:00 |
|
Anton Georgiev
|
9dc00519db
|
Polls 2.0 on Flash client
|
2017-06-22 11:38:42 -04:00 |
|
Richard Alam
|
13efe38e87
|
- include webcam streams in users list
|
2017-06-22 08:30:39 -07:00 |
|
Richard Alam
|
0bc5e24886
|
- cleanup
|
2017-06-22 08:04:00 -07:00 |
|
Richard Alam
|
5957259b49
|
- combining web and voice users looks better
|
2017-06-22 08:00:32 -07:00 |
|
Klaus
|
0e0af787f3
|
Add missing files
|
2017-06-22 10:22:52 -03:00 |
|
Klaus
|
a209f620e0
|
Add cursor support
|
2017-06-22 10:22:34 -03:00 |
|
Klaus
|
8aee5dc069
|
Fix wrong publish name
|
2017-06-22 10:11:12 -03:00 |
|
Klaus
|
a1c41f220c
|
Correct handling the whiteboard messages
|
2017-06-22 10:03:27 -03:00 |
|
Klaus
|
43cdd9754c
|
Fix imports
|
2017-06-22 08:48:10 -03:00 |
|