RafaFP
c090f77e2c
Added a window to ask if the user wants to save a current unsaved custom layout when the user wants to save the layouts to a file.
...
refs #1827
2016-01-29 20:19:01 +00:00
Felipe Cecagno
7804e734e4
fix #2985
...
close button on the publish window now closes both remote and local windows
2016-01-29 17:29:39 -02:00
Felipe Cecagno
301a07773b
fix issue with webrtc introduced on latest merge
2016-01-29 15:46:32 -02:00
RafaFP
480df6e90b
User can no longer create a custom layout that has the same name as any other layouts on his list.
...
When a user tries to do so, he will be propted by a popup window to confirm the overwriting of the previous layout.
If the user confirms this choice, then the previous layout will be removed and the new one takes it's place.
If the user denies the overwriting then he will return to the naming window to change the name of the custom layout.
refs #1825
2016-01-27 22:17:10 +00:00
Chad Pilkey
58380dd6fd
added more descriptive tooltips for the emoticon buttons
2016-01-27 12:36:54 -08:00
Felipe Cecagno
2a3b95daf7
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
RafaFP
1503b1e031
Fixed the bad alignment of the components. Implemented the saving of new layout by Enter Key in the TextInput field.
...
refs#1826
2016-01-25 18:53:51 +00:00
Chad Pilkey
416cbbf7bc
Merge pull request #2973 from capilkey/1.0-minor-fixes
...
Minor UI changes for the Flash client
2016-01-22 19:25:19 -05:00
Chad Pilkey
d90643fc77
update the client copyright to 2016
2016-01-22 16:12:54 -08:00
Chad Pilkey
f7f6d81a37
shorten the copyright string in the client footer
2016-01-22 15:53:16 -08:00
Chad Pilkey
4062aa02db
significantly reduce the volume of the chat audio cue
2016-01-22 15:02:12 -08:00
Chad Pilkey
a2203ad5e6
unbold the lock settings categories in the popup
2016-01-22 14:52:45 -08:00
Chad Pilkey
d34616d3d2
add separation between chat time and border
2016-01-22 14:50:10 -08:00
Tiago Daniel Jacobs
fc728bf1be
Fixes #2768
2016-01-21 22:56:48 -02:00
Chad Pilkey
58292b198d
Merge pull request #2964 from ritzalam/do-not-reconnect-when-user-kicked
...
Do not reconnect when user kicked
2016-01-20 11:55:49 -05:00
Richard Alam
726e9e1fb0
- change wording on logout window when a user gets kicked out of the meeting.
2016-01-20 15:21:55 +00:00
Felipe Cecagno
a0aff7b3fc
Merge pull request #2951 from LucasMFreire/fix-video-windows
...
Fixed unclosed video windows bug
2016-01-19 16:38:56 -02:00
Felipe Cecagno
93620df0b8
implement the same protection we did for publish on view
2016-01-19 16:32:05 -02:00
Richard Alam
36cff83b6f
- tell user that he has been ejected from the meeting.
2016-01-19 16:58:14 +00:00
Richard Alam
c66c180040
- make the flash client not attempt to reconnect when the user has been ejected from the meeting.
2016-01-19 16:16:12 +00:00
Fred Dixon
066749e4ca
Updated text for logout message:
2016-01-19 08:57:34 -05:00
Fred Dixon
3e153efe5f
Merge pull request #2961 from capilkey/chat-audio-cue-cont
...
Changes to the chat audio cue control
2016-01-18 18:07:54 -05:00
Chad Pilkey
c7f88fd180
made the chat audio cue usable by all users
2016-01-18 11:15:16 -08:00
Chad Pilkey
f08f38f6d3
Merge pull request #2949 from capilkey/webrtc-reconnect
...
Reduce WebRTC reconnect attempts
2016-01-15 12:10:33 -05:00
RafaFP
6a680ea01f
Added a width limitation in the same way it is done on the UploadPresentationRenederer.mxml.
...
Added the Truncate attribute to the label, labels too long to be displayed will now be truncated and appended wit "...".
The full name of the file will be displayed as tooltip on mouseOver for all the downloadable files in the Download Window.
refs #1852
2016-01-14 20:30:21 +00:00
Richard Alam
d79d763857
Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes
2016-01-14 19:43:08 +00:00
RafaFP
c349846584
Created an event and function to enable/disable the DownloadPres button when there are/aren't presentations available for downloading.
...
Added an icon and css for the disabled state of this button.
refs #1851
2016-01-14 18:36:27 +00:00
LucasMFreire
9c099aeb67
Fixed unclosed video windows bug
2016-01-14 14:59:13 -02:00
Chad Pilkey
1bc100f4c7
reduced webrtc retry attempts from 5 to 3
2016-01-13 13:05:22 -08:00
Chad Pilkey
008d59c85d
Merge pull request #2947 from mconf/webrtc-reconnect
...
WebRTC reconnect
2016-01-13 15:25:33 -05:00
Pedro Beschorner Marin
afb1cc44d6
Fixed SIP mic reconnection
2016-01-13 15:01:04 +00:00
Pedro Beschorner Marin
28bf1c9084
Fixed global audio reconnection
2016-01-13 13:50:38 +00:00
Felipe Cecagno
0660f7ebf4
remove pt_BR translation
2016-01-12 15:55:22 -02:00
Felipe Cecagno
d98bee07cf
Merge webrtc-reconnect into bigbluebutton/master
...
Conflicts:
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
2016-01-12 15:27:01 -02:00
Chad Pilkey
3422070be6
fix issue #2788
2016-01-08 15:20:29 -08:00
Chad Pilkey
8c0f2db056
fix issue #2789
2016-01-08 15:07:39 -08:00
Chad Pilkey
3e9d6348ff
update the video module to conform for accessibility
2016-01-08 15:00:23 -08:00
Chad Pilkey
21d14aaa01
fixed the TabIndexer
2016-01-07 14:32:13 -08:00
Felipe Cecagno
d1cfabdfa5
new deskshare applet signed by rnp
2016-01-04 15:49:53 -02:00
Felipe Cecagno
019cfa6cfb
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
2016-01-04 15:14:27 -02:00
Felipe Cecagno
8f08e13dcc
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
2015-12-30 18:35:13 -02:00
Felipe Cecagno
a340103fad
make the shared notes default font size configurable by config.xml
2015-12-22 17:45:16 -02:00
Felipe Cecagno
785436fb74
fix empty paragraph representation in the html shared notes format
2015-12-22 16:12:21 -02:00
Felipe Cecagno
08ebb0b79d
replace font tag on formatted shared notes by the span style attribute; remove textformat tag; improve readability
2015-12-21 17:14:55 -02:00
Felipe Cecagno
af1322e08c
fix wrong font size on the formatted shared notes
2015-12-21 14:09:33 -02:00
Pedro Beschorner Marin
29f2498497
Fixed master locale status when it loads as default
2015-12-14 18:12:15 +00:00
Felipe Cecagno
f49d758582
change attribute on bbb_webrtc_bridge due to a new version if sip.js, from iceGatheringTimeout to iceCheckingTimeout
2015-12-08 17:43:14 -02:00
Felipe Cecagno
5d1534df8c
Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3
...
Conflicts:
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/lib/sip.js
2015-12-08 17:42:43 -02:00
Felipe Cecagno
dd99398ff7
fix the notes save button emphasized property
2015-12-08 17:38:05 -02:00
Felipe Cecagno
15ad366550
move the shared notes icons to branding
2015-12-08 17:38:05 -02:00
Felipe Cecagno
97daf0e9f5
add a menu next to the save notes button so the user can save both formatted or unformatted notes; create a new class WellPositionedMenu which will automatically position a menu next to a button or any other display object; cleanup
2015-12-08 17:38:05 -02:00
Felipe Cecagno
66379edc1d
fix deskshare on java 1.9
2015-12-08 17:38:05 -02:00
Felipe Cecagno
59dce70b6a
add the byte order mark for UTF-8 when saving notes, so it will be displayed properly in the browsers
2015-12-08 17:38:04 -02:00
Pedro Beschorner Marin
01d4e3af1a
Adjusting emoji display size
2015-12-08 17:16:31 +00:00
Pedro Beschorner Marin
9cb63f2129
Fixed extended-status
2015-12-08 16:45:00 +00:00
Pedro Beschorner Marin
915cc99e0a
Minor adjust in donwload presentation button size
2015-12-04 17:59:25 +00:00
Pedro Beschorner Marin
ee3864e5ce
Fixed sharednotes MAIN_WINDOW
2015-12-02 18:39:35 +00:00
Pedro Beschorner Marin
1a739fbb8e
Fixed client userJoined message receiver
2015-11-30 19:17:34 +00:00
Felipe Cecagno
555e037d79
fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0
2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-video/.classpath
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
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/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_LA/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/src/BigBlueButton.mxml
bigbluebutton-client/src/SharedNotesModule.mxml
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.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/model/users/events/ChangeMyRole.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.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/managers/PresentManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
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/GraphicsWrapper.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
2015-11-25 15:58:36 +00:00
Chad Pilkey
d1a939b797
Correct the presentation back button enabled check
2015-11-19 09:45:44 -05:00
Chad Pilkey
e8b30b626b
Removed three unused polling shortcuts
2015-11-18 07:51:48 -05:00
Chad Pilkey
8d321b2493
Merge pull request #2849 from riadvice/client-fixes
...
Minor Client fixes
2015-11-16 07:35:39 -05:00
Felipe Cecagno
66b96398e6
show the disabled record button for viewers; hide confirmation alert if the moderator lose its role
2015-11-13 14:33:43 -02:00
Felipe Cecagno
6e5729fc67
created toolbarVisibleByDefault and showToolbarButton attributes for shared notes window
2015-11-10 11:17:23 -02:00
Chad Pilkey
8463325ce3
added a client side audio queue when you leave the voice conference
2015-11-09 11:38:30 -08:00
Richard Alam
8f83ada786
- update locales
2015-11-06 21:02:31 +00:00
Chad Pilkey
4dcc4a4c6e
updated sipjs to match master
2015-11-06 08:47:41 -08:00
Chad Pilkey
efd66d2906
blocked video mute/unmute when locked
2015-11-05 14:14:04 -08:00
Chad Pilkey
42236569a5
update sip.js to include a ice candidate timeout
2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad
added in a 30s total timeout on iceGathering
2015-11-04 16:44:15 -08:00
Chad Pilkey
f2d997c0bf
changed retrived annotation from DrawObject to Object
2015-11-04 13:25:28 -08:00
RafaFP
60bc3b1a95
Moved all icons present in the sharednotes local folder to the CSS folder and associated them to styles.
...
All icons were moved and the references to used icons were updated to reflect this change.
The copying of the icons was removed from the sharednotes SWF build step.
refs #1839
2015-10-27 13:54:43 +00:00
RafaFP
c11cea7635
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into fix-1822
...
refs #1822
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
2015-10-26 20:09:00 +00:00
RafaFP
370a1a6b51
Changed the ChatToolbar position and changed the text in the buttons to icons.
...
The toolbar will no longer stand in front of the last messages alowing for the user to copy them.
The buttons are now smaller and cause lesser disturbance on the chat when the user rolls the mouse over.
refs #1822
2015-10-26 19:39:02 +00:00
Pedro Beschorner Marin
3a2d6e52b8
Bugfix-#1838: Checking for user's role missmatch between API join response and server join meeting reply
2015-10-25 23:08:28 -02:00
Felipe Cecagno
cf121f934a
forbid the viewer to try to unlock himself on the user list refs #1722
...
bug introduced while we were enabling the viewer to mute/unmute himself from the users list
2015-10-23 12:00:59 -02:00
Felipe Cecagno
f80dcc33ae
fixed the issue introduced when we ordered the loading of locale swfs refs #1759 , when the locale to be master locale and the preferred locale are the same
2015-10-23 10:43:26 -02:00
Felipe Cecagno
885d16e42e
reverted mconf/bigbluebutton@8f636d158a refs #1746 , since the tooltip identifier is used as "tooltip" instead of "toolTip"
2015-10-23 10:41:08 -02:00
Felipe Cecagno
30caf8b0fb
Merge remote-tracking branch 'RafaFP/fix-1722' into mconf-live0.7.3 (refs #1722 )
2015-10-23 09:50:47 -02:00
Felipe Cecagno
25920da78d
Merge remote-tracking branch 'RafaFP/fix-1744' into mconf-live0.7.3
2015-10-22 13:48:56 -02:00
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
876b077021
improve the loading order for the master locale and the preferred locale (refs #1759 )
2015-10-21 12:54:43 -02:00
Ghazi Triki
083aeb42c8
Improved presentation backButton and forwardButton buttons styles. (reverted from commit eb5371d90c
with custom update)
2015-10-20 22:31:48 +01:00
Felipe Cecagno
693dabf140
update the talking status of the video window when the user leaves the audio
2015-10-20 11:38:34 -02:00
Felipe Cecagno
ab83c823c7
do not manage the layout of the shortcuts window
2015-10-20 10:49:04 -02:00
Felipe Cecagno
3739d6fc79
call the main connection to bbb-apps "main" instead of "bigbluebutton"
2015-10-20 10:43:20 -02:00
Ghazi Triki
516740bc88
Removed polling shorcuts from ShortcutHelpWindow.
2015-10-19 18:33:33 +01:00
Felipe Cecagno
83ae244485
Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3
2015-10-19 11:49:36 -02:00
RafaFP
1240a7eff4
Improved the Shared Notes window to properly support mouse Context Menu Paste (was an issue, would not trigger the formatting corrections for pasted data).
...
Solved a bug where pasted text would cause kerning to change and eventually cause loss of consistency.
Kerning would become a nested tag, breaking consistency when left empty.
ref #1742
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
de00dc2fe3
Fixed text style when keyboard input with multiple lines selected
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
7f4f704cf1
Refresh font type, size and color when user delete or backspace a paragraph the same way Flash handles alignment fixing
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
b36be98745
Fixed array out of bounds exception
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
33cba3d440
Text type, color and size will work the same as alignment
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
da292fe3ed
Cleaning (some) text formatting when enter key is pressed
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
743b5f5197
Avoid formatting empty lines when selected
2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
96a000ed99
Adding new RichTextEditor mxml
2015-10-19 11:49:13 -02:00
Felipe Cecagno
385b043146
Merge branch 'mconf-live0.7.3' of github.com:RafaFP/bigbluebutton into mconf-live0.7.3
2015-10-19 11:25:39 -02:00
Felipe Cecagno
1f9ed04243
Merge branch 'mconf-live0.7.3' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3
2015-10-19 11:25:06 -02:00
Richard Alam
25cd1701c6
Merge pull request #2844 from ritzalam/update-deskshare-0.9.0-jar
...
- update 0.9 deskshare signed jar with new cert
2015-10-16 16:20:51 -04:00
Richard Alam
3afe92a5b7
- update 0.9 deskshare signed jar with new cert
2015-10-16 20:18:45 +00:00
Richard Alam
8beff5f717
Merge pull request #2843 from ritzalam/update-deskhare-jar
...
- new jar signed with cert that expires on oct 30, 2017
2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578
- new jar signed with cert that expires on oct 30, 2017
2015-10-16 19:47:01 +00:00
Felipe Cecagno
ec96c89105
Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1-ssl
...
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
2015-10-15 15:22:05 -03:00
Calvin Walton
f6adcde830
Update Firefox 41 hang workaround for 41.0.2
...
Cherry-picked from b4e3561
on master.
2015-10-15 14:17:55 -04:00
Calvin Walton
b4e3561fa6
Update Firefox 41 hang workaround for 41.0.2
2015-10-15 14:05:12 -04:00
Ghazi Triki
99f6ab2499
Minor CSS fixes.
2015-10-10 14:30:39 +01:00
Ghazi Triki
eb5371d90c
Improved presentation backButton and forwardButton buttons styles.
2015-10-10 12:37:32 +01:00
Fred Dixon
e3c8520f67
Apply fix for this bug https://github.com/bigbluebutton/bigbluebutton/issues/2832
2015-10-09 16:22:30 -04:00
Richard Alam
197669ebc4
- add a timeout when to expect response to validate token. If we don't get a response,
...
log it. This might mean that we run into issue where the reply from server isn't
getting propagated back into the client.
2015-10-08 18:28:25 +00:00
Anton Georgiev
a38f5b642a
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix
2015-10-07 15:10:55 +00:00
Anton Georgiev
0f5c19e13b
reset userAgent and callerIdName so we can switch between audio joining modes
2015-10-07 15:09:08 +00:00
Richard Alam
e53ed90859
Merge pull request #2823 from ritzalam/fix-demo11-api-example
...
- convert all external ids in js api into internal user ids as using…
2015-10-06 15:00:33 -04:00
Richard Alam
a2cf908425
- convert all extarnal ids in js api into internal user ids as using external user ids breaks when
...
a user joins twice into the meeting
2015-10-06 17:57:39 +00:00
Chad Pilkey
6f69330b77
Added scrolling dots to the reconnect popup
2015-10-05 12:26:44 -07:00
Richard Alam
c3aa194e00
- update to latest locales (oct 5, 2015)
2015-10-05 15:59:07 +00:00
Richard Alam
f20b919ec2
Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround
...
Workaround Firefox 41.0.1 hang on Windows
2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c
Merge pull request #2814 from capilkey/fix-2810
...
Fix 2810
2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5
Workaround Firefox 41.0.1 hang on Windows
...
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.
The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
2015-10-05 11:26:31 -04:00
Chad Pilkey
81ced7193b
Only show annotations for the current whiteboard
2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7
Make sure whiteboard text is published to the correct whiteboardID
2015-10-02 15:02:13 -07:00
Richard Alam
5dd139f2f4
- do not user external user id to find user
2015-09-30 20:07:05 +00:00
Richard Alam
93dd5186b4
- user internal user id for user in the voice conf
2015-09-30 18:55:17 +00:00
Chad Pilkey
0627afa2e5
Add a default message length to avoid issues of missing property
2015-09-24 14:17:07 -07:00
Chad Pilkey
4c4d35a760
Merge pull request #2787 from riadvice/chat-message-limit
...
The use is able to write a multi-line chat message.
2015-09-24 17:15:43 -04:00
Anton Georgiev
4253faa426
remove extra condiction
2015-09-24 16:05:41 +00:00
Anton Georgiev
2bd601cc08
simplify html5 redirect #2801
2015-09-24 15:58:17 +00:00
Anton Georgiev
07dfd89dd7
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-09-23 21:24:34 +00:00
Anton Georgiev
6cfc16cde5
offer redirect to HTML5 only if available
2015-09-23 21:24:19 +00:00
Richard Alam
ee7ef24397
- change fielname to be the same as on server
2015-09-23 20:04:39 +00:00
RafaFP
7e4946865a
Fixed the buttons delay on disappearing and killed the connection for good if on flash microphone.
...
refs #1800
2015-09-21 22:22:00 +00:00
Chad Pilkey
e9c0eb23cd
rename bbb-client in .project file for better importing
2015-09-21 14:13:32 -07:00
Chad Pilkey
15a2ade0aa
Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more
2015-09-21 13:50:44 -07:00
Chad Pilkey
d0366b2fba
Make sure PhoneOptions are initialized before using
2015-09-21 13:46:16 -07:00
Chad Pilkey
6377f86ca1
make sure the user item renderers update when locking changes
2015-09-21 13:45:18 -07:00
Chad Pilkey
a736008046
fix locking being reversed
2015-09-21 13:44:23 -07:00
Richard Alam
11fbefb5ef
- make lock settings behave like in 0.9
2015-09-21 20:42:04 +00:00
Richard Alam
5a986f5bc6
- change logging format
2015-09-21 13:55:23 +00:00
Pedro Beschorner Marin
eac7c9c4d4
Ejecting voice user after a Flash mic reconnection
2015-09-18 15:19:07 +00:00
Pedro Beschorner Marin
655ed560ed
Better control for bigbluebutton reconnection
2015-09-17 18:24:30 +00:00
Ghazi Triki
57d94bd5e4
The use is able to write a multi-line chat message.
2015-09-17 10:37:56 +01:00
Ghazi Triki
920fc97532
Merge branch 'master' into client-logging-to-server
2015-09-16 21:11:33 +01:00
Pedro Beschorner Marin
6ee634d53e
Fixed missing reconnected user name in users list
2015-09-16 20:11:10 +00:00
Richard Alam
c13e17a7d4
Merge pull request #2770 from riadvice/chat-message-limit
...
Add a maximum allowed length to chat message
2015-09-16 15:04:26 -04:00
Ghazi Triki
07d7f389c1
Logging format can be configured in flex client application.
2015-09-16 18:55:09 +01:00
Pedro Beschorner Marin
d53b1d058e
Fixed deskshare reconnection issue #1802
2015-09-16 16:03:47 +00:00
Richard Alam
cc5c26b0bc
Merge pull request #2785 from ritzalam/log-flash-capabilities
...
Log flash capabilities
2015-09-16 10:39:52 -04:00
Richard Alam
899b98f81b
Merge pull request #2780 from riadvice/puffin-browser
...
Enable video and audio sharing for Puffin browser 4.6 and above.
2015-09-15 16:12:25 -04:00
Richard Alam
2bea0c778c
- clean-up by removing some debug logs
2015-09-15 20:04:06 +00:00
Richard Alam
99569d7a2b
- log flash player capabilities to aid us in debugging issues
2015-09-15 19:20:36 +00:00
Richard Alam
8afb3b8edf
- clean up by removing some logs
2015-09-15 19:20:09 +00:00
Richard Alam
e24b8c7cbe
Merge pull request #2781 from riadvice/pepperflash-webcam-fix
...
Microphone name automatically set under Pepper flash before getting the browser permission.
2015-09-15 10:52:43 -04:00
Richard Alam
1eac9dc709
Merge pull request #2783 from ritzalam/capilkey-fix-lock-settings
...
fix lock settings
2015-09-15 10:40:03 -04:00
Richard Alam
643e7b7087
- cleanup
2015-09-15 14:38:41 +00:00
Richard Alam
bbfbdf20e9
- cleanup
2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283
- try to fix lock settings
2015-09-14 20:18:27 +00:00
Richard Alam
247239caeb
Merge branch 'figure-out-why-lock-settings-not-working' into capilkey-fix-lock-settings
2015-09-14 15:51:15 +00:00
Richard Alam
8514eec3ba
Merge branch 'remove-java-warning-chrome' of https://github.com/capilkey/bigbluebutton into capilkey-fix-lock-settings
2015-09-14 14:21:20 +00:00
Felipe Cecagno
b17719e8cf
added proxyType to best on some connections preparing the client to use rtmps
2015-09-12 19:59:32 -03:00
Felipe Cecagno
3e75ddbcee
update the websocket server address if the page is loaded using https (so the socket server must be secure as well)
2015-09-12 14:13:18 -03:00
Calvin Walton
56fb7c8b06
Use protocol-relative links to load the 'get flash' button image
...
This fixes a mixed content warning when loading the client over https
2015-09-12 12:35:59 -03:00
Ghazi Triki
405840edc4
Microphone name automatically set under Pepper flash before getting the browser permission.
2015-09-12 13:31:02 +01:00
Ghazi Triki
65f1b72294
Enable video and audio sharing for Puffin browser 4.6 and above.
2015-09-12 12:35:12 +01:00
Chad Pilkey
e364a8c130
correct the vote counts in the accessbile poll message
2015-09-11 15:00:14 -07:00
Chad Pilkey
5eba1622ac
remove an unused variable in the poll graphics
2015-09-11 14:59:52 -07:00
Richard Alam
cfa6e30b23
Merge branch 'master' into client-to-server-logging
2015-09-10 17:52:58 +00:00
Richard Alam
977d4ba081
Merge pull request #2773 from ritzalam/update-locales
...
- pulling locales from transifex (sept 10, 2015)
2015-09-10 13:42:23 -04:00
Richard Alam
df19e44bc3
Merge pull request #2774 from kepstin/mixed-content
...
Use protocol-relative links to load the 'get flash' button image
2015-09-10 13:33:58 -04:00
Richard Alam
8a464a4f23
Merge pull request #2772 from capilkey/remove-java-warning-chrome
...
removed warning for Java not being installed with Chrome 42+
2015-09-10 13:27:08 -04:00
Calvin Walton
e7008957c9
Use protocol-relative links to load the 'get flash' button image
...
This fixes a mixed content warning when loading the client over https
2015-09-10 11:53:36 -04:00
Richard Alam
ac838e741a
- pulling locales from transifex (sept 10, 2015)
2015-09-10 15:25:00 +00:00
Chad Pilkey
9859ea6735
removed warning for Java not being installed with Chrome 42+
2015-09-09 15:30:03 -07:00
Ghazi Triki
7441fb9efb
Added smart binding to BBBUser "emojiStatus" and "hasEmojiStatus" properties to avoid having a runtime warning.
2015-09-09 18:24:50 +01:00
Richard Alam
f78dc3653c
- fix issue where other users get disconnected when a user refreshes browser after a reconnect
2015-09-08 20:27:10 +00:00
Richard Alam
a779e5c3e2
- add logging
2015-09-08 16:08:56 +00: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
ac4f58c997
Merge branch 'fix-issue-1716' 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:26:00 -03:00
Felipe Cecagno
a7b220e207
Merge branch '090-multinotes' into mconf-live0.7.3
2015-09-07 23:19:16 -03:00
Ghazi Triki
f773cfa9f9
Added message too long in client locales.
2015-09-07 16:18:49 +01:00
Ghazi Triki
19dbba500b
Chat message longer than "maxMessageLength" cannot be sent.
2015-09-07 16:10:49 +01:00
maxdoumit
3891db93e7
Restream video after disconnect
...
This commit will enable the client to restream video in the case of a disconnect.
A _restream variable has been added to the VideoEventMapDelegate.as, that will dictate if the stream needs to be restream.
The setting are stored also stored so ensure that no user interaction is needed to restream the video.
VideoEventMapDelegate.as now listens to BBBEvent.RECONNECT_CONNECTION_ATTEMPT_SUCCEEDED_EVENT, and will restream the video in the case _restream is true.
_restream is set to true when the user shares his camera, and set to false when the user manually closes his camera.
2015-09-06 22:21:55 -04:00
Richard Alam
dbbb4139d2
Merge pull request #2766 from capilkey/misc-client-changes-100
...
Misc client changes 100
2015-09-04 19:14:24 -04:00
Chad Pilkey
3433f88fae
Lower the volume for the poll start ping
2015-09-04 17:53:32 -04:00
Chad Pilkey
94d5c9f92e
Make the accessible poll results work with custom polls
2015-09-04 17:52:59 -04:00
Chad Pilkey
8e9376947b
Only allow the presenter to start a custom poll from chat
2015-09-04 17:51:41 -04:00
Chad Pilkey
e2bb124bb4
check for null in the emojistatus in BBBUser
2015-09-04 17:49:55 -04:00
Chad Pilkey
b2693753c6
added a widescreen video profile
2015-09-04 17:49:22 -04:00
Richard Alam
79e8a340e1
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging
2015-09-04 21:01:57 +00:00
Richard Alam
2f7e9a3171
Merge pull request #2765 from ritzalam/display-welcome-message-on-reconnect
...
- welcome message isn't being displayed after reconnect.
2015-09-04 16:54:36 -04:00
Richard Alam
b0fc984473
- welcome message isn't being displayed after reconnect.
2015-09-04 20:52:39 +00:00
Richard Alam
82e9f4ea49
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging
2015-09-04 19:56:38 +00:00
Richard Alam
53ff3966a3
- wait for validate token before signalling connection success to bbb-apps
2015-09-04 19:20:56 +00:00
Richard Alam
93c9b6df46
Merge pull request #2763 from ritzalam/fix-auto0reconnect-listenonly
...
Fix auto reconnect listenonly
2015-09-04 11:23:54 -04:00
Richard Alam
81c00f20d4
Merge pull request #2762 from riadvice/pepperflash-webcam-fix
...
Webcam name automatically set under Pepperflash before giving WebRTC video permission
2015-09-04 11:11:30 -04:00
Ghazi Triki
803673e5cb
Webcam name automatically set under Pepper flash before giving WebRTC video permission.
2015-09-03 23:06:22 +01:00
Ghazi Triki
fb205b1c35
Make VideoDock inherit from CustomMdiWindow to remove the right click "close" context menu item.
2015-09-03 20:26:05 +01: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
3c4055ec01
removed extra add_circle_outline icon from previous commit (use css style instead)
2015-09-03 15:16:16 -03:00