BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,113 Commits 13 Branches 260 Tags 1.1 GiB
6e002d966e
Commit Graph

5113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
6e002d966e Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2013-01-08 14:00:46 -05:00
Richard Alam
d015836913 Merge pull request #84 from capilkey/fix-css 
fixed some issues with the css related to focus and nofocus
 2013-01-08 10:21:08 -08: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
9da16e3613 - no need to notify others to play the stream since a user just needs to play the stream 2013-01-07 20:57:02 +00:00
jtrobinson
b8875cb0d8 Small updates to chat keys 2013-01-07 19:42:58 +00:00
jtrobinson
c10b348831 Chatbox navigation hotkeys modified to fit new specifications 2013-01-07 18:41:09 +00:00
Richard Alam
051c55c37d - modify default config.xml 2013-01-07 15:54:20 +00:00
Richard Alam
2ac2d651aa - add layout with notes and broadcast 2013-01-07 15:39:46 +00:00
Richard Alam
1ef970f15d - save and retrieve notes from a sample play app 2013-01-06 22:43:47 +00:00
jtrobinson
9aa8724040 Chat Window hotkeys work; on to Chat Message Box keys 2013-01-04 21:05:52 +00:00
Richard Alam
8ef6cf6699 - display notes 2013-01-04 19:06:00 +00:00
jtrobinson
cad3e44b4e Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2013-01-04 19:04:52 +00:00
jtrobinson
31597b6f75 Another hotkey, and merging in upstream changes 2013-01-04 19:04:48 +00:00
Chad Pilkey
b64a3f2515 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 
Conflicts:
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-01-04 14:04:33 -05:00
Chad Pilkey
b3a6e1e552 Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
 2013-01-04 14:03:39 -05:00
jtrobinson
16164068d5 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2013-01-04 16:32:48 +00:00
jtrobinson
4488dd86bf More shortcuts, locale strings 2013-01-04 16:32:41 +00:00
Chad Pilkey
a650b83392 fixing merge 2013-01-03 17:53:47 -05:00
Chad Pilkey
ced7f51152 hiding window contents on minimize 2013-01-03 17:50:40 -05:00
Richard Alam
7946d8f93b - handle previous saved notes 2013-01-03 22:14:04 +00:00
Richard Alam
6b95383957 - handle response when saving note 2013-01-03 20:44:32 +00:00
Richard Alam
7cffe46e9e - query for previous saved notes 2013-01-02 20:42:43 +00:00
Richard Alam
2602d06773 - dispatch save event when user clicks on save button or press ENTER key 2013-01-02 18:06:23 +00:00
Richard Alam
a4d453a3b7 - externalize strings to locale 2013-01-02 14:07:19 +00:00
Richard Alam
be04295217 remove scrollbars on chat input box 2013-01-02 13:39:47 +00:00
Richard Alam
7c58ed3c95 - try to display notes window 2013-01-02 01:45:48 +00:00
Richard Alam
b8ccabd292 - open notes module window 2013-01-01 22:19:58 +00:00
Richard Alam
00ea34d0b0 - dispatch events when saving notes 2013-01-01 21:20:05 +00:00
Richard Alam
5082ab583d - send events when success or error occurs 2013-01-01 17:55:50 +00:00
Richard Alam
777ce82156 - add notes module into build 2012-12-31 18:51:29 +00:00
Richard Alam
2869ede03a - start implementing notes module 2012-12-31 18:17:09 +00:00
Richard Alam
c99d2e591d - make button sizes consistent 2012-12-29 01:06:48 +00:00
Richard Alam
c712239a81 - show or hide whiteboard toolbar when switching presenter if presentation window is hidden 2012-12-29 00:41:38 +00:00
Richard Alam
e8230c3e33 - cleanup 2012-12-28 17:53:46 +00:00
Richard Alam
767d933bea - build the right default style 2012-12-28 17:44:41 +00:00
Richard Alam
6b36e0011a - build BBB default style 2012-12-28 17:32:14 +00:00
Richard Alam
67860910a6 - don't show toolbar when presentation is hidden or minimized 2012-12-28 17:19:10 +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
ae2eabb9bb Merge branch 'try-skinning' into merge-broadcast-with-skinning 2012-12-27 19:39:40 +00:00
Richard Alam
56ef1342e0 - use timer to trigger auto play 2012-12-27 19:36:30 +00:00
Richard Alam
f82d8224ea - make sure you don't play video when window is hidden 2012-12-27 19:17:18 +00:00
Richard Alam
968a56d556 - add broadcast window to layout as exception occurs when the module is loaded 2012-12-27 19:12:14 +00:00
Richard Alam
4453c35a7c - put skinning into separate dir and separate build.xml 2012-12-27 08:57:38 -08:00
Markos Calderon
3ac8d0a1bb added icons 2012-12-26 17:46:47 -05:00