Commits · 8a2bc3a420f7232607c9686b85263650f0916515 · hosting / chat / fairblue

Oct 20, 2015
- preview window for presenter displays the stream now · 8a2bc3a4
  Anton Georgiev authored 9 years ago
  
  8a2bc3a4
Oct 13, 2015
- temp changes · f08cd526
  Anton Georgiev authored 9 years ago
  
  f08cd526
Oct 01, 2015
- remove unrelated code · 76dfc1eb
  Anton Georgiev authored 9 years ago
  
  76dfc1eb
Sep 30, 2015
- add a webrtcDeskShare module (init version) · dbc0a59c
  Anton Georgiev authored 9 years ago
  
  dbc0a59c
- video-broadcast delete files after N days · 0d74742d
  Anton Georgiev authored 9 years ago
  
  0d74742d
- Revert webrtc code from old deskshare.A new module is coming · d9a706c8
  Anton Georgiev authored 9 years ago
  
  d9a706c8
Sep 29, 2015
- cleaning up and reverting unnecessary config · 6b8626d4
  Anton Georgiev authored 9 years ago
  
  6b8626d4
Sep 28, 2015
- deskshare edl for webrtc · 1d1c8a42
  Anton Georgiev authored 9 years ago
  
  1d1c8a42
Sep 25, 2015
- webrtc deskshare work on recording scripts · 366b01ff
  Anton Georgiev authored 9 years ago
  
  366b01ff
Sep 16, 2015
- video-broadcast records the streamed rtmp to file · 1de74bf0
  Anton Georgiev authored 9 years ago
  
  1de74bf0
Sep 10, 2015
- adding video-broadcast, rtmp streaming from FS is fine · cf77ce39
  Anton Georgiev authored 9 years ago
  
  cf77ce39
- cleaning up · 8b586719
  Anton Georgiev authored 9 years ago
  
  8b586719
Aug 24, 2015
- Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging · eb57aa7d
  Anton Georgiev authored 9 years ago
  
  eb57aa7d
Aug 23, 2015
- Merge pull request #2742 from ffdixon/update-bbb-conf · e464edf8
  Dixon Fred authored 9 years ago
  
  bbb-conf --clean also cleans logs for bbb-apps-akka and bbb-fsesl-akka
  e464edf8
- bbb-conf --clean also cleans log files for bbb-apps-akka and bbb-fsesl-akka · 49ece786
  Dixon Fred authored 9 years ago
  
  49ece786
- Merge pull request #2741 from ffdixon/update-bbb-conf · e52b6443
  Dixon Fred authored 9 years ago
  
  Added check to ensure PID for red5 matches that in /var/run/red5.pid
  e52b6443
- Added check to ensure PID for red5 matches that in /var/run/red5.pid · ec2cd056
  Dixon Fred authored 9 years ago
  
  ec2cd056
Aug 21, 2015

move deskshare publisher to MessageSenderActor · fb9c63dd
Anton Georgiev authored 9 years ago

fb9c63dd
Merge pull request #2738 from ffdixon/fix-bbb-conf · dc537f12
Dixon Fred authored 9 years ago
```
Fix bbb-conf to better parse config.xml
```
dc537f12
xMerge remote-tracking branch 'upstream/master' · cdf41e87
Dixon Fred authored 9 years ago

cdf41e87
Fixed error in parsing config.xml in bbb-conf · 660f1aae
Dixon Fred authored 9 years ago

660f1aae

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share · 1939dac0

Anton Georgiev authored 9 years ago

Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as

1939dac0

Merge pull request #2737 from ritzalam/redis-pubsub-keepalive · 1527c515
Dixon Fred authored 9 years ago
```
Redis pubsub keepalive
```
1527c515
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into redis-pubsub-keepalive · 39baecef
Richard Alam authored 9 years ago

39baecef
Merge pull request #2736 from riadvice/custom-polling-improve · c70dcfe9
Dixon Fred authored 9 years ago
```
Custom polling window simplified.
```
c70dcfe9
Custom polling window simplified. · 49ef1e36
Ghazi Triki authored 9 years ago

49ef1e36

Aug 20, 2015
- - add ping/pong message between different components to verfiy that we have working path · 46ba98f7
  Richard Alam authored 9 years ago
  
  46ba98f7
- Merge pull request #2735 from capilkey/misc-poll-fixes · 0f667f4c
  Chad Pilkey authored 9 years ago
  
  Misc poll fixes
  0f667f4c
- improve poll label display · f3db6617
  Chad Pilkey authored 9 years ago
  
  f3db6617
- fix presentation spelling · fc9fee08
  Chad Pilkey authored 9 years ago
  
  fc9fee08
- Merge pull request #2734 from riadvice/polling-multi-choice-window · 90cd7ce2
  Chad Pilkey authored 9 years ago
  
  Added new window for adding custom polling choices.
  90cd7ce2
- Revert "attempt to accommodate late joiners for ds on flash" · bcfbb7c3
  Anton Georgiev authored 9 years ago
  
  This reverts commit 8cf051a2.
  bcfbb7c3
- Added new window for adding custom polling choices. · 98f33db7
  Ghazi Triki authored 9 years ago
  
  98f33db7
- attempt to accommodate late joiners for ds on flash · 8cf051a2
  Anton Georgiev authored 9 years ago
  
  8cf051a2
- Merge pull request #2731 from capilkey/make-votes-noticeable · f7620cb4
  Richard Alam authored 9 years ago
  
  Make votes noticeable
  f7620cb4
- Merge pull request #2730 from OZhurbenko/meteor-ui · dbe2e1c3
  Richard Alam authored 9 years ago
  
  Polling, Sorting and URL Validation
  dbe2e1c3
- increased the font size of the vote button text · f5659af6
  Chad Pilkey authored 9 years ago
  
  f5659af6
- Merge remote-tracking branch 'upstream/master' into variable-wb-poll-size · fc460c39
  Chad Pilkey authored 9 years ago
  
  Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
  fc460c39
- Changed the whole way of how we calculate height and width of text elements,... · 5f6bd654
  Oleksandr Zhurbenko authored 9 years ago
  
  Changed the whole way of how we calculate height and width of text elements, as the previous one didn't work in Firefox. Also, if the number of the votes doesn't fit the box then it's displayed in black on the right. Changed the colors to dark grey
  5f6bd654
- added an audio queue when a poll is started · 95ca4ad1
  Chad Pilkey authored 9 years ago
  
  95ca4ad1