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

170 Commits

Author SHA1 Message Date
Felipe Cecagno
b7c8a5db91 Merge remote-tracking branch 'rafael/fix-1753' into mconf-live0.7.3 2015-10-22 13:44:15 -02:00
Felipe Cecagno
8288d52d1c Merge branch '090-multinotes-rich-text' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:44:37 -03:00
Felipe Cecagno
a7b220e207 Merge branch '090-multinotes' into mconf-live0.7.3 2015-09-07 23:19:16 -03:00
Felipe Cecagno
261ae44f10 Merge branch 'fix-1723' into mconf-live0.7.3 2015-09-03 15:29:34 -03:00
Felipe Cecagno
d5c0047611 Merge branch 'feature-1733' into mconf-live0.7.3 2015-09-03 15:23:15 -03:00
Felipe Cecagno
6dbf18c2e5 cleanup 2015-09-03 15:22:54 -03:00
Felipe Cecagno
c99e3fbfb4 Merge branch 'feature-1745' into mconf-live0.7.3 2015-09-03 14:24:33 -03:00
Felipe Cecagno
7063cfa833 included the "Default language" option to the list of languages 2015-09-03 14:04:29 -03:00
Felipe Cecagno
c8188670da Merge branch 'mconf-live0.6.4-auto-reconnect' into mconf-live0.7.2-auto-reconnect 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2015-08-31 16:50:47 -03:00
Pedro Beschorner Marin
f12539fe81 Added pt_BR translation 2015-08-28 16:47:09 +00:00
RafaFP
6545dd89c5 Implemented the feature which changes the name of the locations to Portuguese (Brazilian) when the user changes the locale to Portuguese (Brazilian). 
#ref1745
 2015-08-24 21:26:24 +00:00
RafaFP
8f636d158a Apply lock settings button tooltip fixed in en_US and pt_BR locales. 
#ref 1753
 2015-08-19 18:38:17 +00:00
RafaFP
b71e9e9545 User can now set a name to the custom layouts he creates. If the name is left empty, the default name is given as it was before (Custom Layout #). 
#ref 1733
 2015-08-14 21:13:32 +00:00
RafaFP
86a6983395 Tooltips in pt_BR and en_US locales changed to properly represent the funcion of the headset button. #ref 1723 2015-08-11 20:51:48 +00:00
Pedro Beschorner Marin
fdc90d569e Formatting shared notes text 2015-07-31 15:22:59 +00:00
Felipe Cecagno
880befcba7 fix untranslated string to pt_BR 2015-07-22 11:35:11 -03:00
Pedro Beschorner Marin
2b8b315ef5 Adding name to shared notes windows 2015-07-14 20:22:21 +00:00
Felipe Cecagno
c79be37591 Merge branch 'mconf-live0.6.4' into base-for-0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2015-06-22 17:18:26 -03:00
Felipe Cecagno
9ef6434ef7 Merge branch 'webrtc-reconnect' into mconf-live0.6.3 2015-06-01 23:01:50 -03:00
Felipe Cecagno
65323b93f6 fixed pt_BR translation 2015-06-01 23:01:36 -03:00
Felipe Cecagno
ddfbd0b138 Merge branch 'webrtc-reconnect' into v0.9.0-release 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:43:10 -03:00
Felipe Cecagno
f498515fb0 set camera name to "Unknown Device" when chrome doesn't allow to retrieve the real name; disable the popup button when there's no camera available 2015-06-01 21:43:33 -03:00
Felipe Cecagno
2e7e968dd1 Merge branch 'improved-firefox-hint' into mconf-live0.6.3 2015-06-01 14:15:00 -03:00
Felipe Cecagno
a1fdf5bba8 new window to help users to share microphone while setting up the webrtc connection on firefox 2015-05-27 17:54:13 -03:00
Felipe Cecagno
2a5f4ebedb cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code 2015-05-17 23:08:41 -03:00
Felipe Cecagno
7846b3ecb6 Merge branch '090-expanded-status' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2015-05-17 20:12:15 -03:00
Felipe Cecagno
6e60ae2aa9 refactored a bit the expanded status; removed an unnecessary event used to change the button icon 2015-05-17 20:02:13 -03:00
Felipe Cecagno
7cb12f8b49 Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 
Conflicts:
	bbb-api-demo/src/main/webapp/demo10_helper.jsp
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/cy_GB/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_419/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/hy_AM/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ms_MY/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
	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/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-05-17 19:25:26 -03:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Felipe Cecagno
13d15d0761 Merge branch 'issue1534' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-04-01 10:19:17 -03:00
Felipe Cecagno
335a9a77a3 better message when the connection to the server has been rejected 2015-04-01 10:16:48 -03:00
Mateus Dalepiane
179129750a Include multiple tab warning in connection rejected message 
Included a message to inform the user that a connection rejected is
probably caused by multiple browser tabs joining the same conference.
 2015-04-01 09:53:14 -03:00
Richard Alam
1d32fb7dc4 - update locales 2015-03-27 21:58:21 +00:00
Mateus Dalepiane
7a0e75ace3 Merge branch 'mdalepiane/reconnect-webrtc' into mconf-live0.6.2 2015-03-25 12:10:04 -03:00
Mateus Dalepiane
6b33495158 Auto re-connection for WebRTC calls on client 
The client tries to reconnect 3 times before failing and asking if
the user wants to use flash audio or cancel.
 2015-03-24 15:37:43 -03:00
Richard Alam
3c73519ec3 - update locales 2015-03-13 15:18:11 -07:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Felipe Cecagno
9780df5b13 Merge branch '090-deskshare-window' into mconf-live0.6.2 2015-03-04 12:34:48 -03:00
Felipe Cecagno
8bac97b10c adding the missing pt_BR strings 2015-03-04 12:34:34 -03:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Felipe Cecagno
fe69560cb1 Merge branch '090-java-detection' into mconf-live0.6.2 2015-02-12 15:51:54 -02:00
Richard Alam
cd9ef88567 - update locales 2015-02-09 16:30:23 +00:00
Mateus Dalepiane
899a98d3c5 Reverting our Java detection changes 
Since BBB team also improved Java detection, we decided to revert our changes
and use theirs.
 2015-02-05 16:25:40 -02:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Felipe Cecagno
03ba8b2866 Merge branch 'edit-layouts' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_download_16px.png
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_upload_16px.png
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/BroadcastButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
 2015-01-26 11:49:22 -02:00
Felipe Cecagno
ac6813595b show an alert when the moderator broadcasts his layout to others 2015-01-26 11:42:45 -02:00
Felipe Cecagno
3a89cab752 Merge branch '090-java-detection' into mconf-live0.6.2 2015-01-25 18:20:48 -02:00
Felipe Cecagno
b7130a379f Merge branch '090-java-detection' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
 2015-01-25 18:19:13 -02:00