KDSBrowne
b2b36254ab
remove check from handler add exhaustive check to modifier
2017-09-07 10:33:23 -07:00
KDSBrowne
bc8718e263
fix line endidngs
2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f
remove need for separate headerBuilder function
2017-09-07 09:37:13 -07:00
KDSBrowne
13e6357b19
fix line endings
2017-09-07 07:31:19 -07:00
KDSBrowne
9193ae8849
handle UserLockedInMeetingEvtMsg
2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07:00
KDSBrowne
67ab2d5379
alternate solution test
2017-09-06 07:17:46 -07:00
Oleksandr Zhurbenko
65da71c12a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439
PR review fixes
2017-09-05 18:36:15 -07:00
KDSBrowne
c14e779bb4
add check to payload
2017-09-05 08:53:02 -07:00
Anton Georgiev
718828353e
Merge pull request #4321 from Klauswk/fix-acl-inconsistency
...
[HTML5] Fix inconsistency inside the ACL, #4310
2017-09-05 09:54:40 -04:00
Anton Georgiev
a68222dfff
Merge pull request #4181 from JaeeunCho/destroy_meeting_users
...
[HTML5 2.0] End meeting by moderator
2017-09-05 09:54:19 -04:00
JaeeunCho
43f6fd9c03
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-09-01 11:22:45 -07:00
Augusto Bennemann
5ec827e17d
HTML5 video with kurento (port)
2017-09-01 12:26:57 -03:00
KDSBrowne
2f9d4bcc0e
move isMeetingLocked condition check to userlist service
2017-08-31 11:12:53 -07:00
Oswaldo Acauan
a2268494e6
Move old files to the 2.0 folder
2017-08-31 09:56:51 -03:00
Oswaldo Acauan
6070a4ea25
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x
2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
28f7f8ad11
Minor fixes and adjustments
2017-08-30 16:12:03 -07:00
KDSBrowne
c244ef91ec
fix line endings
2017-08-30 11:35:40 -07:00
KDSBrowne
a01451f9fd
handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification
2017-08-30 11:00:56 -07:00
KDSBrowne
7cdf031a22
fix typo
2017-08-30 09:33:18 -07:00
KDSBrowne
f31a2df133
implement suggested changes
2017-08-30 09:31:08 -07:00
KDSBrowne
a8137c3054
switch to one function to create headers
2017-08-30 07:58:46 -07:00
Klaus
ade47254d3
Fix inconsistency inside the ACL, #4310
2017-08-28 16:48:46 -03:00
KDSBrowne
1ba4be58fd
removed unused functions
2017-08-28 09:14:18 -07:00
KDSBrowne
92c9af6d96
add functions to create headers
2017-08-28 07:29:26 -07:00
Oleksandr Zhurbenko
5d2b215591
Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection
2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1
Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation
2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f3481a7e4b
Turned on multi-user drawings
2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
2686c67ee7
Fixed a bug with pencil data not being added to the collection
2017-08-21 17:32:03 -07:00
Oleksandr Zhurbenko
d5f07a574c
Fixed publishShape message for 4 common shapes
...
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42
[HTML5] implemented promote/demote user
2017-08-18 11:23:05 -07:00
Oleksandr Zhurbenko
643d55938c
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-16 19:24:59 -07:00
Oleksandr Zhurbenko
76d778d9e5
Fixed 'Clear All' annotations for the multi-user mode
2017-08-15 15:30:11 -07:00
Klaus
7c12ccb39e
Handling meeting end
2017-08-14 15:52:18 -03:00
Klaus
de6b40a666
Fix counter in breakout notification
2017-08-11 17:17:35 -03:00
Klaus
17dce149d9
fix dropdown going missing
2017-08-11 15:02:26 -03:00
Klaus
babc981867
Messages been correct handle
2017-08-11 14:14:50 -03:00
JaeeunCho
b20ea78e2a
fixed conflict
2017-08-10 14:34:21 -07:00
Oleksandr Zhurbenko
cd4150ebf5
Adjusted permissions for the multi-user cursorMove
2017-08-09 20:59:53 -07:00
JaeeunCho
8590d2f414
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-08-08 12:31:56 -07:00
Klauswk
0ce41afabb
Merge branch 'bbb-2x-mconf' into html5-toggle-mute
2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-08 11:52:26 -03:00
Klaus
526518e740
Remove duplicate lines
2017-08-04 17:20:24 -03:00
Klaus
0807960da4
Fix missing method for mute user
2017-08-04 17:05:18 -03:00
Oswaldo Acauan
0022c121d3
Fix chat bug and styles
2017-08-04 14:58:55 -03:00
Oleksandr Zhurbenko
227f9d540f
Added permissions to Move Cursor presenter action
2017-08-03 14:18:01 -07:00
Oleksandr Zhurbenko
43566245ac
Added permissions to Undo and Clear All presenter actions
2017-08-03 14:09:19 -07:00
Anton Georgiev
6afb7ca8b3
Merge pull request #4124 from Klauswk/html5-2x-chat-options
...
[HTML5 2.0] Add public chat new options
2017-08-03 14:33:32 -04:00
Oswaldo Acauan
bc3679c0b4
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-03 09:53:44 -03:00
Anton Georgiev
1494c23858
Merge pull request #4189 from Klauswk/html5-hotfix-voiceuser
...
[HTML5 2.0] Fix VoiceUser microphone state
2017-08-03 08:53:01 -04:00
Oswaldo Acauan
b53636ec19
Fix avatar colors and text capitalization
2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-03 09:17:50 -03:00
Oleksandr Zhurbenko
fa1458c3eb
Handling and publishing multi-user mode switch
2017-08-02 18:24:38 -07:00
Klaus
7b8eb8027c
Merge clear annotations and annotationsWhiteboard
2017-08-02 17:14:01 -03:00
Klaus
4495c2e897
Move from annotation/ to annotations/
2017-08-02 16:52:13 -03:00
Klaus
c5646069fd
Using the older insert method inside addShape
2017-08-02 16:46:29 -03:00
Klaus
63fee3b615
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-02 11:36:16 -03:00
Klaus
d45ae64558
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-08-02 11:29:33 -03:00
Klaus
a0368e55cf
Fix voiceUser mic states
2017-08-02 10:11:53 -03:00
Oleksandr Zhurbenko
b207a1275e
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-01 13:49:46 -07:00
Anton Georgiev
64b597c420
Merge pull request #4179 from Klauswk/html5-2x-voice-user
...
[HTML5 2.0] Move AudioUsers to his own Collection
2017-08-01 14:38:26 -04:00
Oswaldo Acauan
df35a22676
Merge branch 'bbb-2x-mconf' into userlist-2x-design
2017-08-01 14:29:12 -03:00
Klaus
0a9abf6273
Remove user.listenOnly
2017-08-01 14:02:41 -03:00
Klaus
6cc46b8627
Add const to voiceUser
2017-08-01 13:04:20 -03:00
JaeeunCho
e4f94f1d91
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-08-01 08:55:02 -07:00
JaeeunCho
04636ca25b
[HTML5] added endMeeting by moderator
2017-08-01 08:53:05 -07:00
Klaus
fc6713013a
Move method to VoiceUser
2017-08-01 12:00:07 -03:00
Anton Georgiev
04a7781ea6
Merge pull request #4172 from mmarangoni/call-manager
...
[HTML5] Remove audio API duplication & Join Audio fix
2017-08-01 10:23:09 -04:00
Klaus
ed7d9a3a63
Change wrong log
2017-08-01 10:55:00 -03:00
Klaus
9d42ca9bd7
Move from users to voice-users
2017-08-01 10:10:12 -03:00
Anton Georgiev
2fd4bc4330
handle PresentationConversionCompletedEvtMsg
2017-07-31 17:08:09 -04:00
Matthew Marangoni
2494f48f52
removed unused constructor
2017-07-31 13:54:18 -07:00
Klaus
1ff3df770a
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user
2017-07-31 17:01:04 -03:00
Klaus
d06c49a6b8
Move from voice-user to voice-users
2017-07-31 16:36:41 -03:00
Anton Georgiev
7d50c01a4a
Merge pull request #4126 from Klauswk/html5-2x-handle-meeting-end
...
[HTML5 2.0] Handling meeting end
2017-07-31 15:29:15 -04:00
Anton Georgiev
1b2591653b
Merge pull request #4168 from oswaldoacauan/user-join-req-msg
...
[HTML5] Implements the new join flow
2017-07-31 15:25:24 -04:00
Oswaldo Acauan
f217304e19
Add publish to UserJoinMetting to the auth flow
2017-07-31 15:48:56 -03:00
Anton Georgiev
7b40122c89
Merge pull request #4121 from mmarangoni/call-manager
...
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Klaus
0a1091f871
Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x
2017-07-31 09:04:07 -03:00
Klaus
03f0061e2c
Fix lint
2017-07-31 09:03:46 -03:00
Oleksandr Zhurbenko
4e31181690
Resolve Alex cherry-pick
2017-07-31 08:30:08 -03:00
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
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
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
Oleksandr Zhurbenko
23263c997b
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-17 16:01:05 -07: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
Oleksandr Zhurbenko
1508ed566c
Resolved some of the issues related to the 2.0 switch
2017-07-14 16:20:16 -07:00
Oleksandr Zhurbenko
82a1ad2c8a
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
2017-07-14 15:43:41 -07: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
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
JaeeunCho
1a1fb6dc57
HTML5 - fixed errors when the meeting is ended by apimate
2017-07-05 07:59:18 -07: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
Matthew Marangoni
545a9ea978
fixed issue with changing locales
2017-06-27 15:41:56 -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
Matthew Marangoni
482591a2f5
spacing fixes
2017-06-27 10:38:31 -07: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
Matthew Marangoni
6f2f541787
change state when joining and leaving audio
2017-06-22 14:31:27 -07: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
ca09b69555
Merge branch 'Acl' into Refactor2x
...
* Acl:
Add check to undefined role
Lint to eslint
Missing merge file
Fix lint problems
Change Acl lookup
Change ACL to be more extensible
Fix a few review comments
Acl refactor working
Mostly working, still problems with user subs
Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
d88d4fb0bc
Add stuff from 2.x
2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
Matthew Marangoni
12d42aaecb
set state for AudioManager when joining or leaving audio
2017-06-16 13:22:17 -07:00
Matthew Marangoni
6dd71a3ee0
fixed merge conflicts
2017-06-14 11:26:11 -07:00
Matthew Marangoni
4beff48938
reconnecting wip
2017-06-14 11:07:18 -07:00
Oleksandr Zhurbenko
017ff470c3
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-07 13:29:35 -07:00
Klaus Klein
f135dbd129
Add check to undefined role
2017-06-07 10:02:31 -03:00
Oswaldo Acauan
2b3859d906
Fix linter errors and add missing package
2017-06-07 12:28:41 +00:00
Oswaldo Acauan
ccb6fd2a53
Fix merge conflicts
2017-06-07 12:01:18 +00:00
Anton Georgiev
18d9fb947e
Merge pull request #3986 from OZhurbenko/fix-chat-links
...
HTML5 - Chat links fix
2017-06-06 09:49:32 -04:00
Klaus Klein
59bb9fd31a
Lint to eslint
2017-06-05 16:12:06 -03:00
Klaus Klein
b574859ab2
Merge remote-tracking branch 'upstream/master' into Acl
...
* upstream/master:
Improve lint script
Update package-lock with the new packages
Add missing packages and fix formating
Switched from 2 deprecated packages
Corrected findDOMNode import for the poll shape
Switched from the deprecated react-addons-css-transition-group package to a recommended one
Updated react-meteor-data to remove a new React 15 warning
Updated main packages
Switched to prop-types package to remove new React 15 warnings
Improve ESLint rules
Linter auto fix
Change lint import configs to our pattern
Remove autofix script
Replace JSCS in favor of ESLint
2017-06-05 13:52:37 -03:00
Klaus Klein
d701966434
Fix lint problems
2017-06-05 13:40:36 -03:00
Klaus Klein
a96393e23c
Change Acl lookup
2017-06-05 11:16:19 -03:00
Oswaldo Acauan
1c5c74db67
Fix merge conflicts
2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f
Switched to prop-types package to remove new React 15 warnings
2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
47c1ac6083
Fixed links in the chat
2017-06-03 12:11:49 -07:00
Klaus Klein
6031b21067
Change ACL to be more extensible
2017-06-02 17:37:22 -03:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Klaus Klein
fc73992a63
Fix a few review comments
2017-06-01 17:40:55 -03:00
Klaus Klein
1db64e2bb7
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl
...
* 'master' of https://github.com/bigbluebutton/bigbluebutton :
HTML5 - removed 'lockedLayout' variable
Update README.md
Improved the detection if IP addresses in bbb-conf
Removing event listeners in handleHide
Fixed click listeners' initialization
Bump version number to 1.1.0
Update BigBlueButton.html
remove new lines being rendered in log/development.log
remove new operator
add suggested changes
HTML5 - put the order at media class
HTML5 - removed unused media query
HTML5 - removed unused media query
HTML5 - fixed order and slide control position
change file permission to 644
fix new lint issues
set files permission to 644
Fix client lint issues except those which are comment related
HTML5 - fixed fixed closed-caption display
HTML5 - fixed closed-caption display
2017-06-01 16:38:58 -03:00
Klaus Klein
8a31d29e17
Acl refactor working
2017-06-01 14:32:04 -03:00
Klaus Klein
de3a5e9cb6
Mostly working, still problems with user subs
2017-06-01 10:12:11 -03:00
Klaus Klein
a4c8ff493a
Code refactored
2017-05-31 14:54:43 -03:00
Matthew Marangoni
7f0a509223
Merge remote-tracking branch 'upstream/master' into call-manager
2017-05-26 12:14:13 -07:00
Anton Georgiev
250c6cdb8b
Merge pull request #3948 from KDSBrowne/x0-lint-Client
...
[HTML5] - Fix client lint issues
2017-05-25 13:57:04 -04:00
Oswaldo Acauan
9217ef7183
Fix bug when changing the current presentation
2017-05-23 14:05:42 +00:00
Matthew Marangoni
325f94679c
connected getMyUserInfo to BBB api
2017-05-19 13:35:10 -07:00
Matthew Marangoni
4a9463b152
Merge remote-tracking branch 'upstream/master' into call-manager
2017-05-19 11:31:49 -07:00
KDSBrowne
ff1a152f0b
remove new lines being rendered in log/development.log
2017-05-19 09:05:09 -07:00
Anton Georgiev
409a471ab5
bring catch clause on the same line as closing curly brace
2017-05-18 10:52:59 -04:00
Anton Georgiev
71d4e8b0e0
catch Meteor error on userLeaving
2017-05-17 15:17:27 -04:00
KDSBrowne
675a886fd0
fix merge conflicts
2017-05-16 09:28:28 -07:00
KDSBrowne
df76d33cba
set files permission to 644
2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c
Fix client lint issues except those which are comment related
2017-05-16 08:37:17 -07:00
Oleksandr Zhurbenko
371419c41c
Text shape preserves white space now and handles new lines
2017-05-12 12:46:10 -07:00
Oleksandr Zhurbenko
84aab7706a
Text shape preserves white space now and handles new lines
2017-05-12 12:43:06 -07:00
Anton Georgiev
b9f75f88ae
Merge pull request #3928 from JaeeunCho/locked_status
...
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
b5601ecabc
fix issue with userLeave on breakout end
2017-05-12 09:14:26 -04:00
JaeeunCho
ca808195f2
HTML5 - added locked status for users
2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Oleksandr Zhurbenko
8de7b895b5
Optimized and validated undo/clear/send annotation methods
2017-05-10 11:59:17 -07:00
Matthew Marangoni
7feba2b01f
moved callback to audio manager
2017-05-09 14:32:56 -07:00
Oleksandr Zhurbenko
f04dae31c8
Added a version for the shape model and implemented shouldComponentUpdate
...
Which prevents the shapes from being re-calculated if nothing has changed
2017-05-09 13:34:46 -07:00
Matthew Marangoni
e4dd786bd6
Merge remote-tracking branch 'upstream/master' into call-manager
2017-05-08 09:13:49 -07:00
Matthew Marangoni
2d8c5f26f1
inital call manager code
2017-05-05 14:39:16 -07:00
Oswaldo Acauan
b6bb795fa3
Add presenter upload capabilities
2017-05-05 17:17:38 -03:00
Anton Georgiev
93baf362e6
remove old import
2017-05-04 15:14:14 -04:00
Anton Georgiev
91ce6e20d5
unify user and audiouser in verto bridge
2017-05-04 14:44:20 -04:00
Oswaldo Acauan
1dc3bccb0d
Add presenter upload capabilities
2017-05-03 17:51:17 -03:00
Fred Dixon
837654dc85
Merge pull request #3895 from perroned/update-verto-libs
...
Update verto libs and WebRTC Extension
2017-05-03 16:50:34 -04:00
Anton Georgiev
3904771fc3
if microphone lock is enforced, pick listenOnly join over using mic
2017-05-03 16:12:47 -04:00
Anton Georgiev
038405f907
some changes to logClient api
2017-05-03 13:19:21 -04:00
Klauswk
b0b455e591
Merge branch 'master' into ClientLog
2017-05-03 13:40:57 -03:00
Oswaldo Acauan
ff5d3d1211
Merge remote-tracking branch 'upstream/master' into presentation-uploader
...
* upstream/master: (83 commits)
resolve issues with modal on breakouts
Update generate_css_dpi.sh comments.
Added multi-resolution generated css files for the mobile client.
Added a shell script to generate multi-dpi css files for the mobile client.
Fix origin on pencil cursor
Fix a missing bracket in mobile demo
Delete services directory.
New cursors for flash client
update mobile demo to support https
Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml
Delete services/bbb-web-api project.
Delete bbb-web-api project.
Renamed clours for mobile application styles.
Handle audio on refactored modal (#2 )
Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration.
fix lint issues
Fix the audio-modal
fix tabIndex for the settings closed caption submenu
remove extra list separator
fix console errors for missing key and invalid prop
...
2017-05-03 13:36:54 -03:00
Oswaldo Acauan
71fc15a803
Add presenter upload capabilities
2017-05-03 13:36:16 -03:00
perroned
66061fa33d
Handle lib update/fix errors
2017-05-03 14:13:53 +00:00
Klaus Klein
bede8ab447
Fix missing line and tab problem
2017-05-03 09:27:33 -03:00
Klaus Klein
131f23f42d
Fix lint problems
2017-05-02 08:30:32 -03:00
Oleksandr Zhurbenko
286f077ed3
Added initial drawing functionality for Line/Rectangle/Triangle/Ellipse
2017-05-01 14:34:24 -07:00
Klauswk
30b7c3c1e4
Merge branch 'master' into AddServerCallback
2017-04-28 17:28:45 -03:00
Klaus Klein
31ae8854c9
Lint problems fixed
2017-04-28 17:01:02 -03:00
Klaus Klein
5a4f05a41a
Fix requests on PR #3865
2017-04-28 14:12:08 -03:00
Klaus Klein
71d3c06d5e
Fix few lint issues
2017-04-28 11:03:35 -03:00
Klaus Klein
1c8e78d1c1
Merge with master
2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3
Add client log, HTML5
2017-04-28 10:47:07 -03:00
Oleksandr Zhurbenko
0039eba840
Whiteboard scaling/ositioning, svg coordinate system, ui fixes
...
Fixed whiteboard and wbtoolbar positioning in FF, set a proper SVG coordinate system, fixed scaling (let SVG scale everything)
2017-04-27 15:18:53 -07:00
Anton Georgiev
ef0d2f5729
Merge pull request #3861 from antobinary/disallow-moderator-2
...
HTML5: demote html5 moderator user to viewer based on flag
2017-04-27 16:17:49 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
Klaus Klein
d4917e975c
Review change
2017-04-26 17:07:22 -03:00
Klaus Klein
e56546137b
Change callServer function name
2017-04-26 10:47:44 -03:00
Klauswk
73fb753edb
Merge branch 'master' into FixAuthentication
2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6
Fix auth and user kick, HTML5 closes #3844 #3828
2017-04-25 14:04:17 -03:00
Anton Georgiev
c2b6f48b87
Merge pull request #3848 from antobinary/audio-restructuring
...
HTML5: Fix issue with listenOnly not hanging up
2017-04-25 12:04:32 -04:00
Anton Georgiev
c80827ee20
fix issue with listenOnly not hanging up
2017-04-24 17:17:53 -04:00
Oleksandr Zhurbenko
edabe3c623
Clear All Annotations functionality
2017-04-21 11:01:52 -07:00
Anton Georgiev
5f6dd8e5f6
Merge pull request #3839 from antobinary/audio-restructuring
...
[HTML5] Fix undefined voiceBridge
2017-04-20 16:55:15 -04:00
Anton Georgiev
d3bf2ab0b7
fix undefined voiceBridge
2017-04-20 16:53:55 -04:00
Anton Georgiev
a9f2a18475
Merge pull request #3834 from antobinary/audio-restructuring
...
[HTML5] Audio restructuring part 1
2017-04-20 16:00:59 -04:00
Anton Georgiev
5b0454a11c
Merge pull request #3836 from Klauswk/FixAvatarIssue
...
Fix avatar issue in chat, HTML5 #3830
2017-04-19 17:25:58 -04:00
Anton Georgiev
40d0417b9d
resolve lint warnings on modified files
2017-04-19 16:52:50 -04:00
Oleksandr Zhurbenko
1e4f16048f
Added an Undo Annotation functionality
2017-04-19 11:27:00 -07:00
Klaus Klein
23d472bcde
Fix avatar issue in chat, HTML5 #3830
2017-04-19 14:11:13 -03:00
Anton Georgiev
4c49f68771
pass params via bridge constructor
2017-04-19 11:01:28 -04:00
Anton Georgiev
9152bfbaf9
move deskshare verto outside of audio/
2017-04-19 10:59:57 -04:00
gcampes
0fd59394e7
remove unwanted debug, adds back log for error
2017-04-17 14:20:09 -03:00
gcampes
16c8497e36
Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix
...
* upstream/master: (26 commits)
Fix lint issues
Fix lint issues
Fix a few lint problems
fix missing import causing breakouts to not work
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
Fix poll options remain visible on html5, closes #3806 HTML5
- user internal userId instead of external userId in register user message
remove unnecessarily added svgs
updated icons to v11, adjusted few icons
Fix merge algoritm problem
set chat input color to gray (text-color)
Fixed user leave problem on private chat, close #3799 HTML5
align emojis horizontally
Check userId when validating token
Cleanup - remove extra > on meeting name on getRecording API response
Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
improved logic for updating message-list
Change to fetch from chat system id, issue #3792 HTML5
Fix multiple welcome messages, issue #3792 HTML5
...
2017-04-17 14:15:40 -03:00
gcampes
832d916fd8
Fix unauthorized on slow connection
2017-04-17 14:14:31 -03:00
Anton Georgiev
450d2f3435
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
2017-04-17 11:37:49 -04:00
Anton Georgiev
a7bda6b049
Merge pull request #3815 from Klauswk/FixPollOptionsHTML5
...
Fix poll options remain visible on html5, closes #3806 HTML5
2017-04-12 16:38:49 -04:00
Klaus Klein
e244459514
Fix lint issues
2017-04-12 17:37:37 -03:00
Klaus Klein
63b58a7f79
Fix lint issues
2017-04-12 17:33:14 -03:00
Klaus Klein
3ad7f9b5a0
Fix a few lint problems
2017-04-12 17:19:39 -03:00
Klaus Klein
3cd497fbbe
Fix poll options remain visible on html5, closes #3806 HTML5
2017-04-12 14:00:16 -03:00
Klauswk
9649f7523d
Merge branch 'master' into FixPrivateOfflineChatProblem
2017-04-12 08:33:07 -03:00
Anton Georgiev
a192eb5740
Merge pull request #3796 from Klauswk/FixWelcomeMessage
...
Fix multiple welcome messages, issue #3792 HTML5
2017-04-11 15:59:48 -04:00
Klaus Klein
419902cc8b
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-11 16:46:51 -03:00
Anton Georgiev
11871d7d0b
fix event name causing issues with listenOnly status
2017-04-10 16:18:05 -04:00
Klaus Klein
b432ffd68b
Change to fetch from chat system id, issue #3792 HTML5
2017-04-10 11:04:27 -03:00
Klaus Klein
6727f14ab7
Fix multiple welcome messages, issue #3792 HTML5
2017-04-10 09:55:22 -03:00
Gabriel Carvalho de Campes
82a3018171
[HTML5] - Fix user not being removed on tab close
2017-04-06 14:06:03 -03:00
Anton Georgiev
ad34d73ccc
Fix listenOnly status not set
2017-03-31 15:22:44 -04:00
Anton Georgiev
d26225b05d
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
2017-03-31 15:21:14 -04:00
Anton Georgiev
8893b3ce19
instantiate audioManager with bridge
2017-03-31 11:46:33 -04:00
