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 |
|
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 |
|
Klaus
|
916713b1df
|
Add safe true, preventing mess with the arrays, and refactored the shapes
|
2017-07-24 17:32:35 -03: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 |
|
Matthew Marangoni
|
8902742573
|
wrapped BBB instantiation into init function and added to startup
|
2017-07-24 11:36:56 -07: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
|
5c2369b992
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
|
2017-07-24 11:00:30 -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 |
|
Matthew Marangoni
|
4e66ecf0e2
|
moved BBB import to startup
|
2017-07-20 08:57:12 -07:00 |
|
Matthew Marangoni
|
01f98fb4be
|
renamed htmlBBB to simply BBB
|
2017-07-20 07:57:15 -07:00 |
|
Matthew Marangoni
|
f521ef0402
|
Merge remote-tracking branch 'upstream/master' into call-manager
|
2017-07-19 11:55:45 -07:00 |
|
Matthew Marangoni
|
8139fa03ab
|
fixed issue with status being improperly used in custom events
|
2017-07-19 11:54:48 -07:00 |
|
Klaus
|
b2556695c4
|
Fix show public messages
|
2017-07-19 14:57:07 -03:00 |
|
Klaus
|
2bf0fc65db
|
Fix statment
|
2017-07-19 14:20:19 -03:00 |
|
Klaus
|
b70702dabe
|
Dynamic fetching the stun/turn servers
|
2017-07-19 09:44:47 -03:00 |
|
Matthew Marangoni
|
1feb7629d6
|
detailed errors and error codes are displayed in the audio notifications when an audio failed case is received
|
2017-07-18 17:04:12 -07: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 |
|
Klauswk
|
7173c0e20c
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-17 16:54:37 -03:00 |
|
Anton Georgiev
|
ed5460cba6
|
Merge pull request #4040 from Klauswk/html5-2x-captions-messages
[HTML5 2.0] Move captions messages to 2.0
|
2017-07-17 15:52:15 -04: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
|
3af281d648
|
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
|
2017-07-17 13:33:45 -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 |
|
Matthew Marangoni
|
d9a115aab6
|
added error code handling for fail cases
|
2017-07-14 08:57:06 -07: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 |
|
JaeeunCho
|
ccab71a898
|
changed MeetingId : meetingId to meetingId
|
2017-07-11 13:16:10 -07:00 |
|
JaeeunCho
|
fbdea71f8d
|
changed to divide meeting check
|
2017-07-11 12:26:07 -07:00 |
|
JaeeunCho
|
9938ee6575
|
added space under User check
|
2017-07-11 12:20:47 -07:00 |
|
JaeeunCho
|
b5852c8f45
|
changed code that Meeting is not existed
|
2017-07-11 12:19:02 -07:00 |
|
JaeeunCho
|
7fe20bb1f6
|
moved check logic into userLeaving
|
2017-07-11 10:43:33 -07:00 |
|
Klaus
|
55a9c0673e
|
Handling chat messages
|
2017-07-11 13:57:54 -03:00 |
|
JaeeunCho
|
a3c8c61d80
|
HTML5 - added check that current meeting is existed or not
|
2017-07-07 13:58:55 -07:00 |
|
JaeeunCho
|
28b81b32eb
|
changed function to pass two parameters
|
2017-07-07 08:18:19 -07: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 |
|
JaeeunCho
|
fd2b5926bc
|
changed error to warn and add clearUsers
|
2017-07-05 13:16:21 -07:00 |
|