Ghazi Triki
39fdeabf4c
Improved audio settings windows.
2017-07-31 14:53:04 +01:00
Ghazi Triki
b6f11c5604
Updated list text states colours and bottom bar items height.
2017-07-27 21:36:23 +01:00
Ghazi Triki
997fa45d2d
Replace connection lost animation by a static asset.
2017-07-27 18:28:12 +01:00
Ghazi Triki
8ef1969cb0
Minor update for chat and presentation toolbar icons.
2017-07-27 16:48:18 +01:00
Ghazi Triki
63b48d9db8
Restrict using emoji from version 1.1 only
2017-07-26 15:41:41 +01:00
Ghazi Triki
a31452c17f
Update glow effect colour.
2017-07-25 23:11:12 +01:00
Ghazi Triki
2939ed3a53
Update TilteWindow close button skin.
2017-07-25 15:29:14 +01:00
Ghazi Triki
dc014b1a11
Fix PopUpButtonSkin border colors.
2017-07-25 11:58:54 +01:00
Ghazi Triki
d4d737dfd2
Implement new design for quick links buttons.
2017-07-25 11:35:54 +01:00
Ghazi Triki
e8fa7b0d49
Updated main toolbar help icon style.
2017-07-25 10:54:18 +01:00
Ghazi Triki
a6d8cbdd92
Minor updates to icons.
2017-07-24 18:34:20 +01:00
Ghazi Triki
cd478ecb49
Fix borderThickness property name.
2017-07-24 14:10:14 +01:00
Ghazi Triki
fed90fdf90
Update top toolbar buttons with new colour styles with the correct states.
2017-07-24 12:58:28 +01:00
Ghazi Triki
b82e04fb7d
Updated style with new colours and fixed some icons.
2017-07-21 15:03:24 +01:00
Ghazi Triki
186417fb6f
Merge branch 'master-v2' into 2x-client-theme
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/common/Images.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
2017-07-18 18:38:46 +01:00
Ghazi Triki
f52352f88f
Deleted legacy client themes.
2017-07-18 00:14:53 +01:00
Ghazi Triki
f6844d83ba
Replace image assets with new theme icons.
2017-07-17 18:43:16 +01:00
Ghazi Triki
3e78731b11
Replace all icons and update all styles for V2Theme.css
2017-07-17 15:29:47 +01:00
Ghazi Triki
3ef64e465e
Updated whiteboard icons and cursors.
2017-07-14 18:13:43 +01:00
Ghazi Triki
62630b00c9
Use new icons and style for whiteboard tool bar.
2017-07-13 13:53:30 +01:00
Ghazi Triki
1ca350c6c8
Updated data grid and icons for users item renderers.
2017-07-12 17:37:05 +01:00
Ghazi Triki
25997d34c1
Implemented new style for user video.
2017-07-11 15:58:55 +01:00
Ghazi Triki
2944cfd35a
Move MuteMeButton component to phone module and updates styles for phone module buttons.
2017-07-11 10:34:49 +01:00
Ghazi Triki
fae4a1de2c
Implemented new skin for PopUpButton.
2017-07-10 15:23:01 +01:00
Ghazi Triki
7b228f58d2
Added new programmatic skin for Panel based component.
2017-07-08 20:38:28 +01:00
Ghazi Triki
436094cd6e
Added new skin for ComboBox component.
2017-07-07 22:53:53 +01:00
Ghazi Triki
6123a83586
Improved ButtonSkin and implemented AudioSelectionWindow new design.
2017-07-07 00:42:57 +01:00
Ghazi Triki
917f9029d8
Replace swf asset button skin by a new skin class.
2017-07-06 15:58:12 +01:00
Ghazi Triki
859b0cd33d
Updated to mdi window buttons and style.
2017-07-05 18:38:44 +01:00
Ghazi Triki
97ba9e29a4
Implemented progress bar skins.
2017-07-04 16:44:39 +01:00
Ghazi Triki
fccf1920f2
Added SourceSansPro font as default font.
2017-07-04 15:51:53 +01:00
Ghazi Triki
5cb30b7bc3
Activated old button icons from legacy default theme.
2017-07-04 15:26:56 +01:00
Ghazi Triki
b4ee163e33
Added v2 styles for Alert, Button and CombBox.
2017-07-04 12:08:45 +01:00
Ghazi Triki
d5e0098a52
Added new theme named V2Theme with a brand fresh new style.
2017-07-03 18:36:53 +01:00
Ghazi Triki
b59903e714
Suppress css compile-time warnings.
2017-06-13 12:34:51 +01:00
Richard Alam
8fa960e46d
Merge pull request #3989 from riadvice/add-show-webrtc-mos-feature
...
Add showWebRTCMOS option to PhoneModule
2017-06-07 10:44:38 -04:00
Ghazi Triki
cd8f09170f
Add showWebRTCMOS option.
2017-06-05 13:28:24 +01:00
Ghazi Triki
aaf9b336f3
Transform the client to a Flex 4 mx application.
2017-05-29 13:58:18 +01:00
Ghazi Triki
f61308af64
Remove flex 3 compatibility mode from client build.
2017-05-29 13:53:07 +01:00
Chad Pilkey
f2bc898750
new multiuser whiteboard icon and fixes for text object
2017-05-08 13:46:47 -04:00
Richard Alam
262c7250c8
Merge branch 'master' with bbb-mconf
2017-04-17 15:57:31 +00:00
Chad Pilkey
183ac7b411
Merge pull request #3795 from riadvice/webrtc-quality
...
Display WebRTC stats inside the Flex client
2017-04-11 15:50:16 -04:00
Ghazi Triki
a40deced61
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
2017-04-10 20:22:30 +01:00
Ghazi Triki
92554f8b3e
Squashed commits for displaying WebRTC stats inside the Flex client.
2017-04-10 11:16:46 +01:00
Pedro Beschorner Marin
f59e42bb02
Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1
2017-04-04 20:42:15 +00:00
Ghazi Triki
7de860d3da
Remove video view border in dark mode.
2017-03-23 18:38:37 +01:00
Ghazi Triki
596f752ff1
Update MainApplicationShell and its footer style when video chat layout is selected.
2017-03-23 18:28:21 +01:00
Ghazi Triki
313de26ddb
Fix "videoDockStyleNoFocusChatLayout" style class border color.
2017-03-23 14:40:03 +01:00
Ghazi Triki
a416f8cb8c
"Video Chat" Layout has a dark background, controls are and title are removed in this layout.
2017-03-22 17:34:11 +01:00
Pedro Beschorner Marin
c74cc682c4
Merge remote-tracking branch 'mconf/mconf'
2017-03-20 19:45:59 +00:00
Chad Pilkey
443e131bde
chat selection indicator is now a bg highlight instead of box
2017-03-01 12:06:13 -05:00
Ghazi Triki
9dee97c75f
Add more spacing to breakout rooms actions buttons.
2017-02-01 14:36:31 +01:00
Pedro Beschorner Marin
ddd1459d4c
Refactored sharednotes UNDO operation and implemented REDO
2016-10-21 19:33:30 +00:00
Pedro Beschorner Marin
1eb1aea65e
More sofisticated control of sharednotes undo button
2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
43c0a1ab17
Stating implementing sharednotes undo and redo
2016-10-17 16:15:23 +00: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
Felipe Cecagno
503127b95c
add confirmation when the moderator choose to close the session after quit
2016-09-15 14:11:22 -03:00
Felipe Cecagno
79c3c12256
Merge branch 'merge-presentation-deskshare' into mconf
...
Conflicts:
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/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
2016-09-14 14:49:48 -03: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
59e1ba93d7
update two Mac screenshare help images
2016-08-26 07:51:00 -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
b1769febaa
Fix breakoutRoomTimerBox style.
2016-08-22 19:55:57 +01:00
Ghazi Triki
a16ec795c8
Show remaining time for breakout room in bold.
2016-08-22 18:48:09 +01:00
kreismann
93e0ff8ab5
Warning presenter that his screen is being shared
...
To do it, we've put a customized version of VideoWithWarningsBase inside DesktopViewWindow
2016-08-18 15:50:46 -03:00
Pedro Beschorner Marin
85e68a66ca
Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
4c432ee5bd
Merge branch 'feature-1931' into rafafp-branches-merged-1.0
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
record-and-playback/presentation/scripts/publish/presentation.rb
2016-06-22 13:06:51 +00:00
Pedro Beschorner Marin
e47cd67903
Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0
...
Conflicts:
bbb-video/build.gradle
bbb-voice/build.gradle
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
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/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
deskshare/app/build.gradle
deskshare/build.gradle
2016-06-20 16:11:04 +00:00
Pedro Beschorner Marin
17fc566975
Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0
...
Conflicts:
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-config/web/default.pdf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2016-06-17 18:00:51 +00:00
Felipe Cecagno
f9cb88a1f5
Merge remote-tracking branch 'RafaFP/fix-1822' into mconf-live0.7.5
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
2016-06-13 16:42:51 -03:00
Felipe Cecagno
0b26840403
Merge remote-tracking branch 'RafaFP/feature-1851' into mconf-live0.7.5
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
2016-06-13 11:44:04 -03: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
Ghaz Triki
13a65a2a1e
Center Alert title and message.
2016-05-04 09:58:45 +01:00
Ghaz Triki
64068cc30e
Updated BreakoutRoomSettings layout and style.
2016-04-27 14:25:32 +01:00
Richard Alam
5e45bcf2d7
Merge fix to missing images for brnading.
2016-04-26 20:16:31 -04:00
Chad Pilkey
bf7d3332b9
add two branding images back to the client
2016-04-27 11:26:12 -07:00
Richard Alam
b86f32b8c1
Sync with upstream repository
...
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-04-26 20:01:20 -04:00
Ghaz Triki
01335b6e8a
Merge branch 'master' into mobile-client
2016-04-25 19:58:13 +01: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
Chad Pilkey
6784c4c36d
fixed a couple of accessibility bugs in 1.0
2016-04-04 12:23:51 -07:00
Ghaz Triki
bb6d62e071
Implemented video chat for web and mobile clients.
2016-04-01 15:34:54 +01:00
Richard Alam
7d5c9d63e4
Upgrade to Java 8
...
Upgrade to Java 8 and merge screenshare feature.
Conflicts:
bigbluebutton-client/.actionScriptProperties
2016-03-21 20:19:48 +00:00
Richard Alam
7fe44355d4
Merging breakout rooms with the master branch
...
Merge breakout rooms feature with master branch. This
also includes closed captioning feature.
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-web/.classpath
bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-03-21 17:52:23 +00:00
Pedro Beschorner Marin
b891be2e95
Client now react to warning messages and refactored server
2016-03-04 20:45:56 +00:00
RafaFP
89ac2fd60a
Improved the code to meet the peer review results.
...
refs #1931
2016-03-04 17:40:48 +00:00
RafaFP
932de9c07f
Updated class and method names to better correspond to the implemented function.
...
Improved the recording code.
refs #1931
2016-03-02 16:02:30 +00:00
Felipe Cecagno
e4da408c08
Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
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/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.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/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
record-and-playback/presentation/playback/presentation/0.9.0/playback.html
record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
Ghaz Triki
990e786340
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-web/.classpath
# bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-02-28 21:34:33 +01:00
RafaFP
029aa4a6d7
Implemented a Warning PopUp Window to check that the moderator really wants to clear the chat.
...
refs #1931
2016-02-23 20:22:09 +00:00
RafaFP
65b181198c
Implemented a button to clear chat history.
...
New conversation joiners will not receive the history previous to the clearing.
Current conversation users will clear the local chat history and be notified that a moderator cleared the chat.
refs #1931
2016-02-22 22:10:04 +00:00
RafaFP
c1024c86d3
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 select them.
Merged for use with the 0.8.0 version.
refs #1822
2016-02-16 19:55:19 +00:00
Richard Alam
dd37445b7d
- screenshare client
2016-02-10 19:43:38 +00:00
Chad Pilkey
addfe4e502
increase contrast on some font colours
2016-02-08 13:02:00 -08:00
Ghazi Triki
0385d05001
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# akka-bbb-apps/build.sbt
# akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
# akka-bbb-fsesl/build.sbt
# bbb-common-message/build.sbt
# bigbluebutton-apps/build.gradle
# bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2016-01-27 14:16:05 +01: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
Chad Pilkey
a2203ad5e6
unbold the lock settings categories in the popup
2016-01-22 14:52:45 -08:00
Ghazi Triki
85bb2fd47b
Display breakout room users list.
2016-01-22 16:50:19 +01: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
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
15ad366550
move the shared notes icons to branding
2015-12-08 17:38:05 -02: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
Richard Alam
0c2a2e6ce1
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into breakout-rooms-porto-algre-2015
2015-11-17 23:25:54 -05:00
Ghazi Triki
165b3d6103
Fixed BreakoutRoomSettings style.
2015-11-16 17:32:16 -02:00
Ghazi Triki
423c0c0ecd
String localised for the breakout room feature.
2015-11-11 20:25:30 +01: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
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
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
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
Ghazi Triki
c5a3b713ba
Improved EmojiGrid layout.
2015-09-02 10:07:40 +01:00
Ghazi Triki
9fcaf6c6ca
Fixed missing emoji locales and minor improvement for the EmojiGrid padding.
2015-09-01 00:06:47 +01:00
Ghazi Triki
f0eed97bb8
Remove status button is correctly displayed.
2015-08-28 19:50:34 +01:00
Ghazi Triki
7ec8c6e3b7
Merge branch 'master' into emoji-status
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
2015-08-28 19:06:48 +01:00
Ghazi Triki
a7d2820c24
Improved emoji feature components.
2015-08-28 19:02:52 +01:00
Ghazi Triki
35e8d03949
- Added new EmojiGrid component.
...
- Replaced raise hand feature by emoji status in client (WIP)
2015-08-27 21:31:46 +01:00
Chad Pilkey
0994e90d6d
increased the audio dialog font size
2015-08-26 16:50:59 -04:00
Chad Pilkey
2240ff0cd3
added a checkbox for audible chat notifications
2015-08-24 14:34:08 -04:00
Ghazi Triki
98f33db751
Added new window for adding custom polling choices.
2015-08-20 18:37:15 +01:00
Chad Pilkey
0dc0b7221c
increase the size of the responders label
2015-08-13 17:20:15 -04:00
Chad Pilkey
bfd6e15ad7
moved stuff around in PollResultsModal
2015-08-11 15:35:12 -04:00
Pedro Beschorner Marin
b1ccea37a1
Merge branch 'auto-reconnect' into development
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
2015-07-23 18:44:21 +00:00
Chad Pilkey
be9971c2cd
fixed the weird colouring in the TitleWindow headers and removed uneeded duplication in CSS
2015-07-17 18:06:11 -04:00
Chad Pilkey
0132f62f65
fixed issue 1964 making meeting name label truncate
2015-07-09 18:45:19 -04:00
Pedro Beschorner Marin
324ed1b9ab
Merge branch 'auto-reconnect' into mconf-live0.6.4
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.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/modules/users/services/MessageReceiver.as
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
2015-07-03 14:35:08 +00:00
Chad Pilkey
628d47968d
fixed the poll start button css
2015-06-23 15:09:44 -04:00
Chad Pilkey
078f9accb9
added a poll image to the branding folder
2015-06-23 11:34:43 -04:00
Chad Pilkey
49366a5782
started on the publish poll client code
2015-06-23 11:34:09 -04: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
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
19e54bfe66
refactored the autoreconnect capability
...
- multiple disconnections are reestablished in order, first the main bigbluebutton connection, then the other connections
- if the user was sharing video, and the video connection drops, the video views close and it reconnect in a consistent state
- if the user is connected to webrtc and the main connection drops, the webrtc connection will still be active, then the server will send a UserLeft message to everyone and will reconnect the user as a phone user, so the UI continues consistent; when the user reconnects, it will reuse the voice information
IMPORTANT: modify external.xml in order to disable media timeout
/opt/freeswitch/conf/sip_profiles/external.xml: <param name="rtp-timeout-sec" value="0"/>
2015-05-08 12:43:25 -03:00
Felipe Cecagno
f8d5198177
implement time and multiple occurrences in the client warning window
2015-05-08 12:37: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
bb330cf0a2
Merge branch '090-deskshare-window' into mconf-live0.6.2
...
Conflicts:
bigbluebutton-client/resources/prod/layout.xml
bigbluebutton-client/resources/prod/lib/deployJava.js
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2015-03-02 00:25:02 -03:00
Chad Pilkey
815be28d0b
Revert "Revert "Added Java check to the configuration notifications""
...
This reverts commit 82545a03f3
.
2015-03-02 00:53:10 +00: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
162e6899a4
added back the css for the video warning message
2015-01-28 19:18:58 -02:00
Chad Pilkey
19fb9b9671
Revert "Revert "Added Java check to the configuration notifications""
...
This reverts commit 82545a03f3
.
2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3
Revert "Added Java check to the configuration notifications"
2015-01-27 17:11:54 -05:00
Chad Pilkey
84d6c5e132
added deskshare help information for Chrome users
2015-01-27 13:54:24 -08: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