Joao Siebel
5a22f91572
Merge remote-tracking branch 'upstream/master' into network-indicator
2019-05-10 11:09:42 -03:00
Pedro Beschorner Marin
9867aa6b78
Shared notes lock settings first commit
2019-05-08 20:36:36 +00:00
Chad Pilkey
0cd79b7c05
move legacy browser versions into settings.yml
2019-05-01 17:33:03 -07:00
Chad Pilkey
098c8ce255
add alternate legacy browser content
2019-04-24 15:12:27 -07:00
Anton Georgiev
c268bed1ab
Revert "Add alternate legacy browser content"
2019-04-24 16:22:19 -04:00
Chad Pilkey
99fa3d6bb5
add alternate legacy browser content
2019-04-23 16:10:55 -07:00
Joao Siebel
c98db398fc
Merge remote-tracking branch 'upstream/master' into network-indicator
2019-04-22 09:18:02 -03:00
Joao Siebel
08d177dac0
add initial network logic
2019-04-18 18:15:48 -03:00
Maxim Khlobystov
3fa22c6908
User information lookup feature in HTML5 client.
2019-04-05 18:32:21 -04:00
Tainan Felipe
3648afcf3f
Add pending/guest users waiting to approval panel
2019-02-26 14:08:15 -03:00
Lucas Zawacki
550bbcd492
Share synchronized youtube video in presentation area
2019-01-14 14:40:27 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings
...
Custom user settings
2018-09-25 08:29:48 -04:00
João Francisco Siebel
4c35608c2b
Add users-settings collection and handle dynamic configuration
2018-09-13 15:09:30 -03:00
Oswaldo Acauan
5c9518bd27
Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948
2018-09-11 16:00:49 -03:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support
2018-08-01 14:24:00 -04:00
João Francisco Siebel
655483576f
fix unread messages counter on public chat and remove some old chat configurations
2018-07-27 10:44:21 -03:00
Joao Siebel
d8391f450b
use group chat messages in html5 client
2018-07-26 11:56:26 -03:00
Oswaldo Acauan
b7823c406c
Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods
2018-07-24 17:20:37 -03:00
Oleksandr Zhurbenko
04d6b06f50
Forgotten file
2018-04-09 16:19:23 -07:00
Oswaldo Acauan
8b9cc79c3d
Implement basic GroupChat messages. Closes #4987
2018-03-09 15:42:14 -03:00
prlanzarin
248dc7fa08
Fixed HTML5 video API import
...
Added chrome extension ID to HTML5 screenshare call
2017-11-17 18:55:59 +00:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -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
fa1458c3eb
Handling and publishing multi-user mode switch
2017-08-02 18:24:38 -07:00
Klaus
4495c2e897
Move from annotation/ to annotations/
2017-08-02 16:52:13 -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
9d42ca9bd7
Move from users to voice-users
2017-08-01 10:10:12 -03:00
Klaus
9bc9116e5c
handling a few messages
2017-07-31 08:10:52 -03:00
Klauswk
e751bcdadf
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
2017-07-27 17:27:35 -03:00
Klaus
c13155aa6a
Move shapes to annotations
2017-07-27 09:35:55 -03:00
Klaus
9ab4430f68
Fix merge stuff
2017-07-26 11:31:35 -03:00
Anton Georgiev
cacac6c9c6
Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare
2017-07-24 14:17:04 -04:00
Klauswk
7173c0e20c
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-17 16:54:37 -03:00
Klaus
5767583a86
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages
2017-07-17 15:37:06 -03:00
Klaus
7fb9bae75e
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-14 14:44:00 -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
6c602ba56f
Add missing import and add FIX ME
2017-07-13 17:28:35 -03:00
Klaus
55a9c0673e
Handling chat messages
2017-07-11 13:57:54 -03:00
Klaus
90ca216507
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-07 08:19:39 -03:00
Klaus
4c1c7ad65a
Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages
2017-07-06 17:36:56 -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
9b63e0c215
Add caption messages
2017-06-29 17:22:09 -03:00
Klaus
93927a3b53
Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages
2017-06-29 09:22:34 -03:00
Klaus
2098c2dff7
Handle polls messages
2017-06-28 17:37:45 -03:00
Klaus
a209f620e0
Add cursor support
2017-06-22 10:22:34 -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
