BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,649 Commits 13 Branches 260 Tags 1.1 GiB
5563e607fc
Commit Graph

110 Commits

Author SHA1 Message Date
Felipe Cecagno
26c6e7d32e add processingTime to the getRecordings API call 2016-03-08 19:42:56 -03:00
Felipe Cecagno
e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-03-02 01:19:09 -03:00
jfederico
3bb127ed88 bigbluebutton-web: Validated nulls and empty strings in new template for getRecordings 2016-02-12 12:07:20 -05:00
Felipe Cecagno
6414d94c1c add download and size/rawSize tags on getRecordings response 2016-02-03 19:09:44 -02:00
Felipe Cecagno
a64a9c5940 remove unnecessary logs; order getRecordings response by recordId, and metadata by meta key 2016-02-03 19:09:16 -02:00
Pedro Beschorner Marin
84bac52c57 Removed identation whitespaces of get-recordings XML when building it. 2016-02-03 13:51:44 -02:00
Pedro Beschorner Marin
38130c8a66 Added CDATA fields to FreeMarker template 2016-02-03 13:51:43 -02:00
Pedro Beschorner Marin
00d378831e FreeMarker template in a separated file 2016-02-03 13:51:42 -02:00
jfederico
87eee3746f bigbluebutton-web: Added state to the new xml template 2016-01-29 11:03:07 -05:00
Pedro Beschorner Marin
23f9d226cc Removed identation whitespaces of get-recordings XML when building it. 2016-01-27 18:00:49 +00:00
Pedro Beschorner Marin
5e79f26709 Added CDATA fields to FreeMarker template 2016-01-27 14:52:22 +00:00
Pedro Beschorner Marin
3cb59b8951 FreeMarker template in a separated file 2016-01-27 14:27:06 +00:00
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
Richard Alam
e1879795e9 try to upgrade to grails 1.3.9 - Not starting properly though 2013-06-06 12:17:52 -07:00
Fred Dixon
b5f0464c46 Removed old API demos from bigbluebutton-web ... they are now moved to bbb-api-demo 2011-09-04 08:00:08 -07:00
Markos Calderon
105f13cc9a Edited bigbluebutton-web/web-app/demo/demo6.jsp via GitHub 2011-06-02 08:47:29 -07:00
Markos Calderon
196a9ccc2c fix demo6 2011-06-02 08:39:57 -07:00
Marco Calderon
65c020fac0 demo recording page 2011-06-01 05:30:17 +00:00
Richard Alam
bc6c392da3 - formatting changes 2011-05-27 11:36:50 -04:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Marco Calderon
e9c120dc9f voice recording for freeswitch 2011-01-12 18:10:50 +00:00
Marco Calderon
f37093d533 update demo filesfor support recording 2011-01-10 12:08:54 +00:00
Richard Alam
18b46ba729 - change conf num to start with 7 as that's what we have in the dialplan 2010-11-09 08:24:09 -05:00
BigBlueButton
333dd13d6b - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
BigBlueButton
ea156fe61e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-19 19:45:52 +00:00
BigBlueButton
cad05a9ce1 - bbb-scheduling has been removed from bbb-web 2010-07-19 19:27:24 +00:00
Richard Alam
af873d63e8 - ignore bbb_conf_api.jsp as it's dynamically generated 2010-07-19 11:32:29 -04:00
Richard Alam
ac92ed3756 - remove linefeeds 2010-07-12 16:05:31 -04:00
Richard Alam
0fb463a7c2 - put in a working demo1.jsp 2010-07-12 15:48:18 -04:00
Sebastian
5a27c0ebc3 Fixed a bug 2010-07-12 14:01:46 -04:00
Sebastian
a2124651e8 Fixed linefeeds in demo1.jsp 2010-07-12 12:23:14 -04:00
Sebastian
da9f036339 Removed a space character in demo_footer.jsp 2010-07-02 14:15:30 -04:00
Sebastian
f1d41fd991 Fixed a bug in demo_footer.jsp 2010-07-02 10:19:57 -04:00
Sebastian
adcff2c058 Updated the url in demo_footer.jsp 2010-06-29 13:24:53 -04:00
Richard Alam
400f90b9f2 - pass in correct password 2010-05-27 15:09:38 -04:00
Richard Alam
56ee75fcc2 - urlEncode meetingID to calculate checksum properly 2010-05-27 14:56:56 -04:00
Richard Alam
b88482dfd2 - fix test to use new bbb-api that includes command into checksum 2010-05-27 10:56:36 -04:00
Omar Shammas
019a05578b Enabled the Activity Monitor (Demo 4) to end a meeting - This feature is off, to turn on uncomment line 115 in demo4.js 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4349 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-21 18:19:03 +00:00
Omar Shammas
8678bcf116 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4332 af16638f-c34d-0410-8cfa-b39d5352b314 2010-05-17 14:00:29 +00:00
Omar Shammas
4d0fb66801 Fixed demo API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4321 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 15:52:56 +00:00
Xie Yan Qing
0b740cf948 Set character encoding to UTF-8 in demo pages to support Asian characters. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4238 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-04 01:14:40 +00:00
Islam El-Ashi
ec64ebe0d1 Changed header titles for demo API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4100 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-04-02 20:15:15 +00:00
Islam El-Ashi
7109cdd29d Added 'create your own meeting' to the list of demos 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4041 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 14:47:34 +00:00
Islam El-Ashi
a90712b2d2 Renamed demo1 from 'Join a meeting' to 'Join a course' + added header to demo4 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4023 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-25 21:21:03 +00:00
Islam El-Ashi
12334c12e9 Added demo4_helper 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4007 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 22:17:55 +00:00
Islam El-Ashi
07ba64c540 Removed demo 4 security restriction + added demo4 javascript 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4006 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 22:05:33 +00:00
Islam El-Ashi
98ea9f40a3 moved demo4 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4005 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 21:57:27 +00:00
Islam El-Ashi
5cb078e8ab Added demo 4: activity monitor 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4004 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 21:44:56 +00:00
Chris Liu
39088f8c00 Changed some UTF-16 to UTF-8 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3972 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-23 17:19:55 +00:00