Richard Alam
2da1f7030d
- send polling message from client and receive on server
2013-06-21 22:08:08 +00:00
Markos Calderon
2f7c2949c5
fix locale
2013-06-21 16:41:00 -05:00
Richard Alam
886534cd32
cleanup
2013-06-21 20:21:31 +00:00
Richard Alam
3fef969f56
write some tests
2013-06-21 19:52:53 +00:00
Richard Alam
3051b66072
Merge branch 'master' into make-users-user-conn-invoke
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java
2013-06-21 17:42:09 +00:00
Richard Alam
e9e20d54d8
- fix unit test
2013-06-21 16:37:39 +00:00
Richard Alam
c82689cbb7
- handle polling message from flash client
...
- write unit test for conversion of messages
2013-06-21 15:37:52 +00:00
Chad Pilkey
390630d269
Merge pull request #152 from SenecaCDOT-BigBlueButton/global-hotkey-focus-fix
...
Global hotkey focus fix
2013-06-21 07:56:46 -07:00
Chad Pilkey
58e6ecbee1
Merge pull request #187 from SenecaCDOT-BigBlueButton/notification-hotfix
...
Timer removed until a more effective notification procedure is developed...
2013-06-21 07:55:36 -07:00
jtrobinson
747a6be5c0
Timer removed until a more effective notification procedure is developed.
2013-06-21 07:53:43 -07:00
jtrobinson
19fed749b1
Need to test this code still, pushing so I can make a hotfix in another branch.
2013-06-21 07:51:19 -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
jtrobinson
4da8a1c12a
Trying to dynamically populate the SHW drop-down list. Committing work in order to address another issue.
2013-06-20 07:33:38 -07: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
jtrobinson
479678316f
BigBlueButton.mxml now only loads hotkeys for use based on which modules are loaded or not.
2013-06-18 11:38:31 -07:00
jtrobinson
bd8aa63c98
Merged upstream changes and polling hotkeys
2013-06-18 11:17:45 -07:00
jtrobinson
dfa208aa78
Global hotkeys in Shortcut Help Window are now displayed based on which modules are and aren't loaded.
2013-06-18 11:10:54 -07:00
jtrobinson
4b9cd35eb7
Made members of ShortcutOptions static so that it only needs to be loaded once in BigBlueButton.mxml. You can't change the config mid-meeting, after all.
2013-06-18 10:49:46 -07:00
Richard Alam
335a1cd115
- setup up red5 sender to Flash client
2013-06-18 13:20:14 -04:00
jtrobinson
044ac80303
ShortcutOptions detects whether any modules are missing or commented out from config.xml
2013-06-18 09:50:36 -07:00
Richard Alam
d9ffa1ce20
- implement sending of polling messages
2013-06-18 12:30:10 -04:00
jtrobinson
f4162fb652
Created ShortcutOptions class to allow modular loading of hotkeys.
2013-06-18 08:40:37 -07: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
