Pedro Beschorner Marin
|
c74cc682c4
|
Merge remote-tracking branch 'mconf/mconf'
|
2017-03-20 19:45:59 +00:00 |
|
jfederico
|
96c8109732
|
bbb-web: Fix bug that was breaking getRecordings in test-install
|
2016-11-17 16:39:03 -05:00 |
|
jfederico
|
dd1fb9e6ac
|
bbb-web: Escaped strings used in freemarker template for thumbnails
|
2016-11-07 18:55:27 +00:00 |
|
jfederico
|
36dfbe7088
|
bbb-web: Added validation to freemarker template to verify image elements are included when extension preview used
|
2016-09-24 10:59:26 -04:00 |
|
jfederico
|
6839ffeb15
|
bbb-web: removed text element from extension preview
|
2016-09-22 13:11:27 -04:00 |
|
jfederico
|
870e9d5b79
|
bbb-web: Modified freeMarker template for adding support to alt text per slide on previews
|
2016-09-21 16:43:11 -04:00 |
|
jfederico
|
8adf729e0f
|
recording-and-playback: Added general text to the preview
|
2016-09-20 16:46:45 -04:00 |
|
jfederico
|
e94fcf8d01
|
bbb-web: Fixed getRecording freemarker template, it works even if preview images have no attributes
|
2016-09-19 17:40:29 -04:00 |
|
jfederico
|
48fc5d6458
|
bbb-web: Fixed issue in freemarker template so get recording support extension preview with one or multiple images
|
2016-09-16 15:12:27 -04:00 |
|
jfederico
|
1e092eaff9
|
Adjusted freemaker template and parser to support attributes on preview extension
|
2016-09-16 12:20:30 -04:00 |
|
jfederico
|
4a6b6c6eec
|
bbb-web Modified domain for adding support to Extensions in recordings
|
2016-09-15 14:03:28 -04:00 |
|
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 |
|