KDSBrowne
|
9da39339cd
|
remove unused checks
|
2017-10-06 10:56:56 -07:00 |
|
KDSBrowne
|
d70bfdb337
|
remove code duplication
|
2017-10-06 10:52:14 -07:00 |
|
KDSBrowne
|
36ebec64c5
|
change modifier name
|
2017-10-06 09:16:55 -07:00 |
|
KDSBrowne
|
fc4b0dbcb1
|
add changeRole handler call to changeRole modifier
|
2017-10-06 09:10:23 -07:00 |
|
KDSBrowne
|
5c1ff8efbc
|
fix promoted users not being able to execute moderator actions
|
2017-10-06 08:18:27 -07:00 |
|
KDSBrowne
|
b20ab84abd
|
make changeRole.js return publishUserMessage
|
2017-10-06 06:31:56 -07:00 |
|
gcampes
|
40795950c2
|
updates to the audio manager
|
2017-10-04 17:49:11 -03:00 |
|
Anton Georgiev
|
6b1a29eab4
|
Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
|
2017-10-04 14:05:03 -04:00 |
|
Anton Georgiev
|
0bc3490ecc
|
Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
|
2017-10-04 11:47:07 -04:00 |
|
KDSBrowne
|
f635dbf2ae
|
remove import and function call
|
2017-10-04 08:45:05 -07:00 |
|
KDSBrowne
|
d347864b19
|
update removeUser modifier props
|
2017-10-04 08:22:56 -07:00 |
|
KDSBrowne
|
7225590c05
|
fix userEjected modifier and change if condition
|
2017-10-04 07:57:16 -07:00 |
|
KDSBrowne
|
e241d6bf68
|
remove unused voice-user method
|
2017-10-04 07:39:13 -07:00 |
|
Oleksandr Zhurbenko
|
ab95c87f48
|
Fixed wb toolbar console warnings cause by improper props validation
|
2017-10-03 14:28:44 -07:00 |
|
gcampes
|
81a430039d
|
add echo test component. WIP
|
2017-10-03 17:42:10 -03:00 |
|
KDSBrowne
|
83d4474b51
|
remove if statment and unused imports
|
2017-10-03 13:03:18 -07:00 |
|
KDSBrowne
|
078e8b579a
|
remove Logger messages and switch allowHTML5Moderator to false
|
2017-10-03 12:38:59 -07:00 |
|
KDSBrowne
|
af4676ea38
|
pass userId to publishUserMessage
|
2017-10-03 12:20:03 -07:00 |
|
KDSBrowne
|
2d62b79165
|
switch to correct event name
|
2017-10-03 12:12:19 -07:00 |
|
Oleksandr Zhurbenko
|
76bcdd55d6
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-10-03 10:34:10 -07:00 |
|
KDSBrowne
|
3eed1ec1c0
|
remove voice user check in userEjected.js
|
2017-10-03 08:45:36 -07:00 |
|
KDSBrowne
|
9bad8d8d5d
|
add kickVoiceUser and fix presenter assign bug
|
2017-10-03 08:25:56 -07:00 |
|
Oswaldo Acauan
|
230a2d5263
|
Fix silent changes caused by the old pr revert
|
2017-10-02 11:12:58 -03:00 |
|
gcampes
|
37456c9db4
|
updates do sip bridge
|
2017-09-29 17:42:34 -03:00 |
|
Oswaldo Acauan
|
89c2947d78
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge
|
2017-09-29 17:32:31 -03:00 |
|
KDSBrowne
|
bc0647ad50
|
fix merge conflicts
|
2017-09-29 12:04:27 -07:00 |
|
KDSBrowne
|
3b6aed34ae
|
check for voice user and remove if exists
|
2017-09-29 11:58:24 -07:00 |
|
Anton Georgiev
|
7c5683c866
|
Merge pull request #4291 from Klauswk/html5-refactor-userlist
[HTML5 2.0] Refactor UserList Components
|
2017-09-29 14:08:12 -04:00 |
|
Oswaldo Acauan
|
c186840c3c
|
Fix current presentation being unset
|
2017-09-29 11:13:54 -03:00 |
|
Oswaldo Acauan
|
0e10fa2aa6
|
Fix typo
|
2017-09-29 11:10:35 -03:00 |
|
gcampes
|
82e62ee2a6
|
fix to sip bridge
|
2017-09-29 10:59:30 -03:00 |
|
gcampes
|
a26f622ba9
|
gets audio to work
|
2017-09-29 10:58:13 -03:00 |
|
gcampes
|
6d0d6f6651
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-29 10:52:12 -03:00 |
|
Oswaldo Acauan
|
19e3075dec
|
Add missing body check
|
2017-09-29 10:50:46 -03:00 |
|
Oswaldo Acauan
|
a5135f28e6
|
Renamte presentationChange handler
|
2017-09-29 10:50:05 -03:00 |
|
Oswaldo Acauan
|
c8042ce65b
|
Rename handlers from change to set to match akka
|
2017-09-29 10:42:17 -03:00 |
|
gcampes
|
d15f0e1183
|
linter autofix
|
2017-09-29 10:42:08 -03:00 |
|
gcampes
|
cbb897b23f
|
audio connects. WIP
|
2017-09-29 10:38:10 -03:00 |
|
Oswaldo Acauan
|
54efe44345
|
Rename share method to set to match akka
|
2017-09-29 10:29:55 -03:00 |
|
Oswaldo Acauan
|
2a7fd5ba4d
|
Rename share method to set to match akka
|
2017-09-29 10:01:01 -03:00 |
|
Oswaldo Acauan
|
7f5d5b8064
|
Change defaultFileName check to match config
|
2017-09-29 09:44:36 -03:00 |
|
Oswaldo Acauan
|
bc6283e722
|
Remove constraint for not deleting the current presentation
|
2017-09-29 09:41:45 -03:00 |
|
Oswaldo Acauan
|
27b89361c0
|
Add missing check
|
2017-09-29 09:40:40 -03:00 |
|
KDSBrowne
|
a60b7e26a6
|
add kickUser method
|
2017-09-28 10:41:02 -07:00 |
|
KDSBrowne
|
10c75afe99
|
switch handler, modifier and collection prop to ejected
|
2017-09-27 14:20:22 -07:00 |
|
Oleksandr Zhurbenko
|
b3723c34d4
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-26 14:08:41 -07:00 |
|
Oleksandr Zhurbenko
|
b02cbb3208
|
Removed redundand brackets
|
2017-09-26 13:36:47 -07:00 |
|
Oswaldo Acauan
|
a3f74842b4
|
Bug fixes
|
2017-09-26 16:45:33 -03:00 |
|
gcampes
|
152527d1ab
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-26 14:25:11 -03:00 |
|
Oleksandr Zhurbenko
|
76808b3e7d
|
Fixed a bug with the current slide being unset
|
2017-09-25 17:00:08 -07:00 |
|
Oleksandr Zhurbenko
|
ce04cfb83b
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-25 16:48:03 -07:00 |
|
Anton Georgiev
|
91f912ce4b
|
Merge pull request #4416 from OZhurbenko/mongo-indexing
Added indexes for the html5 Mongo collections
|
2017-09-25 15:57:07 -04:00 |
|
KDSBrowne
|
cad085a495
|
add kicked prop
|
2017-09-25 11:38:36 -07:00 |
|
KDSBrowne
|
9a145c64a8
|
fix set properties and client kicked condition
|
2017-09-25 11:32:09 -07:00 |
|
KDSBrowne
|
31223e86ec
|
remove nested user and voiceUser keys
|
2017-09-25 08:57:39 -07:00 |
|
Oswaldo Acauan
|
dd83d213fa
|
Fix missing conversion handlers
|
2017-09-22 17:43:07 -03:00 |
|
Oswaldo Acauan
|
36699bedb1
|
Merge remote-tracking branch 'upstream/master' into presentation-manager-merge
|
2017-09-22 15:11:48 -03:00 |
|
Klaus
|
4d51e0c045
|
Fix unsplited styles and code duplicated
|
2017-09-22 11:24:24 -03:00 |
|
Oleksandr Zhurbenko
|
e054358947
|
Created a whiteboard config and moved static values there
|
2017-09-21 16:44:32 -07:00 |
|
Oleksandr Zhurbenko
|
d19814dc55
|
Prevented html5 from throwing exceptions if the slide file doesn't exist
|
2017-09-21 14:02:50 -07:00 |
|
Klaus
|
29922c896a
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist
|
2017-09-21 15:40:18 -03:00 |
|
KDSBrowne
|
b35b16f642
|
rename functions to past tense
|
2017-09-21 10:55:07 -07:00 |
|
KDSBrowne
|
30da581d6d
|
rename user prop to match 2.x
|
2017-09-21 10:50:06 -07:00 |
|
KDSBrowne
|
b988dadf89
|
switch relative with absolute import path
|
2017-09-21 10:40:19 -07:00 |
|
KDSBrowne
|
93d7c9f4ce
|
change variable declaration
|
2017-09-21 10:21:25 -07:00 |
|
KDSBrowne
|
8418317e03
|
handle UserEjectedFromMeetingEvtMsg
|
2017-09-21 09:21:42 -07:00 |
|
Oleksandr Zhurbenko
|
a46469557f
|
Minor corrections and improvements based on the #4345 reviews
|
2017-09-20 14:34:22 -07:00 |
|
Oleksandr Zhurbenko
|
2b10d5c1a7
|
Fixed based on the review of #4345
|
2017-09-20 14:05:17 -07:00 |
|
Anton Georgiev
|
90db7326b8
|
Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug
[HTML5] - Fix clear chat feature
|
2017-09-20 14:13:05 -04:00 |
|
Anton Georgiev
|
e22da926bb
|
Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete
[HTML5] - Remove requestStunTurn
|
2017-09-19 15:53:08 -04:00 |
|
gcampes
|
ea637a1e49
|
first changes to audio components and services. WIP
|
2017-09-19 16:31:04 -03:00 |
|
KDSBrowne
|
2e1fb712a1
|
use userId instead of username
|
2017-09-19 12:01:02 -07:00 |
|
KDSBrowne
|
bd8c57eb45
|
remove log messages
|
2017-09-19 11:57:08 -07:00 |
|
KDSBrowne
|
6b6d431a5b
|
switch variable positions in object
|
2017-09-19 11:55:32 -07:00 |
|
KDSBrowne
|
9b3bb04a90
|
fix clear chat feature
|
2017-09-19 10:39:13 -07:00 |
|
KDSBrowne
|
4388fc4b0f
|
remove requestStunTurn
|
2017-09-19 08:42:10 -07:00 |
|
Augusto Bennemann
|
2067c50c55
|
HTML5 video for bbb2.0
|
2017-09-19 10:53:27 -03:00 |
|
Oleksandr Zhurbenko
|
838382b6f9
|
Moved presentation overlays' rendering to a separate function
|
2017-09-18 16:54:52 -07:00 |
|
Oleksandr Zhurbenko
|
ff4e7bffd0
|
Fixed a bug with the helper's import
|
2017-09-18 16:52:20 -07:00 |
|
Oleksandr Zhurbenko
|
537175dad2
|
Moved part of the presentation display calculations to the server side
|
2017-09-18 15:20:44 -07:00 |
|
Oleksandr Zhurbenko
|
d57f60fe09
|
Adjusted publish calls to #4385
|
2017-09-18 12:18:37 -07:00 |
|
Oleksandr Zhurbenko
|
c9552247b2
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-18 12:08:14 -07:00 |
|
Oleksandr Zhurbenko
|
9e1c8a4fb7
|
Permissions fix
Can't afford WebStorm :-(
|
2017-09-17 19:01:48 -07:00 |
|
Oleksandr Zhurbenko
|
c7d737e9b8
|
Improvements based on the PR review
|
2017-09-17 18:58:37 -07:00 |
|
Augusto Bennemann
|
31f2e1cac7
|
HTML5 ScreenShare Presenter
|
2017-09-12 17:47:06 -03:00 |
|
KDSBrowne
|
4b7d790a57
|
change variable name
|
2017-09-12 11:13:27 -07:00 |
|
KDSBrowne
|
571c3763dd
|
add publishVoiceMessage
|
2017-09-12 10:58:06 -07:00 |
|
KDSBrowne
|
39bd590329
|
rework header creation
|
2017-09-12 08:52:02 -07:00 |
|
Oleksandr Zhurbenko
|
39ba2d12de
|
Fixed permissions
|
2017-09-11 12:13:42 -07:00 |
|
Oleksandr Zhurbenko
|
eca8090bac
|
Adjusted the PR 'methods' to #4322
|
2017-09-11 12:12:39 -07:00 |
|
Oleksandr Zhurbenko
|
43b3b89c6a
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-11 12:11:03 -07:00 |
|
Anton Georgiev
|
802b3bb4fb
|
Merge pull request #4322 from KDSBrowne/x2.0-header-functions
[HTML5] - Add header functions
|
2017-09-11 14:00:15 -04:00 |
|
KDSBrowne
|
89de2f771b
|
change parameter name to header
|
2017-09-11 10:19:06 -07:00 |
|
Augusto Bennemann
|
1aa5cc5235
|
HTML5 ScreenShare Viewer
HTML5 ScreenShare Viewer
|
2017-09-11 13:40:56 -03:00 |
|
Anton Georgiev
|
bf35fa7a4c
|
Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
[HTML5] - Fix Userlist Lock Notification
|
2017-09-11 12:07:17 -04:00 |
|
KDSBrowne
|
467ffaba49
|
change log message
|
2017-09-11 06:46:19 -07:00 |
|
Oleksandr Zhurbenko
|
7e6ad07b76
|
Added indexes for the html5 Mongo collections
|
2017-09-07 16:41:03 -07:00 |
|
Oswaldo Acauan
|
c0307e36a6
|
Presentation Uploader to 2.0
|
2017-09-07 15:18:14 -03:00 |
|
KDSBrowne
|
b0f3ca7a1a
|
remove unused import
|
2017-09-07 10:41:26 -07:00 |
|
KDSBrowne
|
876097a0f4
|
fix line endings
|
2017-09-07 10:38:00 -07:00 |
|
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 |
|