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

6140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jtrobinson
747a6be5c0 Timer removed until a more effective notification procedure is developed. 2013-06-21 07:53:43 -07:00
Richard Alam
9c4a629a8c - recieve create poll message on server 2013-06-20 20:55:58 +00:00
Gustavo Salazar
d63fbac298 Create missing start events for webcam streams fix #1561 2013-06-20 15:45:26 -05:00
Richard Alam
f741e677d3 - create poll 2013-06-20 20:40:14 +00:00
Richard Alam
07ba395c27 fix switch presenter 2013-06-20 17:55:41 +00:00
Richard Alam
bc82800f03 - handle pre-uploaded presentation 2013-06-20 15:28:42 +00:00
Markos Calderon
c7db3b220b Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
 2013-06-19 20:00:35 -05:00
Markos Calderon
288a3872fc adding some configurations in spring 2013-06-19 19:59:25 -05:00
Gustavo Salazar
1bb53e71f9 Merge pull request #186 from fcecagno/playback-improvements 
Presentation playback improvements
 2013-06-19 17:48:59 -07:00
Richard Alam
6d17310990 - try to figure out why pre-uploaded slides are not showing up 2013-06-19 22:05:00 +00:00
Richard Alam
a2748cb307 - implement sending of create poll message to server 2013-06-19 21:16:03 +00:00
Leonardo Crauss Daronco
c6da73272b Hide unnecessary scroll bars in the playback html 2013-06-19 17:22:07 -03:00
Richard Alam
5e749d9dca - add more polling models 
- upgrade minimum Flash player version to 11.2
 2013-06-19 19:49:02 +00:00
Richard Alam
a4ae9524f4 Merge branch 'make-users-user-conn-invoke' of github.com:bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-06-19 18:37:26 +00:00
Richard Alam
8b16f42dc2 - cleanup formatting 2013-06-19 18:36:51 +00:00
Richard Alam
e4606d0a47 - start implementing receiving of messages from server for polling 2013-06-19 18:36:21 +00:00
Felipe Cecagno
e53ea59abe Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into playback-improvements 2013-06-19 12:44:38 -03:00
Markos Calderon
7e06dc75e3 Implementing keepAliveMessage 2013-06-19 10:27:23 -05:00
Felipe Cecagno
68db2b5fdc Merge branch 'playback-improvements' of github.com:fcecagno/bigbluebutton into playback-improvements 2013-06-19 12:21:01 -03:00
Felipe Cecagno
6e38af8db6 Merge pull request #2 from daronco/playback-improvements 
Fix the position of media controls in the playback with video
 2013-06-19 08:20:14 -07:00
Leonardo Crauss Daronco
ab73b54fb3 Fix position of elements in the playback after swapping video/presentation 
The media controls area (acorn controls) was placed in the wrong position
after swapping video and presentation in the recording playback (and was
still wrong if swapping them again).
 2013-06-18 23:19:08 -03:00
Richard Alam
a5824295b5 - send get polls reply 2013-06-18 15:45:34 -04:00
Felipe Cecagno
0551764df1 Merge branch 'playback-improvements' of github.com:daronco/bigbluebutton into playback-improvements 2013-06-18 15:53:58 -03:00
Richard Alam
335a1cd115 - setup up red5 sender to Flash client 2013-06-18 13:20:14 -04:00
Richard Alam
d9ffa1ce20 - implement sending of polling messages 2013-06-18 12:30:10 -04:00
Richard Alam
2eca78d600 Merge pull request #185 from SenecaCDOT-BigBlueButton/poll-hotkeys-64 
Poll hotkeys
 2013-06-18 08:40:36 -07:00
Richard Alam
adabc39197 - implement some polling logic 2013-06-18 11:39:04 -04:00
jtrobinson
cc3e376c6d Added local hotkeys back into Voting window. 2013-06-18 07:53:42 -07:00
Richard Alam
c4abeb827f - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1558 2013-06-18 10:47:30 -04:00
jtrobinson
70e5639483 Added local hotkeys to Polling Stats window 2013-06-18 06:52:01 -07:00
Leonardo Crauss Daronco
ce668c55b0 Fix the position of media controls in the playback with video 
The media controls area (acorn controls) was being displayed at the
wrong place in the playback of a recording with video. Now it's always
displayed right below the presentation area, doesn't matter if the
recording has video or not.
 2013-06-17 22:56:08 -03:00
Gustavo Salazar
9966c3fc61 fix url 2013-06-17 17:12:36 -05:00
Richard Alam
ec3f714c95 add keep alive message between bbb-web and bbb-apps 2013-06-17 21:59:32 +00:00
Richard Alam
0c9fb34243 start implementing logic for polling 2013-06-17 21:51:49 +00:00
Richard Alam
4fc7a40faf Merge remote branch 'origin/polling-module' into make-users-user-conn-invoke 2013-06-17 19:12:23 +00:00
jtrobinson
65f06c07ec Fixed local hotkeys in Instructions window. 2013-06-17 12:03:52 -07:00
jtrobinson
d2d8c58f77 Found the culprit: Missing handlers in the Event Map. 2013-06-17 11:52:36 -07:00
Richard Alam
0536939bc7 synching up with master 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
 2013-06-17 18:32:09 +00:00
jtrobinson
aa3db37692 More hotkeys code. Hotkeys still not quite functional. 2013-06-17 11:26:42 -07:00
Felipe Cecagno
820001214c improving the rap deployment script 2013-06-17 14:35:23 -03:00
Felipe Cecagno
0e5866a3d2 Merge pull request #1 from daronco/playback-improvements 
Reposition auto scroll option and audio bar in the playback html
 2013-06-17 10:34:13 -07:00
Richard Alam
ff13395782 - do a bunch of cleanup of unnecessary code 2013-06-17 16:12:40 +00:00
Richard Alam
753a728098 - modify presentation bbb-app 2013-06-16 15:20:54 -04:00
Fred Dixon
70f26a27f2 Minor updates to welcome message 2013-06-16 07:19:32 -07:00
Fred Dixon
81988c2e68 Updated index.html page to read 0.81-beta 2013-06-16 06:59:08 -07:00
Leonardo Crauss Daronco
891ae0be49 Reposition auto scroll option and audio bar in the playback html 
Audio control bar is bigger and aligns with the presentation. The auto scroll
checkbox is aligned with the thumbnails area.
 2013-06-16 01:35:39 -03:00
Richard Alam
e0c012fb7a - swithover presentation 2013-06-15 17:13:09 -04:00
Richard Alam
17fc410f63 - change var to val 2013-06-15 15:33:56 -04:00
Richard Alam
698b4c8e5f - fix compile problem 2013-06-15 15:02:32 -04:00
Fred Dixon
d05d2df02e Updated release to 0.81-beta 2013-06-15 03:00:45 -07:00