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
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
gcampes
832d916fd8
Fix unauthorized on slow connection
2017-04-17 14:14:31 -03:00
Klaus Klein
419902cc8b
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-11 16:46:51 -03:00
gcampes
4f9cf64a49
Fix issue with locale merging
2017-04-11 15:31:51 -03:00
gcampes
1c26137177
removes unnecessary log
2017-04-06 10:14:12 -03:00
gcampes
9a641c09aa
Remove unwanted changes
2017-04-06 10:09:34 -03:00
gcampes
ded1de0b40
Adds localization dropdown
2017-04-06 09:36:59 -03:00
Oswaldo Acauan
72dc94ab31
Remove old Kicked screen in favor of the new error screen
2017-03-17 14:38:18 +00:00
Oswaldo Acauan
2090883b03
Refactor Auth logout and credentials getter
2017-03-17 14:23:00 +00:00
Oswaldo Acauan
f020964c50
Fix merge conflicts
2017-03-16 20:25:14 +00:00
Oswaldo Acauan
8d21c435b5
Refactor of the App component
2017-03-16 16:52:43 +00:00
Oleksandr Zhurbenko
d7b5ae3c36
Fixed permissions and some exceptions
2017-03-13 12:15:58 -07:00
Oswaldo Acauan
2129979112
Fix error screen
2017-03-10 20:47:23 +00:00
Oswaldo Acauan
9c84105319
Add missing packages
2017-03-10 19:18:23 +00:00
Oswaldo Acauan
d6780c3013
Refactor Authentication flow
2017-03-10 18:33:46 +00:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
Oswaldo Acauan
74f123cdc9
Refactor of get_users_reply handler
2017-02-23 17:59:56 +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
1f9f47ce16
Fix assignPresenter method
2017-02-22 13:42:42 +00:00
Oswaldo Acauan
1975503966
Remove console logs
2017-02-14 16:12:03 +00:00
Oswaldo Acauan
ffdcb5258b
Fix ´get_all_meetings_request´ being published multiple times
2017-02-14 16:09:42 +00:00
Oswaldo Acauan
30d67897ef
WIP - Refactor users api
2017-02-10 12:24:14 +00:00
Anton Georgiev
f72ae316c7
rework userPermissions to allow mixture of role/status based actions
2017-02-02 11:41:48 -05:00
Anton Georgiev
fc27dc9a5c
clean up
2017-02-01 14:27:25 -05:00
Anton Georgiev
48a4b180fb
improve userPermissions by rearranging logic
2017-02-01 14:18:27 -05:00
Anton Georgiev
0dbb8d62ca
allow for mute/unmute by moderator
2017-02-01 14:14:32 -05:00
KDSBrowne
24643f01dd
using config file for logger level
2016-12-01 08:15:57 -08:00
KDSBrowne
043c3f71cd
added logger config and set level
2016-11-30 08:29:13 -08:00
Oswaldo Acauan
71fb7abd70
Refactor stuns/turns handler
2016-11-03 13:33:14 +00:00
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Oswaldo Acauan
c590f3ffd9
Merge branch 'rewrite-queue-handler' into refactor-meetings-api
...
* rewrite-queue-handler:
Remove left over debug
Fix chat being always inserted when the server start
Add debug message when handler is completed with errors
2016-10-21 16:57:01 +00:00
Oswaldo Acauan
3923cf4073
Add debug message when handler is completed with errors
2016-10-21 16:29:22 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Oswaldo Acauan
1d30281cf2
Refactor server Chat API
2016-10-19 12:18:47 +00:00
Oswaldo Acauan
79cdf636eb
Rewrite Redis related classes
2016-10-18 12:03:51 +00:00
Anton Georgiev
11f0c2da03
Merge pull request #3401 from KDSBrowne/Localization-update
...
Localization update #1
2016-10-13 10:44:13 -04:00
KDSBrowne
993dc70525
Cleaned up code
2016-10-12 10:03:10 -07:00
KDSBrowne
720c16f3ac
Moved over the previous solution to the server side and cleaned up the code
2016-10-07 09:36:27 -07:00
Lajellu
c68ad3240d
HTML5 - adds Emoji showing up on user list
2016-09-26 13:29:44 -07:00
Anton Georgiev
e1cec10670
clean up
2016-08-24 23:13:42 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Laily Ajellu
2105e911ef
HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js
2016-08-23 14:35:28 -07:00
Oleksandr Zhurbenko
7054b36721
Minor corrections
2016-08-22 08:34:46 -07:00
Oleksandr Zhurbenko
d9ddbfbda6
Cleanup, linting, fixed css modules' imports
2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
f64ed1fd4a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
2016-08-20 16:37:11 -07:00
Lajellu
19ff007adb
Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup
2016-08-19 14:08:46 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Oswaldo Acauan
afe1a66e02
Fix conflicts and merge master
2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c
Add handlers for kick
2016-07-28 19:48:26 +00:00
Oleksandr Zhurbenko
d510907179
Upgraded Meteor to 1.4
2016-07-27 14:50:35 -07:00
Anton Georgiev
a1fde6ae12
add httpS flag in config instead of detecting prod vs dev env
2016-07-27 16:36:33 +00:00
