Commit Graph

2614 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
68aba8e0a2 Ajusted multi-user change to the new message format 2018-04-11 13:50:00 -07:00
Oleksandr Zhurbenko
0ae0d56348 Adjusted switchSlide to the new message format 2018-04-11 13:05:30 -07:00
Oleksandr Zhurbenko
6045dfd1bc Ignoring annotation history messages that don't target Meteor 2018-04-10 16:49:56 -07:00
Oleksandr Zhurbenko
4afc455e8a Corrected indexing for Slides, Presentation, Pods, and Annotations 2018-04-10 16:27:11 -07:00
Oleksandr Zhurbenko
a39700bc79 Corrected cursor messages, added whiteboardId 2018-04-09 23:08:23 -07:00
Oleksandr Zhurbenko
6c1e791adb Added a layer for the presentation pods component 2018-04-09 22:24:04 -07:00
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07:00
Oleksandr Zhurbenko
04d6b06f50 Forgotten file 2018-04-09 16:19:23 -07:00
Oleksandr Zhurbenko
0c8f1a3bfd Adjusted multi-user for 2.1 2018-04-09 16:18:49 -07:00
Oleksandr Zhurbenko
a3f21ee1ce Adjustments to support presentation pods in 2.1 2018-04-09 12:48:37 -07:00
Oleksandr Zhurbenko
f4ab6b76f3 Corrected handlers.js 2018-04-05 15:31:39 -07:00
Oleksandr Zhurbenko
df98f394dd Handle SyncGetPresentationPods 2018-04-05 15:29:58 -07:00
Oleksandr Zhurbenko
69d8dedaab Corrected the collection name 2018-04-05 15:00:52 -07:00
Oleksandr Zhurbenko
b2708d2a2a Handling SetPresenterInPod 2018-04-05 14:04:27 -07:00
Oleksandr Zhurbenko
65cf1d6c16 Handle RemovePresentationPod 2018-04-05 13:56:41 -07:00
Oleksandr Zhurbenko
e5a4bd09b4 Handle CreateNewPresentationPod message 2018-04-05 12:59:26 -07:00
Richard Alam
06faa8a448 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-31 14:38:43 -08:00
Anton Georgiev
528f94b15a
Merge pull request #5062 from antobinary/html5-daily-log-rotation-2
Added daily log rotation in production env
2018-01-31 11:11:58 -05:00
Anton Georgiev
f789842ccb
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user
Prevent kicked user's ability to rejoin meeting via back btn
2018-01-30 15:10:46 -05:00
KDSBrowne
5b93033126 remove window.popstate and add onLeave to meeting-ended route 2018-01-30 08:39:43 -08:00
KDSBrowne
2809b6a825 remove setTimeout and add handler 2018-01-30 08:12:05 -08:00
Anton Georgiev
ab39163070 put month before day in log rotation name 2018-01-30 10:37:00 -05:00
KDSBrowne
6b1e39008c move if condition for User.ejected 2018-01-29 20:23:56 -08:00
Anton Georgiev
9e05f346c7 added daily log rotation in production env 2018-01-29 16:50:32 -05:00
Richard Alam
962b520d6a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-29 12:53:20 -08:00
KDSBrowne
aa4a7ef48c clean up code 2018-01-29 11:07:02 -08:00
KDSBrowne
90bfea5d77 check if user was ejected 2018-01-29 10:17:52 -08:00
Anton Georgiev
fa24ca01f9
Merge pull request #4986 from lfzawacki/ice-cold-corrections
Corrections to HTML5 video ICE message cycle and the share video button
2018-01-29 10:20:36 -05:00
KDSBrowne
d0f6e4f3a2 add console logs to determin flow 2018-01-26 14:17:34 -08:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08:00
Maxim Khlobystov
61fc6ec911
Merge pull request #5031 from jfsiebel/fix-issue-4999
Exit from audio when in meeting ended to prevent echo test
2018-01-26 13:47:18 -05:00
Anton Georgiev
cd8f75b440
Merge pull request #5011 from OZhurbenko/fix-whiteboard-explosion
Fixed Pencil rendering breaking the html5 client
2018-01-26 16:09:43 -02:00
KDSBrowne
d6e913d79f remove code related to pushstate 2018-01-26 07:35:49 -08:00
Joao Siebel
18019776cb Exit from audio when in meeting ended to prevent echo test, fix #4999 2018-01-25 09:07:32 -02:00
Lucas Fialho Zawacki
deb6efad09 HTML5 video refactor some js 2018-01-25 04:08:00 +00:00
Anton Georgiev
f95a8f7e43
Merge pull request #5027 from bigbluebutton/v2.0.x-release
Merge V2.0.x release into 'master' -- html5 changes only
2018-01-24 20:26:47 -02:00
Anton Georgiev
bd56a9e1e9
Merge pull request #4996 from Tainan404/fix-clear-chat
Fix issue #4992. Unable to clear chat.
2018-01-23 14:14:35 -02:00
Maxim Khlobystov
0568a01692
Merge pull request #4923 from MaximKhlobystov/selenium-visual-regression
[HTML5 Client] Initial Visual Regression Tests Setup
2018-01-23 11:13:54 -05:00
Lucas Fialho Zawacki
cacbdd0ece Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-cold-corrections 2018-01-23 16:05:47 +00: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
Oleksandr Zhurbenko
946c731471 Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message 2018-01-22 15:07:29 -08:00
Lucas Fialho Zawacki
e728418eeb Explicitly declare some hardcoded values as constants and refactor an if 2018-01-22 18:23:55 +00:00
KDSBrowne
9eb715a09f prevent removed user ability to rejoin meeting via back btn 2018-01-22 08:49:22 -08:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Maxim Khlobystov
1eddc2f408
Merge pull request #4971 from OZhurbenko/fix-issue-4954
Aligned the dropdown's close button on small screens
2018-01-19 16:08:35 -05:00
Joao Siebel
a42d88250e Resolve merge conflict in english locales file 2018-01-19 17:43:11 -02:00
Tainan Felipe
4301ee6ef7 fix issue #4992 2018-01-19 15:38:04 -02:00
Anton Georgiev
9b16ae8d51
Merge pull request #4938 from KDSBrowne/z.0.1-mobile-btn-alignmet
Fix alignment of ActionsBar buttons for small screens
2018-01-18 16:34:27 -02:00
Anton Georgiev
9c101b73f2
Merge pull request #4976 from gutobenn/4955-changes
Adjusts on screenshare button and requested changes
2018-01-18 16:33:49 -02:00
KDSBrowne
745f79ba51 make breakpoint range start from 0em 2018-01-18 09:41:52 -08:00