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

262 Commits

Author SHA1 Message Date
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
Felipe Cecagno
6fe678d78a new icon set for the layout control buttons 2015-01-26 11:42:20 -02:00
Felipe Cecagno
25ff17d906 Merge branch '090-guest-role' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.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/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-25 21:01:10 -02:00
Felipe Cecagno
7dba55cdbb new set of icons for guest management 2015-01-25 20:52:41 -02:00
Felipe Cecagno
f6d6e4e40c Merge branch '090-guest-role' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	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/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/users/UsersApp.scala
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2015-01-25 18:36:30 -02:00
Felipe Cecagno
4a2eac0b94 Merge branch '090-network-monitor' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-25 17:31:07 -02:00
Felipe Cecagno
50a6e9ed4e changed the icon set for the network monitor feature 2015-01-25 17:29:03 -02:00
Felipe Cecagno
b2cd417049 Merge branch '090-network-monitor' into HEAD 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/config.xml.template
 2015-01-25 16:26:11 -02:00
Felipe Cecagno
df1fe03c29 Merge branch '090-expanded-status' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:48:19 -02:00
Felipe Cecagno
e65fa1d28e Merge branch '090-expanded-status' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.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-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:34:53 -02:00
Felipe Cecagno
703d206b0d Merge branch '090-download-presentation' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:20:35 -02:00
Felipe Cecagno
3cf904d8d7 replaced some icons from the presentation module by the google's material design icons 2015-01-24 17:18:30 -02:00
Felipe Cecagno
b86efc9119 Merge branch '090-download-presentation' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-24 16:44:26 -02:00
Felipe Cecagno
2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	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/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/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-21 18:11:56 -02:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Felipe Cecagno
2dfe4a1aac Merge branch '090-expanded-status' into mconf-live0.6.1 
Conflicts:
	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/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-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.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/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2014-12-10 18:33:18 -02:00
Felipe Cecagno
514c65e8cf prepared the css file to use the icons from the branding file instead of the embedded images file 2014-12-10 16:39:46 -02:00
Felipe Cecagno
c988875e2c changed the set of icons used for the mood feature 2014-12-10 16:38:25 -02:00
Felipe Cecagno
e9122a9637 Merge branch '090-download-presentation' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-11-23 23:02:22 -02:00
Felipe Cecagno
f9b8f4a452 another issue introduced when the branch 090-new-videodock was integrated; now the mute overlay button on the video is working properly with the correct icons 2014-11-23 18:22:12 -02:00
Felipe Cecagno
e349386548 fixed the bandwidth button icon that is missing since the integration of the 090-network-monitor branch 2014-11-22 20:29:09 -02:00
Mateus Dalepiane
ef043602c6 Merge branch '090-guest-role' into mconf-live0.6.1 
Conflicts:
	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/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-11-07 14:49:28 -02:00
Felipe Cecagno
66c62d483f improved the UI to be in conformity with the 0.9.0 version 2014-11-05 18:06:39 -02:00
Mateus Dalepiane
36af1da3df Port of guest role to bbb-090 
**WARNING**: Not tested yet.
bbb-client and bbb-web compile.
bbb-apps does not compile yet.

@bbb-apps: Missing scala implementation.
@bbb-client: Missing message receiver implementation.
Conflicts:
	bbb-api-demo/src/main/webapp/bbb_api.jsp
	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/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
	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-web/grails-app/conf/BigBlueButtonFilters.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/UserSession.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
 2014-10-16 16:58:10 -03:00
Felipe Cecagno
f40f9bf767 Merge branch '090-fullscreen' into 090-branding-logo 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-05 23:31:39 -03:00
Felipe Cecagno
5f2f2662af Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	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
 2014-10-05 22:00:28 -03:00
Felipe Cecagno
fc96d14984 reset the video message warning label style (lost in a merge) 2014-10-05 20:37:59 -03:00
Mateus Dalepiane
f78cecb07d Fixed network monitor button height 2014-09-30 12:30:06 -03:00
Mateus Dalepiane
cdb2fa5d3e Moved network monitor button to MainToolbar 2014-09-15 16:35:25 -03:00
Mateus Dalepiane
77c6bbf500 Merge branch '090-new-videodock' into mconf-live0.6.1 2014-09-03 16:39:03 -03:00
syeshchenko
1d148ef624 Merge branch 'master' into chrome-webcam-permission-prompt 2014-09-01 13:18:32 -07:00
syeshchenko
ae6a4d5fa1 on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
Richard Alam
2c67bf44ea - move deskshare view control to the top of the window 2014-08-29 13:29:01 -07:00
Mateus Dalepiane
cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-08-26 17:20:00 -03:00
syeshchenko
77b7d4b327 identify if user is on mac and chrome and show the warning during desktop share 2014-08-26 12:02:08 -07:00
syeshchenko
85d3e5f72a properly resized upload presentation window, removed unnecessary text 2014-08-21 10:48:13 -07:00
Chad Pilkey
9daf1d7a16 added styling to the fileupload help, also cleaned up some text 2014-08-17 13:56:15 -07:00
Ghazi Triki
716ee3c731 Added a follower tooltip with an indicator arrow. 2014-08-13 23:08:03 +01:00
Richard Alam
723ee43830 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
Richard Alam
92254d4853 - allow voice conf button to be stylized 2014-08-07 11:42:57 -07:00
Richard Alam
e6f1c6a852 - add string to locale 2014-08-05 11:14:23 -07:00
Felipe Cecagno
c3c56a6355 few improvements on the camera messages; cleanup and refactoring of the new video dock implementation; extracted many hardcoded branding information to the branding file 2014-06-11 17:01:45 -03:00
Felipe Cecagno
fad9a9a38b Merge branch 'multicamera-0.81' into new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.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/ToolbarPopupButton.mxml
 2014-03-27 17:41:16 -03:00
Felipe Cecagno
b4607f8f38 better icons in the video windows 2014-03-24 17:37:47 -03:00
Felipe Cecagno
69ea5a3175 fully working version of the new videoconf window, still needs some UI tweaks to look better 2014-03-19 15:47:41 -03:00
Felipe Cecagno
79e513b38f Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	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/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2014-03-12 21:58:15 -03:00
Felipe Cecagno
417b518c2b Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-02-24 12:37:35 -03:00
Chad Pilkey
e3b617225e Merge pull request #305 from syeshchenko/presentationWindowFix 
FileUploader window fixes
 2014-02-12 13:04:00 -05:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00
Chad Pilkey
ecac0b7a1d fixed up the ui of the audio settings a little bit 2014-02-04 14:43:20 -08:00
Felipe Cecagno
ca97a5eec5 implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
 2014-01-15 17:53:10 -02:00
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-01-14 14:05:41 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Chad Pilkey
6ffb35428c remove the blue background from the Java Test linkbutton 2013-10-21 16:22:07 -07:00
Richard Alam
c4855876c3 - change test java link 2013-10-21 21:50:38 +00:00
Richard Alam
b07dde529c - add java version required notice in when starting desktop sharing 2013-10-21 18:09:00 +00:00
Felipe Cecagno
bafa7531d7 updating the icon set (webcam, deskshare, microphone and record control) - same base icons, new "check" and "x" layers 2013-10-11 13:53:36 -03:00
Felipe Cecagno
38f477ab2e Merge commit '6b954488659201f4e10524fcb6edb46875bf377e' into multicamera-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2013-10-04 13:50:07 -03:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-09-24 15:03:44 -03:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Felipe Cecagno
9c512931e0 starting to implement the client-side of the record button; nothing yet was modified on bigbluebutton-apps 2013-09-19 17:53:48 -03:00
Felipe Cecagno
9bfb5d236a better handling the settings window; now the window is only created when the user clicks on the button, so it won't be shown anymore for non-moderator participants 2013-09-15 19:07:36 -03:00
Felipe Cecagno
ccb29c30eb setting up the language selector style; fixed identation 2013-08-29 14:51:31 -03:00
Felipe Cecagno
5537f4d35c Merge branch 'master' into multicamera-0.81 
Conflicts:
	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/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2013-08-25 11:54:30 -03:00
Chad Pilkey
9f79d5ae31 Merge pull request #235 from mconf/resolution-combo-style 
Fixed the style of the video resolution combobox
 2013-08-22 12:46:11 -07:00
Chad Pilkey
61a6298f80 changed the branding build directory from bin to client 2013-08-20 12:35:13 -07:00
Felipe Cecagno
cd02ad5c79 fixed the style of the video resolution combobox 2013-08-20 14:07:38 -03:00
jtrobinson
1463b52689 Logout confirmation window has been moved to the upper-right corner, skinned to fit in better with other BBB components. 2013-08-01 08:48:00 -07:00
Tyler Copeland
b6de969cbf Updated upload document icon 2013-07-26 15:05:42 -04:00
Chad Pilkey
d88af818f5 added 4 link buttons to the start of the tab order when a screen reader is active 2013-07-17 13:27:23 -07:00
Felipe Cecagno
371243dbe6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.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/VideoWindow.mxml
 2013-06-28 16:09:11 -03:00
Chad Pilkey
468d470f97 meeting title bar is working correctly 2013-06-10 14:36:10 -07:00
Richard Alam
fb56c6c886 - change how we display webcam setting popup into more like the mic settings 2013-05-25 18:04:30 +00:00
Fred Dixon
4af527f40b Revert to old fit-to-page button 2013-05-19 17:32:20 -07:00
Fred Dixon
a7390ba8d8 Tweaks to fit-to-page button 2013-05-19 17:21:51 -07:00
Fred Dixon
be1e5ca5a0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-19 17:18:12 -07:00
Fred Dixon
ca93488d7d Slight tweak to the fit-to-page icon for presenter 2013-05-19 17:18:03 -07:00
Fred Dixon
355334a6c5 Adjusted the logout icon for better fit in button 2013-05-14 21:03:51 -04:00
Chad Pilkey
4adb843005 changed logout button to an icon 2013-05-14 15:42:59 -07:00
Chad Pilkey
f4e57188ed help button changed to question mark 2013-05-14 14:28:25 -07:00
Felipe Cecagno
eb6035177b Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 2013-04-28 18:28:56 -04:00
Felipe Cecagno
99d6d959f9 Implementation done during the 2nd BigBlueButton Hackfest on April 2013; implemented the concept of video profiles - the sysadmin can specify in a XML file the video profiles that the users will use to broadcast video; it includes width, height, key interval, fps, enableH264 among other parameters; a hack was done to enable the user subscribe to a different profile than the one that is being broadcasted - on the server-side there will be a transcoder component that will handle this kind of subscription 2013-04-28 18:18:17 -04:00
Chad Pilkey
ddfc84b8c0 added disabled icons for left and right arrow buttons in presentation window 2013-04-27 10:21:40 -07:00
Richard Alam
0db837a18d Merge pull request #129 from SenecaCDOT-BigBlueButton/fix-presentation-ctrlbar 
Fix presentation ctrlbar
 2013-04-25 13:30:31 -07:00
Chad Pilkey
f62f66c451 increased the size of the left and right presentation buttons 2013-04-25 08:43:50 -07:00
Chad Pilkey
d78ce305ab added a headset icon to the join audio button 2013-04-24 09:54:08 -07:00
Fred Dixon
040cf5478c Updated fit-to-screen icon 2013-04-20 17:02:49 -07:00
Fred Dixon
6083c28418 Remove red from cancel button in presentation upload dialog 2013-04-16 19:42:23 -07:00
Richard Alam
d9dc599b24 - add a black theme file 2013-03-23 20:48:55 +00:00
Chad Pilkey
f1b9e19a42 cleaned up the UI a little 2013-03-07 18:04:32 -05:00
Chad Pilkey
8702b42def Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2013-02-19 13:45:50 -05:00
Richard Alam
dc24de7743 - change red button to gray and add play icon to the webcam start button 2013-02-11 00:15:40 +00:00
Richard Alam
66200ea3bc - remove camera names drop down as it's the same as the camera settings button 2013-02-01 19:05:21 +00:00
Markos Calderon
4d27998866 Adding branding for webcam preview 2013-01-30 18:05:02 -05:00
Richard Alam
943feb2b35 - update default BBB style 2013-01-28 18:47:08 +00:00
Richard Alam
a78929af0c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-08 20:05:11 +00:00
Richard Alam
6303de3007 - extract webcam control icons 2013-01-08 20:04:03 +00:00
Chad Pilkey
6473135e3f fixed some issues with the css related to focus and nofocus 2013-01-08 13:08:44 -05:00
Richard Alam
be04295217 remove scrollbars on chat input box 2013-01-02 13:39:47 +00:00
Richard Alam
b6c7568778 make the whiteboard icons a little bigger 2012-12-28 16:38:33 +00:00
Richard Alam
b8da6891f5 - add icons for default 2012-12-28 00:48:30 +00:00
Richard Alam
6a66062164 - cleaning up default style 2012-12-27 23:41:55 +00:00
Richard Alam
a2c9aef63a - add README 2012-12-27 21:46:06 +00:00
Richard Alam
ac64fc5c2c - add default bbb style 2012-12-27 21:36:05 +00:00
Richard Alam
7a34a5177e - add default skin/style 2012-12-27 20:27:29 +00:00