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

657 Commits

Author SHA1 Message Date
Richard Alam
c6684ca2f6 - updating latest locales except for zh_TW as it's failing to compile. 2016-11-04 15:47:31 +00:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04:00
Chad Pilkey
0eabf8ca69 first round of accessibility fixes for 1.1 2016-09-22 16:38:34 -04:00
Chad Pilkey
4d4754aa3e switch linux screenshare images and text to real values 2016-09-19 12:03:28 -04:00
Ghazi Triki
87421753d5 Invite participants to existing breakout rooms. 2016-09-07 17:50:20 +01:00
Ghazi Triki
1822c0a9de User in not redirected automatically to the logoutURL. 2016-09-04 12:21:54 +01:00
Chad Pilkey
b8c1961f68 add a fourth help image for mac screenshare 2016-08-31 12:49:37 -04:00
Fred Dixon
477ebb4986 Handle case for starting desktop sharing when using FireFox with default settings 2016-08-30 15:45:51 -04:00
Chad Pilkey
69f43b5726 Merge remote-tracking branch 'upstream/master' into screenshare-error-notifications 2016-08-25 14:03:47 -07:00
Chad Pilkey
5dbedbb06f add screenshare error messages to tell user when something goes wrong 2016-08-25 14:03:35 -07:00
Chad Pilkey
da977c55f0 new screenshare image, change screenshare help string, move ss window up 2016-08-25 07:56:28 -07:00
Fred Dixon
247da5a07a Merge pull request #3314 from capilkey/screenshare-help-images 
Minor fixes to the deskshare publish UI
 2016-08-23 17:05:30 -04:00
Chad Pilkey
d624203d02 Flash deskshare: fix for linux/mac messages, and better pause indicator 2016-08-23 12:47:03 -07:00
Fred Dixon
69512a3b95 Merge pull request #3307 from riadvice/breakout-room-ui-imporve 
Improvements for breakout rooms names and remaining time display
 2016-08-23 07:37:00 -04:00
Chad Pilkey
c760b9f9c0 improve screenshare publish UI to provide help text and images 2016-08-22 20:55:56 -07:00
Ghazi Triki
1af78226b8 Update remainingtime display in both parent romm and breakout room. 2016-08-22 22:11:42 +01:00
Ghazi Triki
c2c05a6410 Change breakout room remaning time format. 2016-08-22 18:56:25 +01:00
Ghazi Triki
f8a62b154b Locale strings update for breakout rooms settings. 2016-08-22 18:41:45 +01:00
Richard Alam
86062ddd4d Merge pull request #3295 from capilkey/cc-message-check 
More closed captioning improvements
 2016-08-18 12:52:44 -04:00
Chad Pilkey
602ce706c2 change cc language select from combobox to list 2016-08-18 09:42:58 -07:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Anton Georgiev
e839d2610b breakout rooms:change record to checkbox + boolean 2016-08-11 19:54:10 +00:00
Richard Alam
6e177ef74f Start, pause, stop screen sharing. 2016-08-10 20:48:55 +00:00
Richard Alam
0138d98f22 - don't exit when pausing screen sharing. 2016-08-10 19:18:49 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Chad Pilkey
45ff003941 enforce a maximum paste length in CC window 2016-08-04 11:52:55 -07:00
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
Chad Pilkey
00549743ef add a language prompt to closed caption dropdown 2016-07-21 15:48:19 -07:00
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07:00
Richard Alam
c5984219c3 Add help on how to use new screenshare 
Provide a way for users to learn how to use the new screen share as
 the steps to launch it differs depending on OS and browser.
 2016-07-14 19:20:25 +00:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
b0646794ff Merge branch 'merge-v1.0.0-to-master' of https://github.com/ritzalam/bigbluebutton into ritzalam-merge-v1.0.0-to-master 2016-05-20 15:15:39 +00:00
Richard Alam
babedcc6a7 Merge branch 'add-emojis' of https://github.com/delftswa2016/bigbluebutton into delftswa2016-add-emojis 2016-05-20 15:06:42 +00:00
Richard Alam
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
5719ab2973 - fix offending locale that breaks build 2016-05-11 17:55:01 +00:00
Richard Alam
1e203d2617 Merge branch 'v1.0.x-release' of github.com:bigbluebutton/bigbluebutton into v1.0.x-release 2016-05-11 17:35:45 +00:00
Richard Alam
a3838ec143 Update locales 
Update locales as of May 11, 2016.
 2016-05-11 17:35:04 +00:00
Chad Pilkey
ce1adcffc8 fix shortcut key inconsistencies 2016-05-05 16:15:09 -07:00
Ghaz Triki
9aebb92204 Update layout for breakout rooms settings popup. 2016-05-04 09:59:20 +01:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Chad Pilkey
fe53999164 Third round of 1.0 accessibility bug fixes 2016-04-19 09:17:14 -07:00
Richard Alam
b9cb2298b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-1.1-dev-java8 2016-04-14 20:05:22 +00:00
Richard Alam
b0d6cf51ef Updating locales 
Update locales as of Apr 6, 2016
 2016-04-06 18:59:41 +00:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
6bce9350cb Adds Edge browser warning to en_US locale 2016-04-02 19:31:34 -05:00