Oswaldo Acauan
|
d19c127b1f
|
Add redirect to /logout if not loggedin or on subscription errors
|
2017-12-13 16:20:56 -02:00 |
|
Oswaldo Acauan
|
2faf40e381
|
Throw meteor error when Acl fails for subscriptions
|
2017-12-13 16:20:37 -02:00 |
|
Tainan Felipe
|
004290183d
|
add screen to when the meeting is closed
|
2017-12-12 11:08:43 -02:00 |
|
prlanzarin
|
f43b77c19f
|
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
|
2017-11-11 03:41:37 +00:00 |
|
Maxim Khlobystov
|
bc1a4c473c
|
Merge pull request #4581 from Gcampes/locale-browser-default
Set initial locale to be the browser one
|
2017-11-06 11:16:36 -05:00 |
|
Anton Georgiev
|
63eb812f85
|
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
|
2017-11-02 10:41:45 -02:00 |
|
Oleksandr Zhurbenko
|
6ba09a3184
|
Fixed a logClient function call
|
2017-10-31 14:52:18 -07:00 |
|
Gabriel Carvalho de Campes
|
5237f200b5
|
removes console.log
|
2017-10-31 15:29:44 -02:00 |
|
Gabriel Carvalho de Campes
|
2e982114b5
|
Fix locale fetching issues
|
2017-10-31 15:13:44 -02:00 |
|
Gabriel Carvalho de Campes
|
75f82b923d
|
gets default language from config
|
2017-10-27 11:23:18 -02:00 |
|
Gabriel Carvalho de Campes
|
5a9a5fd1b0
|
code cleanup
|
2017-10-27 10:02:19 -02:00 |
|
Gabriel Carvalho de Campes
|
00bf09c4f9
|
Fix issue with locales
|
2017-10-27 09:36:27 -02:00 |
|
gcampes
|
d32330b208
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-24 11:19:58 -02:00 |
|
Oleksandr Zhurbenko
|
92fcc4bc74
|
Initial packages update
|
2017-10-23 17:09:40 -07:00 |
|
gcampes
|
b15322e7f2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-18 17:42:49 -02:00 |
|
Tainan Felipe
|
873d227819
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-13 10:35:38 -03:00 |
|
Oleksandr Zhurbenko
|
430ddc0d3b
|
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
|
2017-10-12 12:07:02 -07:00 |
|
Tainan Felipe
|
4bda76c5bb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-12 15:36:52 -03:00 |
|
Tainan Felipe
|
e74c44dd9d
|
fix errors linter
|
2017-10-12 14:02:46 -03:00 |
|
gcampes
|
fafbba06cb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-12 13:58:39 -03:00 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -03:00 |
|
Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
Anton Georgiev
|
a850d1c9c1
|
Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite
[HTML5] Redis class refactor
|
2017-10-11 17:40:28 -03:00 |
|
Oswaldo Acauan
|
7935cbff01
|
Fix file permissions
|
2017-10-11 12:35:43 -03:00 |
|
Oswaldo Acauan
|
10fff502f7
|
Add comment about redis.js
|
2017-10-11 12:34:56 -03:00 |
|
Oswaldo Acauan
|
c08f6a9c4f
|
Fix file permissions
|
2017-10-11 12:22:08 -03:00 |
|
Oswaldo Acauan
|
3e5dacdaf1
|
Change meetingQueue delete
|
2017-10-10 15:30:45 -03:00 |
|
Oswaldo Acauan
|
d8ed7e23ee
|
Remove debug message
|
2017-10-10 14:50:06 -03:00 |
|
Oswaldo Acauan
|
80a318309c
|
Implement multi queues and async messages on Redis class
|
2017-10-10 14:43:42 -03:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
Oswaldo Acauan
|
96ea918919
|
Fix file permissions
|
2017-10-09 17:20:27 -03:00 |
|
Oswaldo Acauan
|
7d664c8be7
|
Add a check for the passed credentials agains the token in Acl
|
2017-10-09 09:49:07 -03:00 |
|
Maxim Khlobystov
|
5f79db2554
|
Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal.
|
2017-10-06 16:29:52 +00:00 |
|
Anton Georgiev
|
5c071756a0
|
Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue
[HTML5] - logoutRouteHandler Fix
|
2017-10-02 13:33:54 -04:00 |
|
KDSBrowne
|
b2d78b4f8a
|
remove unused callback function
|
2017-09-29 09:21:04 -07:00 |
|
KDSBrowne
|
3633b460d4
|
clean up code with suggestion
|
2017-09-27 08:03:31 -07:00 |
|
KDSBrowne
|
3e7aab2bdd
|
add http:// to logoutURL if its not there
|
2017-09-27 06:56:40 -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 |
|
KDSBrowne
|
cd5da84984
|
make handlePublishError static
|
2017-09-13 15:57:52 -07:00 |
|
KDSBrowne
|
c7328a5bb7
|
fix: Expected 'this' to be used by class method 'handlerPublishError'
|
2017-09-13 13:50:04 -07:00 |
|
KDSBrowne
|
e3ed9aa84d
|
remove need for wrapper function
|
2017-09-13 12:47:52 -07:00 |
|
KDSBrowne
|
27dbe42189
|
pass this.pub as a parameter to _publish
|
2017-09-13 10:01:47 -07:00 |
|
KDSBrowne
|
91718abfba
|
add underscore to indicate private function
|
2017-09-13 09:10:28 -07:00 |
|
KDSBrowne
|
41b629b232
|
make publish function private to RedisPubSub2x class
|
2017-09-13 08:29:23 -07:00 |
|
KDSBrowne
|
571c3763dd
|
add publishVoiceMessage
|
2017-09-12 10:58:06 -07:00 |
|
KDSBrowne
|
090b3e91c2
|
add comment to publish
|
2017-09-12 10:25:41 -07:00 |
|
KDSBrowne
|
c987ef6635
|
add publishSystemMessage
|
2017-09-12 09:11:08 -07:00 |
|
KDSBrowne
|
39bd590329
|
rework header creation
|
2017-09-12 08:52:02 -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 |
|
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 |
|
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 |
|
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 |
|