Commit Graph

3511 Commits

Author SHA1 Message Date
Fred Dixon
94716609e2 Reformatting the headers for API demos 2011-09-04 07:29:26 -07:00
Fred Dixon
e825921c16 Fixed a typo on bbb_api.jsp that was causing isMeetingRunning to fail passing checksum 2011-09-04 07:21:08 -07:00
Fred Dixon
bae17db7a6 Small edit to playback.html (removed 'chat' as it's english specific). Keep the playback clean as a basis for customization. 2011-09-04 05:23:52 -07:00
Fred Dixon
ba6853c9c8 Refactored bbb_api.jsp to be consistent and reduced number of calls (still a bit more work needed to do) 2011-09-03 11:32:32 -07:00
gugat
70c8c92915 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-02 17:05:58 -07:00
gugat
e5849908a8 Remove float property to fix audio bar in the right of slides when doing playback
Change comparison operator in timeline plugin
2011-09-02 17:03:13 -07:00
Richard Alam
bf54da8be4 - remove duplicate audio events 2011-09-02 20:12:34 +00:00
Richard Alam
b59fc8d3aa - use start_record_timestamp, file, bridge to compare if 3 start events are eql? 2011-09-02 18:14:44 +00:00
Richard Alam
9921f9ef42 - make playback with chat work 2011-09-02 18:01:45 +00:00
Richard Alam
f272fa8058 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-09-02 15:21:04 +00:00
Richard Alam
b95d3166ca - don't process duplicate audio events 2011-09-02 15:20:36 +00:00
Richard Alam
b9de9180eb - remove interface dec to fix bbb-web build breakage 2011-09-02 09:56:45 -04:00
Richard Alam
49a97e463b - update slides playback with chat 2011-09-02 13:44:35 +00:00
Marco Calderon
ff575071d9 fix metadata values 2011-09-01 19:46:29 -05:00
Marco Calderon
48e26cec6a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-31 17:22:48 +00:00
Fred Dixon
197decd0ad Aligned headings of demo10.jsp with navigation 2011-09-01 09:02:04 -07:00
Richard Alam
da2d02e2fc - add settings icon asset and attribute icon owner in license text 2011-09-01 15:03:22 +00:00
Fred Dixon
9efab14768 Fixed bug that prevented bbb-record from having bbb-record-core rebuilt a recording. 2011-08-31 14:45:38 -07:00
Richard Alam
0453a34767 - fix location of slides.xml 2011-08-31 19:54:32 +00:00
Fred Dixon
5d89ab8a45 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-31 11:55:33 -07:00
Fred Dixon
5c2bd92fab Added more tracking of recording processing to bbb-record --watch 2011-08-31 11:55:20 -07:00
Marco Calderon
6e41cae223 some fixes in the api 2011-08-31 17:22:10 +00:00
Richard Alam
b6bb24f00f - change size of display div 2011-08-31 15:58:36 +00:00
Richard Alam
beb4bbff9c - change css
- remove old slides playback js scripts
2011-08-31 14:09:59 +00:00
Richard Alam
ee3c6fbf53 - store copy of popcorn js files so playback still works even if there is no internet connection 2011-08-31 14:08:23 +00:00
Richard Alam
e9f4cc4ffb - replace slides playback with popcorn 2011-08-31 14:00:20 +00:00
Fred Dixon
c2dda53ff1 Added logic to rebuild the output for a specific recording 2011-08-30 13:12:37 -07:00
Fred Dixon
fb33eb7dd1 Reworked logic for playbackFormat() in demo10.jsp to work on Chrome 2011-08-29 12:31:04 -07:00
Marco Calderon
39dd105780 demo10 modifications 2011-08-25 17:27:58 +00:00
Fred Dixon
31c4f79087 Added bbb-record, a shell script with some helper functions to monitor and administrate the recordings. 2011-08-25 15:47:03 -07:00
Fred Dixon
585679be68 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-25 15:44:51 -07:00
Marco Calderon
4b494dee46 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-24 19:40:38 +00:00
Marco Calderon
2db74d4d06 small fix for invalid password 2011-08-24 19:39:57 +00:00
Richard Alam
d9ca971b3e - add a PPT file into pre-upload demo 2011-08-24 18:13:26 +00:00
Richard Alam
680a3c0dc6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-08-24 18:11:25 +00:00
Richard Alam
1b4d208453 - add chacking for presentation 2011-08-24 18:11:06 +00:00
Marco Calderon
deae7b0d15 fix for errors in api 2011-08-24 16:27:37 +00:00
Localization Server
ec0e781802 Updating locale 2011-08-24 14:00:02 +00:00
Localization Server
738dc0016b Updating locale 2011-08-24 12:20:01 +00:00
Marco Calderon
e59de2c263 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-23 19:20:01 +00:00
Marco Calderon
dbd04839ec added backward compatibility for errors 2011-08-23 19:19:25 +00:00
Richard Alam
b0ddf563f5 - auto display pre-uploaded presentation 2011-08-23 15:28:25 +00:00
Marco Calderon
5e457b71d1 initial backward compability for 0.71a 2011-08-23 02:46:37 +00:00
Richard Alam
160b037570 - the meeting has not actually ended when a user is in the meeting. Our logic removes the meeting when
everyone leaves and a user rejoins the meeting within 1 minute.
2011-08-22 15:12:34 -04:00
Richard Alam
ea76262a7c - add more logging to figure out why we are ending the meeting pre-maturely 2011-08-22 13:36:10 -04:00
Fred Dixon
5a43aba27a Ingest and processing slides.rb now logs to /var/log/bigbluebutton/slides. 2011-08-20 12:14:33 -07:00
Fred Dixon
434f7ea1dc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-20 12:13:09 -07:00
Fred Dixon
9e9db371e2 Modified index.html for 0.8-beta. Added checks in bbb-conf --check to ensure redis was running 2011-08-20 12:13:03 -07:00
Richard Alam
d8fb1feb81 - save the meetingID too as the Title of the meeting for this demo 2011-08-19 15:07:13 -04:00
Fred Dixon
35825c29fe Updated to demo10.jsp (record and playback) to have ten demo rooms 2011-08-18 10:56:31 -07:00