Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats
2020-05-26 12:36:15 -04:00
Pedro Beschorner Marin
22c8eee0c7
Connection status first commit
2020-05-14 10:32:55 -03:00
Anton Georgiev
99d31e9d5f
Merge pull request #8648 from capilkey/2.2-new-audio-state
...
Use internal messages for call state instead of DTMF
2020-02-28 11:04:03 -05:00
Anton Georgiev
ecc02915d6
remove meteor package jquery and lodash
2020-02-26 10:24:38 -05:00
Chad Pilkey
6a4ba7a300
watch for voice call state updates instead of DTMFs in the client
2020-02-18 14:03:06 -08:00
Tainan Felipe
957225fabf
Rename collection to video-streams
2019-09-06 13:50:31 -03:00
Tainan Felipe
060e82dddf
Move hasStream to video-users collection
2019-09-05 15:29:30 -03:00
Joao Siebel
d556661873
save settings in a collection. close #7774
2019-07-29 11:17:38 -03:00
Tainan Felipe
88cfb70255
Add ping-pong message to html5 client
2019-07-01 16:00:27 -03:00
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
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
Klaus Klein
8a31d29e17
Acl refactor working
2017-06-01 14:32:04 -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
245ba3c4e3
Add client log, HTML5
2017-04-28 10:47:07 -03:00
perroned
dab5adb5be
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-html5/imports/ui/components/media/container.jsx
bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
perroned
92c3cdb746
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2017-02-23 19:20:37 +00:00
Oswaldo Acauan
99cfdb2062
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:44 +00:00
Oswaldo Acauan
8bd65c1a43
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Updated with correct version
Check for initial values in application.conf
remove defaultMessage
Remove wrong selector when upserting captions
Localize other labels through the application
localize labels for AudioSettings component
localize label for AudioTest component
hide option to reset status if there is no status (emojis)
drop voice in main room when joining breakout room
add defaultMessage for Public Chat
localize Join/Leave Audio labels
Remove console logs
Fix ´get_all_meetings_request´ being published multiple times
Clean captions when handling the history reply
Fix presentation slide coordinates
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
use localized Public Chat label
finish locals for the audio modal
Returning number of users that participated in each meeting in getRecordings call
add comment for condition
...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
a609c1feab
WIP. Refactor of get
2017-02-23 17:45:51 +00:00
perroned
2d04f057cc
Cleans up html5 screenshare
2017-02-22 20:31:09 +00:00
Oswaldo Acauan
b6bb8cc08d
Refactor user api handlers
2017-02-22 17:55:39 +00:00
Oswaldo Acauan
1f9f47ce16
Fix assignPresenter method
2017-02-22 13:42:42 +00:00
Oswaldo Acauan
28ba2fb4b0
WIP - Refactor users api
2017-02-07 15:29:27 +00:00
Oswaldo Acauan
fda22b0653
Refactor methods/events for user leaving iteractions
2017-02-07 13:08:06 +00:00
Oswaldo Acauan
32ba6ad724
Refactor method listenOnlyRequestToggle
2017-02-06 16:27:09 +00:00
Oswaldo Acauan
9c2b42e99a
Refactor publishers and method kickUser to the new pattern
2017-02-06 15:56:09 +00:00
Oswaldo Acauan
b4679bc601
Refactor Captions API
2017-01-18 12:53:33 +00:00
gcampes
655f8dd6d6
Fix merge conflicts
2016-11-23 13:33:51 -02:00
gcampes
bdb6780f7a
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
removed unecessary import statements
adjusted to meet component/container structure conventions and simplify code
Remove wrong commited files
Refactor API Cursor's
Fix bug related to presentation handlers
linting fixes & updated based on feedback
HTML5-clent messages on chat - changed icon for logged out users
fixed an error with exit audio
Added mute/unmute/join listen only/leave audio features to join audio modal
HTML5-client messages for logged out user on chat
HTML5-clent messages on chat
2016-11-21 10:53:55 -02:00
Oswaldo Acauan
b0e784ec60
Merge remote-tracking branch 'upstream/master' into refactor-api-shapes
...
* upstream/master:
Remove wrong commited files
Refactor API Cursor's
2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72
Refactor Shapes API
2016-11-18 17:35:28 +00:00
Oswaldo Acauan
b4f9d88fac
Refactor API Cursor's
2016-11-18 12:26:14 +00:00
Gabriel Carvalho de Campes
85013eac1f
Fix issues from merge
2016-11-16 15:44:05 -02:00
Anton Georgiev
74cf17e812
Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1
2016-11-14 21:31:21 +00:00
Gabriel Carvalho de Campes
214357adc6
Fix conflicts
2016-11-14 14:54:04 -02:00
Oswaldo Acauan
1df46bb201
Refactor of Presentations API
2016-11-11 19:02:46 +00:00
Oswaldo Acauan
2cf4bd3f5a
Merge conflicts
2016-11-10 15:13:02 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Gabriel Carvalho de Campes
a7335633d4
Refactor Poll API
2016-10-21 11:21:09 -02:00
Oswaldo Acauan
a76ab6e7e6
Refactor API Slides
2016-10-21 11:41:17 +00:00
Oswaldo Acauan
1d30281cf2
Refactor server Chat API
2016-10-19 12:18:47 +00:00
