BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,074 Commits 13 Branches 260 Tags 1.1 GiB
abd2c41d64
Commit Graph

254 Commits

Author SHA1 Message Date
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
KDSBrowne
f31a2df133 implement suggested changes 2017-08-30 09:31:08 -07:00
KDSBrowne
14696a3cff fix lint issue 2017-08-30 08:03:19 -07:00
KDSBrowne
a8137c3054 switch to one function to create headers 2017-08-30 07:58:46 -07:00
KDSBrowne
82de509c55 fix typo 2017-08-29 07:00:41 -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
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03: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
1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user 2017-07-31 17:01:04 -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
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03: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
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
Matthew Marangoni
8902742573 wrapped BBB instantiation into init function and added to startup 2017-07-24 11:36:56 -07: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
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03: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
baf36d9d5f Fix the html5 2.0 user logout 2017-07-14 13:59:02 -03:00
Klauswk
38087a1669 Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:38:54 -03:00
Klaus
12f1254624 Fix missing merge in redis2x 2017-07-13 17:23:20 -03:00
Klaus
963248163d Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:14:02 -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
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
Klaus
4138f54f17 Fix Poll display on html5 2017-07-07 09:18:37 -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
Klaus
3d091e7a26 Change if 2017-07-06 15:07:52 -03:00
Klaus
9b32a4db2d Remove 'nodeJSapp' stuff, is deprecated 2017-07-06 15:01:05 -03:00
Klaus
dfa13b30f6 Add comment to change in the redis2x 2017-07-06 09:56:39 -03:00
Klaus
2058e14ae7 Fix lint problems 2017-07-06 09:29:17 -03:00
Klaus
cc38576f79 Add missing events 2017-07-06 08:58:38 -03: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
Anton Georgiev
19d89c6f92 trigger syncing with state from akka-apps 2017-06-30 10:58:49 -04: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
1c62543715 Remove check from meetingId 2017-06-29 10:27:59 -03:00
Klaus
27a92698cc Moved the meetingId to be last param 2017-06-29 10:09:11 -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
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
Anton Georgiev
e0a5fa48f4 add default webcam_stream and adjust emoji 2017-06-28 11:33:03 -04: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
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Klaus
c491d28b78 Handle most of the breakout messages 2017-06-26 15:00:28 -03:00
Klaus
a209f620e0 Add cursor support 2017-06-22 10:22:34 -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
0c596c304d Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis 2017-06-20 14:16:16 -03:00
Anton Georgiev
367b905ec5 use enter api to get meetingId, authToken, etc 2017-06-19 14:03:12 -04:00
Anton Georgiev
8e16114c3f html5client login now redirect=true to url+sessionToken 2017-06-19 14:01:24 -04: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
68f52aa107 Remove error from http response 2017-06-08 14:29:35 -03:00
Klaus Klein
e7e1243fef Add const to defaultLang 2017-06-06 09:43:57 -03:00
Klaus Klein
0d9525164f Add support to default system/browser language 2017-06-06 09:33:53 -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
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
beddf61532 remove new operator 2017-05-19 07:25:24 -07:00
KDSBrowne
159a47694e add suggested changes 2017-05-18 16:16:17 -07:00
KDSBrowne
d1543584ba change file permission to 644 2017-05-17 09:07:41 -07:00
KDSBrowne
f4d6f173ea fix new lint issues 2017-05-17 09:02:13 -07:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
Anton Georgiev
fc831440c3 Merge pull request #3932 from antobinary/address-error-500-and-stuck-users 
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
 2017-05-17 11:25:16 -04: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
Klaus Klein
2b53dd19e5 Code refactored 2017-05-15 16:45:00 -03:00
Klaus Klein
95b47fd54a Fix lang fallback error 2017-05-15 13:32:41 -03:00
Anton Georgiev
5191168492 auto allow benign actions 2017-05-11 15:15:12 -04:00
Anton Georgiev
e8fb481722 add logic to trigger logout if user timed out on auth step 2017-05-09 16:04:30 -04:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -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
Klaus Klein
3aacb71705 Remove unnecessary console.log 2017-04-27 10:43:21 -03:00
Klaus Klein
b99b73f334 Fix the double auth problem 2017-04-26 16:56:29 -03:00
Anton Georgiev
79fc24e817 Merge pull request #3823 from Gcampes/unauthorized-page-fix 
[HTML5] Fix unauthorized for slow connections
 2017-04-19 17:24:06 -04:00
gcampes
5c3754c614 Fix ids displaying instead of messages on locale change 2017-04-18 14:26:27 -03:00
gcampes
eda7648043 Merge remote-tracking branch 'upstream/master' into settings-localization-dropdown 
* upstream/master: (51 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.
  fix event name causing issues with listenOnly status
  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
  ...
 2017-04-17 15:49:35 -03: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