jfederico
|
440bc6ece7
|
Cleaned up merge conflicts in RecordingService.java
|
2016-01-28 16:59:16 -05:00 |
|
jfederico
|
e1e3aa6055
|
Merge branch 'pedrobmarin-getRecordings' into jfederico-getRecordings
# Conflicts:
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
|
2016-01-28 15:36:19 -05:00 |
|
jfederico
|
de1ee8575d
|
Reformatted files in conflict
|
2016-01-28 14:03:57 -05:00 |
|
jfederico
|
2f3bd5b3ce
|
Reformatted files with conflicts
|
2016-01-28 13:58:05 -05:00 |
|
Jesus Federico
|
a0702903eb
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2016-01-28 09:06:53 -08:00 |
|
jfederico
|
9941668094
|
Updated .gitignore and removed config files specific for eclipse from bigbluebutton-web
|
2016-01-28 12:05:13 -05:00 |
|
jfederico
|
a0c2e337cd
|
bigbluebutton-web: Changed approach for filtering states/recordIDs. the query is now based on recordID and state parameters instead of filter
|
2016-01-28 11:45:12 -05:00 |
|
Richard Alam
|
c58767e74e
|
Merge pull request #2982 from ritzalam/guard-against-NaN-in-presentation-messages
Guard against na n in presentation messages
|
2016-01-28 11:21:21 -05:00 |
|
LucasMFreire
|
1a79c2cbc1
|
connecting voice to bbb 1.0
|
2016-01-28 14:14:28 -02:00 |
|
jfederico
|
c9abb24a06
|
record-and-playback: Formatted xml produced for metadata.xml after adding playback
|
2016-01-28 10:13:45 -05:00 |
|
Pedro Beschorner Marin
|
1edc10f000
|
Merge remote-tracking branch 'bigbluebutton/master' into speedup-getrecordings
|
2016-01-28 12:42:06 +00:00 |
|
Chad Pilkey
|
7b978b9cd6
|
Merge pull request #2986 from capilkey/descriptive-emoticon-tooltips
Added more descriptive tooltips for the emoticon buttons
|
2016-01-27 18:40:36 -05:00 |
|
Oleksandr Zhurbenko
|
1775053d39
|
Changes the default value for the presentation's title when it gets removed
|
2016-01-27 13:58:56 -08:00 |
|
Chad Pilkey
|
58380dd6fd
|
added more descriptive tooltips for the emoticon buttons
|
2016-01-27 12:36:54 -08:00 |
|
Anton Georgiev
|
e26ae3d077
|
Merge pull request #2984 from OZhurbenko/meteor-whiteboard
Fixes for issues #2955, #2942, #2941, #2984
|
2016-01-27 15:24:55 -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 |
|
jfederico
|
7ef3e62940
|
bigbluebutton-web: The statuses processing and processed can be returned by getRecordings
|
2016-01-26 17:17:28 -05:00 |
|
jfederico
|
983e58922e
|
record-and-playback: metadata.xml is generated by process script instead of publish
|
2016-01-26 17:16:28 -05:00 |
|
Fred Dixon
|
3c2217e5a1
|
Merge pull request #2983 from fcecagno/compiling-fsesl-client
Compiling bbb-fsesl-client
|
2016-01-26 15:06:39 -05:00 |
|
Felipe Cecagno
|
4ca7fe7ef7
|
remove weird characters that prevents bbb-fsesl-client to be compiled successfully
|
2016-01-26 18:00:44 -02:00 |
|
jfederico
|
1204ae9f2a
|
recording-and-playback: Added initial metadata.xml as part of the processing
|
2016-01-26 14:25:02 -05:00 |
|
Pedro Beschorner Marin
|
6307b47ba8
|
Creating getRecordings XML response with FreeMarker
|
2016-01-26 18:59:36 +00:00 |
|
Richard Alam
|
b3bec76ae7
|
- cleanup formatting
|
2016-01-25 19:00:23 +00:00 |
|
Richard Alam
|
7e60610dc5
|
- sometimes presentation message send a NaN value which results in exception in the MeetingActor.
If the message contains a NaN, set the value to zero.
|
2016-01-25 18:57:50 +00:00 |
|
LucasMFreire
|
38b0f5349b
|
only add streamName to user streamNames if it's not already there
|
2016-01-25 14:09:43 -02:00 |
|
Felipe Cecagno
|
e5b5669663
|
try to speedup getrecordings, could reduce from 35s to 25s, but it's still not enough; need to better understand where's the bottleneck
|
2016-01-25 14:49:33 +00:00 |
|
Fred Dixon
|
c3de0a9cde
|
Merge pull request #2976 from bigbluebutton/ffdixon-fix-api-link
Update demo_footer.jsp with correct link to API docs
|
2016-01-25 07:45:42 -05:00 |
|
Fred Dixon
|
941caa06d5
|
Update demo_footer.jsp
|
2016-01-25 07:45:18 -05:00 |
|
Oleksandr Zhurbenko
|
cc7f8b4fac
|
Updating the new slide's ratios and offsets right away
|
2016-01-22 22:51:41 -08:00 |
|
Chad Pilkey
|
416cbbf7bc
|
Merge pull request #2973 from capilkey/1.0-minor-fixes
Minor UI changes for the Flash client
|
2016-01-22 19:25:19 -05:00 |
|
Chad Pilkey
|
d90643fc77
|
update the client copyright to 2016
|
2016-01-22 16:12:54 -08:00 |
|
Oleksandr Zhurbenko
|
0f7f3ed7b8
|
Added check to see if the properties have been already updated by displayThisSlide() after receiving a presentation_page_changed message.
|
2016-01-22 15:53:24 -08:00 |
|
Chad Pilkey
|
f7f6d81a37
|
shorten the copyright string in the client footer
|
2016-01-22 15:53:16 -08:00 |
|
jfederico
|
2c214cafac
|
bigbluebuttonbn-web: Implemented filter for recordIDs [id:eq:xxxx,yyyy,zzzz]
|
2016-01-22 18:16:47 -05:00 |
|
Chad Pilkey
|
4062aa02db
|
significantly reduce the volume of the chat audio cue
|
2016-01-22 15:02:12 -08:00 |
|
Chad Pilkey
|
a2203ad5e6
|
unbold the lock settings categories in the popup
|
2016-01-22 14:52:45 -08:00 |
|
Chad Pilkey
|
d34616d3d2
|
add separation between chat time and border
|
2016-01-22 14:50:10 -08:00 |
|
Chad Pilkey
|
75cb6b66cc
|
Merge pull request #2969 from tdj-br/master
Fixes #2768
|
2016-01-22 16:41:14 -05:00 |
|
Richard Alam
|
3273912bd1
|
Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days
Expire redis keys after 14 days
|
2016-01-22 14:29:25 -05:00 |
|
Oleksandr Zhurbenko
|
6eb3fbe50d
|
Removed old unused console logs from the code.
|
2016-01-22 11:14:57 -08:00 |
|
Richard Alam
|
5c882386cd
|
Merge pull request #2972 from pedrobmarin/issue-2851
Avoid scala warning messages
|
2016-01-22 14:14:37 -05:00 |
|
Oleksandr Zhurbenko
|
8fdb83d01a
|
Assigning widthRatio to default value when the currentSlideDoc is not loaded yet. Removing errors from the console.
|
2016-01-22 11:07:14 -08:00 |
|
Pedro Beschorner Marin
|
8890f46910
|
- avoid scala warning messages
|
2016-01-22 19:00:50 +00:00 |
|
Richard Alam
|
78cfccab18
|
Merge pull request #2971 from pedrobmarin/issue-2851
Simple modification to avoid multiple start audio recording events
|
2016-01-22 13:38:12 -05:00 |
|
Pedro Beschorner Marin
|
086e339653
|
Simple modification to avoid multiple start audio recording events
|
2016-01-22 16:43:17 +00:00 |
|
jfederico
|
6b911820e0
|
bigbluebutton-web: Added filter parameter to getRecordings for filtering queries based on the state of the recording [published|unpublished|deleted]
|
2016-01-22 11:38:33 -05:00 |
|
Tiago Daniel Jacobs
|
fc728bf1be
|
Fixes #2768
|
2016-01-21 22:56:48 -02:00 |
|
Richard Alam
|
5c812984ad
|
Merge pull request #2967 from ritzalam/improve-pdf2swf-conversion
Improve pdf2swf conversion
|
2016-01-21 15:59:10 -05:00 |
|