BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,420 Commits 13 Branches 260 Tags 1.1 GiB
4ca1995bc6
Commit Graph

1078 Commits

Author SHA1 Message Date
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.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/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Fred Dixon
b4a4f957dd
Update bbbResources.properties 
Update quotes
 2018-10-24 16:24:44 -04:00
Chad Pilkey
98f7aaaeb6 fix error handling when client parts fail to load 2018-09-18 12:45:12 -07:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04: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
Chad Pilkey
44ec61c9ce add warning to Flash for WebRTC SS in FF on Mac 2018-08-31 13:44:18 -07:00
Ghazi Triki
83031aab94 Add user typing locale strings. 2018-08-14 17:54:31 +01:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
Ghazi Triki
5472456e90 Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg. 2018-07-25 21:14:38 +01:00
Chad Pilkey
8bc024cae3
Merge pull request #5914 from capilkey/add-webrtc-ss-timeout 
Add a timeout to WebRTCScreensharePublishWin startup
 2018-07-24 18:56:55 -04:00
Chad Pilkey
bfc37318b0 add a timeout to WebRTCScreensharePublishWin to do simple error detection 2018-07-24 13:45:08 -07:00
Richard Alam
16072ef9b2 - add back es_LA locale 2018-07-24 11:00:25 -07:00
Richard Alam
324aa8bc12 - updating locales 2018-07-24 07:37:02 -07:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
 2018-07-16 16:08:38 +01:00
Chad Pilkey
d1e649189e add option to user gear menu to look up their directory data 2018-07-11 10:33:38 -07:00
Ghazi Triki
2a243f50c0 Update multiuser whiteboard tooltips. 2018-07-06 23:23:26 +01:00
Ghazi Triki
eb17100a89 Updated hardware acceleration hint and check. 2018-07-06 15:40:23 +01:00
Richard Alam
445d16f27c Merge branch 'implement-meeting-inactivity-timer' of https://github.com/ritzalam/bigbluebutton into ritzalam-implement-meeting-inactivity-timer 2018-06-28 10:32:46 -07:00
Richard Alam
d891a4e85f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:30:17 -07:00
Richard Alam
c92635b209 - cheange text to warn user that meeting is inactive 2018-06-27 12:59:33 -07:00
Fred Dixon
4c0b783497 fix HT slide title 2018-06-24 13:10:29 -05:00
Richard Alam
f2a7e4d314 - display meeting is about to end warning to user and breakout warning if meeting is breakout room 2018-06-22 11:46:46 -07:00
Richard Alam
578e3acee8 - no locales to update 
- include .tx/config so we can pull locales
 2018-06-22 07:28:29 -07:00
Richard Alam
fc3605f301 - merging latest v20-release branch 2018-06-21 07:38:19 -07:00
Chad Pilkey
f1443aefa9 add a 15s loading bar for WebRTC screenshare start up in the Flash client 2018-06-20 15:14:02 -07: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
Chad Pilkey
3a40cf169d make the file upload check for ff60 more explicit 2018-06-15 15:01:17 -07:00
Ghazi Triki
718d65f30b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
 2018-06-11 18:33:27 +01:00
Richard Alam
f7f291e70e Merge branch 'global-exception-catcher' of https://github.com/riadvice/bigbluebutton into riadvice-global-exception-catcher 2018-06-11 08:52:08 -07:00
Ghazi Triki
fd91ed72e1 Fixed locale typo. 2018-06-11 11:29:24 +01:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:23:49 -07:00
Ghazi Triki
4fdc77f2a5 Make sytle consistent for popups and buttons. 2018-06-09 00:07:37 +01:00
Ghazi Triki
337c260bcf Globally catch any unhandled exception. 2018-06-07 18:11:38 +01:00
Chad Pilkey
13da7042b3 add option to save user names to a file to gear button 2018-06-06 16:17:57 -07: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
Chad Pilkey
1001cc1ecd
Merge pull request #5638 from capilkey/show-individual-votes 
Improve the PollResultsModal spacing and sort
 2018-06-04 19:13:16 -04:00
Chad Pilkey
6f1884ed1c update PollResultsModal spacing and grid header text 2018-06-04 12:37:53 -07:00
Fred Dixon
1668b60069
Merge pull request #5628 from capilkey/show-individual-votes 
Add a table showing individual votes in the PollResultsModal
 2018-06-02 08:00:53 -04:00
Chad Pilkey
f7a5f675b6 add a table showing individual votes in the PollResultsModal 2018-06-01 16:06:49 -07:00
Ghazi Triki
78681bf9b2 Added new unread message ribbon to chat. 2018-05-30 16:59:10 +01:00
Ghazi Triki
db112d23d8 Added toaster for start and stop recording only for moderator. 2018-05-29 16:00:10 +01:00
Ghazi Triki
6e336fa36d Added "Resume Recording" title to RecordWindow. 2018-05-29 15:14:17 +01:00
Ghazi Triki
a39081afb3 Use toast notification at some application events. 2018-05-29 11:28:31 +01:00
Richard Alam
39558cd805 Merge branch 'recording-timer' of https://github.com/riadvice/bigbluebutton into riadvice-recording-timer 2018-05-23 10:11:09 -07:00
Chad Pilkey
f2025b658b temporarily disable uploading on Win FF60+ 2018-05-19 18:16:42 -07:00
Ghazi Triki
634635c8cd Update recording confirmation window and add recording timer (Work In Progress) 2018-05-18 15:58:08 +01:00
Chad Pilkey
8fc80492b6 redesign of screenshare select with win10 chrome warning 2018-05-16 20:01:34 -07:00
Fred Dixon
082792c720
Merge pull request #5503 from riadvice/choose-breakout-room 
Improve BreakoutRoomSettings layout and free-join behaviour.
 2018-05-09 19:41:22 -04:00
Ghazi Triki
72bbc49e60 Improve BreakoutRoomSettings layout and free-join behaviour. 2018-05-09 22:52:37 +01:00