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 |
|
Richard Alam
|
531fc776f3
|
- cleanup
|
2012-12-27 20:16:58 +00:00 |
|
Richard Alam
|
4453c35a7c
|
- put skinning into separate dir and separate build.xml
|
2012-12-27 08:57:38 -08:00 |
|