Klaus
|
c32a64c02d
|
a few refactor made
|
2017-08-16 11:56:31 -03:00 |
|
Oleksandr Zhurbenko
|
76d778d9e5
|
Fixed 'Clear All' annotations for the multi-user mode
|
2017-08-15 15:30:11 -07:00 |
|
Anton Georgiev
|
5f1fb7542e
|
Merge pull request #4204 from Klauswk/fix-missing-state
[HTML5 2.0] Fix Audio Modal on Meeting Join
|
2017-08-15 15:11:47 -04:00 |
|
Anton Georgiev
|
f6e8e743e0
|
Merge pull request #4244 from KDSBrowne/fix-meeting-title
[HTML5] - Meeting title fix
|
2017-08-15 15:11:27 -04:00 |
|
KDSBrowne
|
66d1a3b06a
|
fix meeting title
|
2017-08-15 10:24:58 -07:00 |
|
Klaus
|
3730891d5f
|
Merge branch 'bbb-2x-mconf' into html5-breakout-2x-fix
|
2017-08-15 13:08:13 -03:00 |
|
Oleksandr Zhurbenko
|
9035386e76
|
Added multi-cursors
|
2017-08-14 17:15:11 -07:00 |
|
JaeeunCho
|
ab81ebfcfd
|
added new line at the end of service.js
|
2017-08-14 13:05:59 -07:00 |
|
JaeeunCho
|
11d181327c
|
created service.js moved makeCall to service.js
|
2017-08-14 13:03:37 -07:00 |
|
JaeeunCho
|
1dff7f0ef2
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
|
2017-08-14 12:56:56 -07:00 |
|
Klaus
|
dc62d15ad0
|
Change variable name
|
2017-08-14 16:19:35 -03:00 |
|
Klaus
|
e996bea1e9
|
Handling separate redis channel
|
2017-08-14 15:55:17 -03:00 |
|
Klaus
|
7c12ccb39e
|
Handling meeting end
|
2017-08-14 15:52:18 -03:00 |
|
JaeeunCho
|
237d1b6ac3
|
divided code into new container.jsx
|
2017-08-11 13:32:33 -07: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 |
|
JaeeunCho
|
8607eff5d6
|
changed fullScreen to fullscreen
|
2017-08-10 12:09:16 -07:00 |
|
JaeeunCho
|
3f773684bc
|
[HTML5] changed string id to camelCase
|
2017-08-10 10:34:34 -07:00 |
|
Oleksandr Zhurbenko
|
cd4150ebf5
|
Adjusted permissions for the multi-user cursorMove
|
2017-08-09 20:59:53 -07:00 |
|
JaeeunCho
|
405ead47c2
|
added new line at styles.scss
|
2017-08-08 15:29:22 -07:00 |
|
JaeeunCho
|
33f0104b5a
|
changed logout confirmation
|
2017-08-08 15:27:34 -07:00 |
|
Oleksandr Zhurbenko
|
f90a1d446f
|
Made whiteboard-toolbar display when multi-user mode is on
|
2017-08-08 13:55:38 -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
|
024fd2a796
|
Fix removed logic from the AudioContainer
|
2017-08-04 17:33:25 -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
|
e07c8b41af
|
Add autofocus when switching/entering chat
|
2017-08-04 15:32:21 -03:00 |
|
Oswaldo Acauan
|
78e88c8189
|
Fix unread counter
|
2017-08-04 15:20:54 -03:00 |
|
Oswaldo Acauan
|
720dddec24
|
Fix chat styles
|
2017-08-04 15:17:15 -03:00 |
|
Oswaldo Acauan
|
0022c121d3
|
Fix chat bug and styles
|
2017-08-04 14:58:55 -03:00 |
|
Klaus
|
0c6ac6364c
|
Fix missing state of audio modal
|
2017-08-04 09:24:57 -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 |
|
Klaus
|
e4e7f1da2c
|
Move domain functions to service.js
|
2017-08-03 11:10:05 -03: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 |
|
Oswaldo Acauan
|
00db9ee5bb
|
Comment out compact user-list toggle
|
2017-08-03 09:06:59 -03:00 |
|
Oswaldo Acauan
|
92da0ace60
|
Fix error when a user have no subName and hide compact toggle
|
2017-08-03 09:05:17 -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
|
e7b9eab5b6
|
Move makeCall to service file
|
2017-08-02 14:05:20 -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
|
35fd834397
|
Fix error when a user have no subName
|
2017-08-01 14:50:33 -03: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 |
|
JaeeunCho
|
e663458d01
|
added div for description
|
2017-08-01 09:17:03 -07:00 |
|
JaeeunCho
|
08818948ac
|
changed logout-confirmation and en.json
|
2017-08-01 09:09:06 -07: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
|
11cf4b8d78
|
A few fixes on client
|
2017-08-01 10:41:24 -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
|
9e58c33b10
|
Added 'resize' event to the notifications bar
To scale the whiteboard
|
2017-07-28 18:52:06 -07: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
|
e2c0971e57
|
Add new icons
|
2017-07-27 17:45:40 -03: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
|
d44299d221
|
Fix the missing string name
|
2017-07-25 15:57:20 -03: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
|
fade555d55
|
Add check for user permission
|
2017-07-21 15:17:25 -03:00 |
|
Klaus
|
39288e6e70
|
Add clear history, copy and save as chat options
|
2017-07-21 13:27:28 -03:00 |
|
Klaus
|
a63d8d5cf4
|
Add function to export public chat to clipboard and file
|
2017-07-21 11:39:51 -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
|
a4db665a47
|
Update container.jsx
|
2017-07-19 09:59:03 -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
|
507bb61fb2
|
Change user-list width
|
2017-07-18 10:55:19 -03: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 |
|
Oswaldo Acauan
|
dbb6b5cd12
|
New user-list colors
|
2017-07-18 10:12:26 -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 |
|
Anton Georgiev
|
bc9083c0cf
|
Merge pull request #4109 from Klauswk/fix-sass-path
[HTML5 - 2.0] Change relative path of the sass imports to absolute
|
2017-07-17 14:58:02 -04:00 |
|
Klaus
|
6b0edb353e
|
Change all from single quotes to double quotes
|
2017-07-17 15:56:05 -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
|
87943cb3f8
|
Change relative path of the sass to absolute
|
2017-07-17 15:21:45 -03:00 |
|
Klaus
|
2343ef3f1f
|
Add missing merge file
|
2017-07-17 13:38:18 -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
|
d7a4cd7a67
|
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
|
2017-07-14 16:15:26 -07:00 |
|
Oleksandr Zhurbenko
|
d7ec74dcde
|
Added initial PanZoomDrawListener
|
2017-07-14 16:14:38 -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 |
|
Anton Georgiev
|
d2d6e1d029
|
Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics
[HTML5] - Accessibility Contrast & Semantic Fixes
|
2017-07-14 15:17:49 -04: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 |
|
KDSBrowne
|
fc8cb5688b
|
change #fff to -white and fix lint issue
|
2017-07-14 10:39:33 -07:00 |
|
Anton Georgiev
|
a251305cab
|
Merge pull request #4036 from KDSBrowne/x0-userlist-jaws-fix
[HTML5] - ARIA fixes to work with JAWS
|
2017-07-14 13:26:07 -04: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
|
12f1254624
|
Fix missing merge in redis2x
|
2017-07-13 17:23:20 -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
|
f0e26c1bbb
|
Change missing strings to const
|
2017-07-12 17:22:26 -03:00 |
|
Klaus
|
111ad9171b
|
Remove strings and add constants
|
2017-07-12 17:15:50 -03:00 |
|
Klaus
|
8cd4b752ef
|
Remove strings and add constants
|
2017-07-12 17:02:55 -03:00 |
|
Klaus
|
2aa603d195
|
Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages
|
2017-07-12 16:29:07 -03:00 |
|
Klaus
|
1dfb054323
|
A few hotfixes to make the html5 client join again
|
2017-07-12 15:51:29 -03:00 |
|
Klaus
|
eb5712e96c
|
Fix chat list
|
2017-07-12 13:47:58 -03:00 |
|
Klaus
|
e1004b64d3
|
Filtering correct the messages
|
2017-07-12 10:54:54 -03:00 |
|