BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e47cd67903
bigbluebutton-Github/bigbluebutton-client/branding/default/style/css/assets/images
History
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
..
3_closeButton.png - cleaning up default style 2012-12-27 23:41:55 +00:00
3_decreaseButton.png - cleaning up default style 2012-12-27 23:41:55 +00:00
3_increaseButton.png - cleaning up default style 2012-12-27 23:41:55 +00:00
3_minimizeButton.png - cleaning up default style 2012-12-27 23:41:55 +00:00
audio_20_white.png better icons in the video windows 2014-03-24 17:37:47 -03:00
audio_20_white.xcf better icons in the video windows 2014-03-24 17:37:47 -03:00
audio_muted_20_white.png better icons in the video windows 2014-03-24 17:37:47 -03:00
bandwidth.png Moved network monitor button to MainToolbar 2014-09-15 16:35:25 -03:00
chromePluginBlocked.png Revert "Revert "Added Java check to the configuration notifications"" 2015-03-02 00:53:10 +00:00
control-record-start.png implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
control-record-stop.png implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
control-record.png implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
delete.png - add icons for default 2012-12-28 00:48:30 +00:00
deskshare_close.png - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
deskshare_icon.png - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
deskshare_on.png - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
ellipse.png - add icons for default 2012-12-28 00:48:30 +00:00
fit-to-screen.png Revert to old fit-to-page button 2013-05-19 17:32:20 -07:00
fit-to-width.png added styling to the fileupload help, also cleaned up some text 2014-08-17 13:56:15 -07:00
hand.png - add icons for default 2012-12-28 00:48:30 +00:00
headset_close.png - allow voice conf button to be stylized 2014-08-07 11:42:57 -07:00
headset_open.png - allow voice conf button to be stylized 2014-08-07 11:42:57 -07:00
headset.png added a headset icon to the join audio button 2013-04-24 09:54:08 -07:00
ic_access_time_black_18dp.png 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
ic_add_circle_outline_16px.png new icon set for the layout control buttons 2015-01-26 11:42:20 -02:00
ic_arrow_back_24px.png replaced some icons from the presentation module by the google's material design icons 2015-01-24 17:18:30 -02:00
ic_arrow_back_grey_24px.png replaced some icons from the presentation module by the google's material design icons 2015-01-24 17:18:30 -02:00
ic_arrow_forward_24px.png replaced some icons from the presentation module by the google's material design icons 2015-01-24 17:18:30 -02:00
ic_arrow_forward_grey_24px.png replaced some icons from the presentation module by the google's material design icons 2015-01-24 17:18:30 -02:00
ic_clear_black_18dp.png 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
ic_content_copy_black_16px.png Changed the ChatToolbar position and changed the text in the buttons to icons. 2015-10-26 19:39:02 +00:00
ic_fast_forward_black_18dp.png 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
ic_fast_rewind_black_18dp.png 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
ic_file_download_16px.png new icon set for the layout control buttons 2015-01-26 11:42:20 -02:00
ic_file_download_grey_16px.png Created an event and function to enable/disable the DownloadPres button when there are/aren't presentations available for downloading. 2016-01-14 18:36:27 +00:00
ic_file_upload_16px.png new icon set for the layout control buttons 2015-01-26 11:42:20 -02:00
ic_mood_black_18dp.png 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
ic_note_add_16px.png move the shared notes icons to branding 2015-12-08 17:38:05 -02:00
ic_note_format_16px.png move the shared notes icons to branding 2015-12-08 17:38:05 -02:00
ic_save_16px.png move the shared notes icons to branding 2015-12-08 17:38:05 -02:00
ic_send_16px.png new icon set for the layout control buttons 2015-01-26 11:42:20 -02:00
ic_settings_16px.png new set of icons for guest management 2015-01-25 20:52:41 -02:00
ic_swap_vert_16px.png changed the icon set for the network monitor feature 2015-01-25 17:29:03 -02:00
ic_thumb_down_16px.png new set of icons for guest management 2015-01-25 20:52:41 -02:00
ic_thumb_up_16px.png new set of icons for guest management 2015-01-25 20:52:41 -02:00
ic_volume_down_black_18dp.png 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
ic_volume_up_black_18dp.png 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
icon-3-high-five.png 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
icon-3-high-five.svg 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
icon-6-smiling-face.png 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
icon-6-smiling-face.svg 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
icon-6-thumb-up.png 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
icon-6-thumb-up.svg 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
icon-7-sad-face.png 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
icon-7-sad-face.svg 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
icon-7-thumb-down.png 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
icon-7-thumb-down.svg 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
icons-license.txt Merge branch 'auto-reconnect' into mconf-live0.6.4 2015-07-03 14:35:08 +00:00
left-arrow-disabled.png added disabled icons for left and right arrow buttons in presentation window 2013-04-27 10:21:40 -07:00
left-arrow.png increased the size of the left and right presentation buttons 2013-04-25 08:43:50 -07:00
line.png - add icons for default 2012-12-28 00:48:30 +00:00
logout.png Adjusted the logout icon for better fit in button 2013-05-14 21:03:51 -04:00
marker.png - add default bbb style 2012-12-27 21:36:05 +00:00
pencil.png - add icons for default 2012-12-28 00:48:30 +00:00
play-blue.png - change red button to gray and add play icon to the webcam start button 2013-02-11 00:15:40 +00:00
poll_icon.png fixed the poll start button css 2015-06-23 15:09:44 -04:00
questionmark.png - update default BBB style 2013-01-28 18:47:08 +00:00
resizeHandler.png - cleaning up default style 2012-12-27 23:41:55 +00:00
right-arrow-disabled.png added disabled icons for left and right arrow buttons in presentation window 2013-04-27 10:21:40 -07:00
right-arrow.png increased the size of the left and right presentation buttons 2013-04-25 08:43:50 -07:00
square.png - add icons for default 2012-12-28 00:48:30 +00:00
status_fail.png added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
status_refresh.png refactored the autoreconnect capability 2015-05-08 12:43:25 -03:00
status_success.png added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
status_warning_20.png added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
status_warning.png added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
stop.png 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
text.png - add icons for default 2012-12-28 00:48:30 +00:00
trash.png - update default BBB style 2013-01-28 18:47:08 +00:00
triangle.png - add icons for default 2012-12-28 00:48:30 +00:00
undo.png - add icons for default 2012-12-28 00:48:30 +00:00
upload.png Updated upload document icon 2013-07-26 15:05:42 -04:00
webcam_close.png - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
webcam_on.png - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
webcam-eject-user.png - extract webcam control icons 2013-01-08 20:04:03 +00:00
webcam-muted.png - extract webcam control icons 2013-01-08 20:04:03 +00:00
webcam-private-chat.png - extract webcam control icons 2013-01-08 20:04:03 +00:00
webcam-switch-presenter.png - extract webcam control icons 2013-01-08 20:04:03 +00:00
webcam-unmuted.png - extract webcam control icons 2013-01-08 20:04:03 +00:00
webcam.png - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00