Anton Georgiev
30c43795af
work on chat alert
2018-10-16 17:48:27 +00:00
Anton Georgiev
1462810b96
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0
2018-09-06 22:06:40 +00:00
Felipe Cecagno
62311387b8
more changes to configure redis using environment variables
2018-08-24 17:15:47 -03:00
Diego Sampaio
6fbb577a9f
Fix redis connection using private settings
2018-08-24 17:15:47 -03:00
Richard Alam
14327a1edf
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch
2018-06-19 12:58:51 -07:00
Anton Georgiev
8aed93c315
improve error logs
2018-06-14 19:01:49 +00:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations"
2018-04-25 20:41:19 -04:00
Maxim Khlobystov
8e2cfce7ff
Improved the error logging when doing bulkWrite.
2018-04-25 20:14:27 +00:00
Maxim Khlobystov
4db94b4489
Some cleanup and code optimizations.
2018-04-25 15:15:36 +00:00
Maxim Khlobystov
8d1e80fbf0
Put the bulk lifespan value into configs.
2018-04-25 14:27:53 +00:00
Maxim Khlobystov
f321011a6f
Cleaned up some console logs.
2018-04-24 15:10:02 +00:00
Maxim Khlobystov
4ef8f0d0c6
Moved pencil to bulk updates.
2018-04-24 13:59:13 +00:00
Maxim Khlobystov
fa58101039
Added time-based grouping for common shapes upserting.
2018-04-05 16:19:41 -04:00
Anton Georgiev
bbab765f82
print length of queue of redis messages to be processed
2018-04-02 20:16:46 +00:00
Anton Georgiev
337bcd616c
add logs to debug user join handler
2018-03-16 18:57:27 +00:00
Oleksandr Zhurbenko
e1568baa24
Fixed the logging of the Meteor serser-side methods
2018-02-05 12:34:03 -08:00
Ghazi Triki
a2feb9bf5b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
Anton Georgiev
44cf02424f
Adjust user guesStatus User property to handle join in BBB 2.1
...
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
2018-01-11 15:05:19 -05:00
Oleksandr Zhurbenko
2de02c4f8d
Linting
2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a
Switched from the broken 4commerce:env-settings package to native Meteor.settings
2018-01-07 16:24:05 -08:00
Oleksandr Zhurbenko
430ddc0d3b
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
2017-10-12 12:07:02 -07:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07: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
80a318309c
Implement multi queues and async messages on Redis class
2017-10-10 14:43:42 -03:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07:00
Anton Georgiev
3ab794cbdb
obtain meetingId outside handler
2017-06-28 16:04:41 -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
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +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
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Oswaldo Acauan
3923cf4073
Add debug message when handler is completed with errors
2016-10-21 16:29:22 +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
