Klaus
|
9bc9116e5c
|
handling a few messages
|
2017-07-31 08:10:52 -03:00 |
|
Oleksandr Zhurbenko
|
c61dcbce36
|
Fixed a cursor display/publish for both presenters and viewers
Plus linting warnings, no multi-user yet
|
2017-07-28 17:29:40 -07:00 |
|
Oswaldo Acauan
|
e93f3c0fd5
|
Remove logs
|
2017-07-28 10:49:48 -03:00 |
|
Oswaldo Acauan
|
83c117ddde
|
Match user-list with the new styles
|
2017-07-28 10:43:39 -03:00 |
|
Klaus
|
e43a44e828
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-07-28 08:47:56 -03:00 |
|
Oleksandr Zhurbenko
|
ae3b4bb7fb
|
Fixed initial whiteboard request history handler
Linter fixes
|
2017-07-27 19:56:41 -07:00 |
|
Oleksandr Zhurbenko
|
0cb46d2156
|
Fixed initial whiteboard history request handler
|
2017-07-27 18:21:02 -07:00 |
|
Klaus
|
eac898e81d
|
Merge branch 'bbb-2x-mconf' into html5-2x-chat-options
|
2017-07-27 17:36:01 -03:00 |
|
Klauswk
|
e751bcdadf
|
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
|
2017-07-27 17:27:35 -03:00 |
|
Klaus
|
e23d75c16b
|
Captions mapped
|
2017-07-27 17:18:44 -03:00 |
|
Anton Georgiev
|
13b406313e
|
drop handling of fsesl->akka-apps events
|
2017-07-27 11:27:06 -04:00 |
|
Klaus
|
b015c98f82
|
Mapped annotations
|
2017-07-27 10:45:40 -03:00 |
|
Klaus
|
c13155aa6a
|
Move shapes to annotations
|
2017-07-27 09:35:55 -03:00 |
|
Anton Georgiev
|
4c19d0589b
|
reorganize object destruction
|
2017-07-26 14:01:38 -04:00 |
|
Matthew Marangoni
|
0ab3bcc599
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
|
2017-07-26 10:59:05 -07:00 |
|
Matthew Marangoni
|
7c0d802f27
|
fixed undefined extension
|
2017-07-26 10:58:39 -07:00 |
|
Anton Georgiev
|
5ca6f63d7e
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio
|
2017-07-26 13:49:57 -04:00 |
|
Klaus
|
a1e57c84c3
|
Mapped meeting
|
2017-07-26 14:36:57 -03:00 |
|
Klaus
|
06b5538054
|
Mapped polls
|
2017-07-26 14:08:00 -03:00 |
|
Klaus
|
d05e3c6b14
|
Presentation mapped
|
2017-07-26 13:59:21 -03:00 |
|
Klaus
|
ff42dbc58b
|
Refactored slides
|
2017-07-26 13:39:53 -03:00 |
|
Anton Georgiev
|
305b47e535
|
improve getSessionToken function and use it on verto_extension
|
2017-07-26 11:43:47 -04:00 |
|
Klaus
|
355f777d0d
|
User mapped
|
2017-07-26 11:50:02 -03:00 |
|
Klaus
|
9ab4430f68
|
Fix merge stuff
|
2017-07-26 11:31:35 -03:00 |
|
Klaus
|
745b9070f6
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-07-26 11:11:40 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|
Anton Georgiev
|
dbcf6dbd2c
|
screenshare displays except at refresh
|
2017-07-26 09:18:15 -04:00 |
|
Oleksandr Zhurbenko
|
6ea4d39da9
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-07-25 15:08:29 -07:00 |
|
Anton Georgiev
|
4e34a7f551
|
screenshare displays except at refresh
|
2017-07-25 16:56:40 -04:00 |
|
Klaus
|
9cd3ac3f87
|
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
|
2017-07-25 13:43:26 -03:00 |
|
Klaus
|
22d80b605f
|
Fix presenter assign
|
2017-07-25 13:21:07 -03:00 |
|
Anton Georgiev
|
1bdeb248c1
|
Merge pull request #4117 from Klauswk/html5-2x-fix-audio
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
|
2017-07-25 10:30:43 -04:00 |
|
Klaus
|
51f7161e45
|
Flat breakouts
|
2017-07-25 10:51:33 -03:00 |
|
Klaus
|
b1bb4a6866
|
Flat poll
|
2017-07-25 09:26:45 -03:00 |
|
Oleksandr Zhurbenko
|
5aed767436
|
Moved SwitchSlide method to 2.0
|
2017-07-24 14:04:49 -07:00 |
|
Klaus
|
916713b1df
|
Add safe true, preventing mess with the arrays, and refactored the shapes
|
2017-07-24 17:32:35 -03:00 |
|
Oleksandr Zhurbenko
|
a0f9015860
|
Moved ClearAll and Undo to 2.0
|
2017-07-24 13:29:02 -07:00 |
|
Anton Georgiev
|
75c39f9340
|
Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio
|
2017-07-24 16:06:52 -04:00 |
|
Anton Georgiev
|
350dd16fb7
|
Merge branch 'html5-2x-fix-audio' of github.com:Klauswk/bigbluebutton into html5-2x-fix-audio
|
2017-07-24 15:34:18 -04:00 |
|
Anton Georgiev
|
b7d6427e63
|
rename deskshare to screenshare and adjust condition for viewing
|
2017-07-24 15:29:34 -04:00 |
|
Matthew Marangoni
|
2f48cca53e
|
Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x
|
2017-07-24 12:14:18 -07:00 |
|
Klaus
|
97b38fb0e6
|
Presentation reflects akkaApps
|
2017-07-24 15:46:53 -03:00 |
|
Anton Georgiev
|
cacac6c9c6
|
Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare
|
2017-07-24 14:17:04 -04:00 |
|
Klaus
|
78a6fee038
|
Slides reflecting akkaApps
|
2017-07-24 14:50:44 -03:00 |
|
Klaus
|
d72df301c6
|
Move to 2.0
|
2017-07-24 11:15:46 -03:00 |
|
Klaus
|
73068ff8d2
|
Handling meeting end
|
2017-07-21 16:34:28 -03:00 |
|
Klaus
|
39288e6e70
|
Add clear history, copy and save as chat options
|
2017-07-21 13:27:28 -03:00 |
|
Klaus
|
7cf05cdbf5
|
Add public history clear eventHandler and method
|
2017-07-21 11:39:40 -03:00 |
|
Klaus
|
b2556695c4
|
Fix show public messages
|
2017-07-19 14:57:07 -03:00 |
|
Klaus
|
b70702dabe
|
Dynamic fetching the stun/turn servers
|
2017-07-19 09:44:47 -03:00 |
|
Klaus
|
a7ca723fe6
|
Audio only working on html5
|
2017-07-18 11:59:05 -03:00 |
|
Anton Georgiev
|
2d4db1c9de
|
Merge pull request #4113 from oswaldoacauan/fix-meeting-add
[HTML5 2.0] Fix meeting add
|
2017-07-18 10:02:08 -04:00 |
|
Oswaldo Acauan
|
a0de0545b4
|
Fix welcomeMessage from meeting object
|
2017-07-18 10:31:00 -03:00 |
|
Oswaldo Acauan
|
c6f517b3cb
|
Fix selector and get welcomeMessage from meeting object
|
2017-07-18 10:25:11 -03:00 |
|
Oswaldo Acauan
|
04b6b753fe
|
Fix missing prop on meeting object
|
2017-07-18 10:23:16 -03:00 |
|
Oleksandr Zhurbenko
|
d49efd548d
|
Fixed shape's display
The version went missing during the switch to 2.0
|
2017-07-17 16:47:18 -07:00 |
|
Oleksandr Zhurbenko
|
a03ff03a84
|
Fixed shape's thickness
|
2017-07-17 16:41:07 -07:00 |
|
Klauswk
|
7173c0e20c
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-17 16:54:37 -03:00 |
|
Klaus
|
5767583a86
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages
|
2017-07-17 15:37:06 -03:00 |
|
Klaus
|
d4ffcc0221
|
Add assign presenter to html5
|
2017-07-17 09:49:11 -03:00 |
|
Klaus
|
b630fcd632
|
Fix presenter assign
|
2017-07-17 09:00:18 -03:00 |
|
Anton Georgiev
|
07ca5f5794
|
Merge pull request #4086 from oswaldoacauan/guest-policy
[HTML5] Guest Policy
|
2017-07-14 15:32:18 -04:00 |
|
Oswaldo Acauan
|
8c99b7e4bb
|
Fix cb pattern
|
2017-07-14 16:25:04 -03:00 |
|
Klaus
|
a99f8c37c4
|
Fix annotation incorrect size
|
2017-07-14 14:45:50 -03:00 |
|
Klaus
|
7fb9bae75e
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-14 14:44:00 -03:00 |
|
Klaus
|
baf36d9d5f
|
Fix the html5 2.0 user logout
|
2017-07-14 13:59:02 -03:00 |
|
Anton Georgiev
|
a00410847c
|
Merge pull request #4083 from Klauswk/html5-breakout-messages
[HTML5 2.0] Move breakout messages to 2.0
|
2017-07-14 10:39:38 -04:00 |
|
Anton Georgiev
|
586c51fcac
|
Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0] Move emoji messages to 2.0
|
2017-07-14 10:39:16 -04:00 |
|
Oswaldo Acauan
|
fe9ca6b0c8
|
Fix welcome message for guest users
|
2017-07-14 11:23:12 -03:00 |
|
Klaus
|
5f7c008e95
|
Screenshare messages been handle
|
2017-07-14 11:18:46 -03:00 |
|
Oswaldo Acauan
|
2e6ee550d2
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy
|
2017-07-14 11:18:40 -03:00 |
|
Oswaldo Acauan
|
5353a3a80d
|
Add guest policy to html5
|
2017-07-14 11:18:07 -03:00 |
|
Klaus
|
712b6914cc
|
Add base files
|
2017-07-14 09:32:15 -03:00 |
|
Klauswk
|
38087a1669
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:38:54 -03:00 |
|
Klaus
|
82f383f4ae
|
Fix typo in createBreakout
|
2017-07-13 17:35:40 -03:00 |
|
Klaus
|
6c602ba56f
|
Add missing import and add FIX ME
|
2017-07-13 17:28:35 -03:00 |
|
Klaus
|
858076924c
|
Fix import problems
|
2017-07-13 17:21:27 -03:00 |
|
Klaus
|
963248163d
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:14:02 -03:00 |
|
Klaus
|
c97ad780b5
|
Fix properties incorrect name
|
2017-07-13 13:55:05 -03:00 |
|
Klaus
|
05e1951ac1
|
Use flat object instead of long properties
|
2017-07-13 10:56:28 -03:00 |
|
Klaus
|
54234cecac
|
Handling emoji messages
|
2017-07-13 10:15:42 -03:00 |
|
Klaus
|
111ad9171b
|
Remove strings and add constants
|
2017-07-12 17:15:50 -03:00 |
|
Klaus
|
e1004b64d3
|
Filtering correct the messages
|
2017-07-12 10:54:54 -03:00 |
|
Klaus
|
898f7c97e3
|
Sending private message
|
2017-07-12 10:18:26 -03:00 |
|
Klaus
|
73f49bb46a
|
Sending public message
|
2017-07-12 09:42:16 -03:00 |
|
Klaus
|
188aff42df
|
Sending message, need to fix the property names
|
2017-07-11 17:44:07 -03:00 |
|
Klaus
|
55a9c0673e
|
Handling chat messages
|
2017-07-11 13:57:54 -03:00 |
|
Klaus
|
743e128b0f
|
Fix Poll display on html5
|
2017-07-07 09:18:54 -03:00 |
|
Klaus
|
4138f54f17
|
Fix Poll display on html5
|
2017-07-07 09:18:37 -03:00 |
|
Klaus
|
28b69208f9
|
Fix lint problems
|
2017-07-07 08:23:31 -03:00 |
|
Klaus
|
90ca216507
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-07 08:19:39 -03:00 |
|
Klaus
|
8ef23a559e
|
Fix lint problems
|
2017-07-07 08:17:49 -03:00 |
|
Klaus
|
4c1c7ad65a
|
Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages
|
2017-07-06 17:36:56 -03:00 |
|
Klaus
|
9b32a4db2d
|
Remove 'nodeJSapp' stuff, is deprecated
|
2017-07-06 15:01:05 -03:00 |
|
Klaus
|
94da6f636f
|
Merge branch 'html5-2x-getAll-messages' of https://github.com/Klauswk/bigbluebutton into html5-2x-getAll-messages
|
2017-07-06 09:32:14 -03:00 |
|
Klaus
|
cc38576f79
|
Add missing events
|
2017-07-06 08:58:38 -03:00 |
|
Klauswk
|
ebb3984828
|
Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages
|
2017-07-05 15:28:35 -03:00 |
|
Klaus
|
3f445bc92e
|
Change log
|
2017-07-05 14:26:22 -03:00 |
|
Anton Georgiev
|
23f4521954
|
Merge pull request #4038 from oswaldoacauan/flat-add-meeting
[HTML5 2.0] Add flat package and implement on addMeeting modifier
|
2017-07-05 11:13:23 -04:00 |
|
Klaus
|
86d3e27d47
|
Merged info with anton's branch
|
2017-07-03 12:05:35 -03:00 |
|
Anton Georgiev
|
83e14e8206
|
handle slides messages
|
2017-06-30 15:16:00 -04:00 |
|
Klaus
|
be2caf92a3
|
Working poll vote
|
2017-06-30 11:26:19 -03:00 |
|
Klaus
|
5e868f37ac
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-polls-messages
|
2017-06-30 08:47:58 -03:00 |
|
Klaus
|
9b63e0c215
|
Add caption messages
|
2017-06-29 17:22:09 -03:00 |
|
Anton Georgiev
|
c9b877c465
|
Merge branch 'handle-messages' into presentation-and-slides
|
2017-06-29 10:39:00 -04:00 |
|
Klaus
|
27a92698cc
|
Moved the meetingId to be last param
|
2017-06-29 10:09:11 -03:00 |
|
Klaus
|
6f93a5f9f6
|
Change to have default meeting param
|
2017-06-29 09:23:04 -03:00 |
|
Klaus
|
93927a3b53
|
Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages
|
2017-06-29 09:22:34 -03:00 |
|
Oswaldo Acauan
|
ace3afeb70
|
Remove console.log
|
2017-06-29 09:01:10 -03:00 |
|
Oswaldo Acauan
|
63522c6a95
|
Use flat package on mongo upsert
|
2017-06-29 08:54:19 -03:00 |
|
Klaus
|
2098c2dff7
|
Handle polls messages
|
2017-06-28 17:37:45 -03:00 |
|
Anton Georgiev
|
3ab794cbdb
|
obtain meetingId outside handler
|
2017-06-28 16:04:41 -04:00 |
|
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 |
|
Klaus
|
4a24769f20
|
Change var name
|
2017-06-28 15:34:22 -03:00 |
|
Klaus
|
0e1d81ceb5
|
Change var name
|
2017-06-28 15:33:06 -03:00 |
|
Klaus
|
aab51bdaed
|
Change import and remove console.err
|
2017-06-28 15:14:29 -03:00 |
|
Klaus
|
d3a50416cc
|
Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages
|
2017-06-28 13:56:33 -03: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 |
|
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 |
|
Klaus
|
83cbb47195
|
Fix pencil update, thanks to @capilkey
|
2017-06-27 14:36:37 -03:00 |
|
Klaus
|
6f3aeb7a8d
|
Fix imports
|
2017-06-27 09:45:08 -03:00 |
|
Klaus
|
c90d94d5ac
|
Handle presenterAssigned and emojiStatus
|
2017-06-27 09:40:28 -03:00 |
|
Klaus
|
5304a87b7b
|
Add last message
|
2017-06-27 09:27:57 -03:00 |
|
Klaus
|
43ffe77cd0
|
Remove unused import
|
2017-06-26 15:04:26 -03:00 |
|
Klaus
|
c491d28b78
|
Handle most of the breakout messages
|
2017-06-26 15:00:28 -03:00 |
|
Klaus
|
e9d13e3b1e
|
A few fixes
|
2017-06-26 13:15:28 -03:00 |
|
Klaus
|
8b6cb71854
|
Shapes add correct in the collection
|
2017-06-22 14:24:00 -03:00 |
|
Klaus
|
0e0af787f3
|
Add missing files
|
2017-06-22 10:22:52 -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 |
|
Klaus
|
692de9f417
|
Handle a few new messages
|
2017-06-21 13:54:04 -03:00 |
|
Klaus
|
3998139e72
|
Split redis and api for version migration
|
2017-06-20 14:17:37 -03:00 |
|
Klaus Klein
|
d88d4fb0bc
|
Add stuff from 2.x
|
2017-06-19 10:13:35 -03:00 |
|