BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,781 Commits 13 Branches 260 Tags 1.1 GiB
660f1aaecd
Commit Graph

10781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
660f1aaecd Fixed error in parsing config.xml in bbb-conf 2015-08-21 16:55:16 -04:00
Fred Dixon
c99da48041 Removed uneeded script 2015-08-13 17:32:03 -04:00
Richard Alam
44556e04ee Merge pull request #2720 from ritzalam/fix-quick-poll-npe 
- return empty string instead of null to prevent NPE
 2015-08-12 13:27:40 -04:00
Richard Alam
bd1cf9183f - return empty string instead of null to prevent NPE 2015-08-12 17:26:06 +00:00
Richard Alam
a8e5dc0931 Merge pull request #758 from bigbluebutton/development 
Development
 2015-08-11 17:10:36 -04:00
Richard Alam
ca2de434d5 Merge pull request #757 from capilkey/misc-polling-changes 
Misc polling changes
 2015-08-11 16:39:11 -04:00
Richard Alam
6156cdf9f7 Merge pull request #756 from ritzalam/fix-issue-1966 
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id…
 2015-08-11 16:38:33 -04:00
Richard Alam
cde602ac9b Merge pull request #755 from kepstin/poll-recording 
Add poll result display to the 'presentation' recording format
 2015-08-11 16:38:12 -04:00
Chad Pilkey
bfd6e15ad7 moved stuff around in PollResultsModal 2015-08-11 15:35:12 -04:00
Richard Alam
9570a9e765 - fix formatting 2015-08-11 19:24:27 +00:00
Richard Alam
f47344b134 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1966 2015-08-11 18:57:40 +00:00
Calvin Walton
e3e0f0ef61 Add poll result display to the 'presentation' recording format 
Note that this requires a new dependency be added to the
"bbb-playback-presentation" format; the "gnuplot" package is now
required (it's used to actually generate the chart images)
 2015-08-11 14:55:59 -04:00
Richard Alam
700ddecd43 Merge pull request #754 from ritzalam/fix-presentation-delete 
- fix issue where deleting presentation doesn't remove the presentat…
 2015-08-11 13:25:49 -04:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Chad Pilkey
e063eedab7 quick poll matches true/false, yes/no 2015-08-11 12:55:30 -04:00
Chad Pilkey
6e3ea8dbb0 make sure the poll whiteboard object clears on redraw 2015-08-11 11:58:50 -04:00
Chad Pilkey
08b0ffda1a improved the poll graphic scaling 2015-08-11 11:58:16 -04:00
Fred Dixon
cf55faabda Merge pull request #753 from ffdixon/development 
Added check in bbb-conf for version of LibreOffice
 2015-08-10 17:39:42 -04:00
Fred Dixon
a38e278e2b Added check in bbb-conf for version of LibreOffice 2015-08-10 17:39:01 -04:00
Richard Alam
9451876c72 Merge pull request #752 from ritzalam/update-to-red5-2015-08-10-snapshot 
Update to red5 2015 08 10 snapshot
 2015-08-10 17:33:32 -04:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Richard Alam
6070a42985 Merge branch 'development' into prepare-merge-with-latest-red5 2015-08-10 15:36:39 +00:00
Richard Alam
603afafa2d Merge pull request #751 from ritzalam/fix-poll-stopping 
- stop poll when presenter change happens while poll is running
 2015-08-10 11:31:40 -04:00
Richard Alam
987397250c - stop poll when presenter change happens while poll is running 2015-08-10 15:21:38 +00:00
Richard Alam
cbe948a0d6 Merge pull request #750 from ritzalam/fix-presentation-sync 
- presentation sync broke on svg conversion changes
 2015-08-10 10:30:46 -04:00
Richard Alam
a2e2ef73cf - presentation sync broke on svg conversion changes 2015-08-10 14:29:14 +00:00
Fred Dixon
e329f195b7 Merge pull request #749 from ffdixon/development 
Updated bbb-conf to update URLS for http/https and rtmp/rtmps
 2015-08-08 23:27:16 -04:00
Fred Dixon
02dc138689 Updated bbb-conf to update URLS for http/https and rtmp/rtmps 2015-08-08 23:26:09 -04:00
Richard Alam
1efea72d09 Merge pull request #748 from ritzalam/remove-some-printlns 
- remove some printlns to lessen noise
 2015-08-07 17:42:30 -04:00
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +00:00
Fred Dixon
4c6935a1ca Merge pull request #747 from ffdixon/development 
Updated bbb-conf to assign hostname to publishURI parameter in config…
 2015-08-07 15:58:57 -04:00
Fred Dixon
b23a6df190 Updated bbb-conf to assign hostname to publishURI parameter in config.xml 2015-08-07 15:56:35 -04:00
Richard Alam
6fa29a4077 Merge branch 'gthacoder-svg-conversion' into development 2015-08-07 19:48:47 +00:00
Richard Alam
3357529104 - update properties file 2015-08-07 19:48:27 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Fred Dixon
7d571de04b Merge pull request #745 from capilkey/change-quickpoll-regex 
changed quick poll regex to match only one character
 2015-08-07 13:16:57 -04:00
Chad Pilkey
445b37616d changed quick poll regex to match only one character 2015-08-07 13:13:13 -04:00
Richard Alam
a18098929b Merge pull request #744 from ritzalam/log-auto-reconnect 
- allow to externally log auto-reconnects
 2015-08-07 13:05:08 -04:00
Richard Alam
576d027c8d - allow to externally log auto-reconnects 2015-08-07 17:02:32 +00:00
Richard Alam
7a4ebcb415 Merge pull request #743 from ritzalam/merge-leonardo-api-changes 
Merge leonardo api changes
 2015-08-07 11:11:45 -04:00
Richard Alam
839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
 2015-08-07 15:06:40 +00:00
Richard Alam
00c5cac9c9 Merge pull request #632 from daronco/api-merges 
API merges
 2015-08-06 17:58:34 -04:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
 2015-08-06 16:21:31 -04:00
Richard Alam
1a1a3bcb9d Merge pull request #742 from ritzalam/investigate-video-disconnect 
- trying to determine why client isn't receiving timestamp data from…
 2015-08-06 13:58:21 -04:00
Richard Alam
44c7d4ab77 - trying to determine why client isn't receiving timestamp data from the server 2015-08-06 17:54:08 +00:00
Richard Alam
82e8f724a2 Merge pull request #741 from ritzalam/investigate-video-disconnect 
- add timestamps on client side log to correlate webcam stopping
 2015-08-06 11:13:17 -04:00
Richard Alam
fbc3dc54f3 - add timestamps on client side log to correlate webcam stopping 2015-08-06 15:11:41 +00:00
Richard Alam
77e5cf5b55 Merge pull request #739 from ritzalam/investigate-video-disconnect 
- add more information on the logs to track down webcam disconnections
 2015-08-05 15:59:10 -04:00
Richard Alam
1f3cff06b3 - add more information on the logs to track down webcam disconnections 2015-08-05 19:55:12 +00:00