Richard Alam
7e7dbee8a6
Merge pull request #557 from kepstin/recording-archive-nomarks
...
Archive recording files for sessions without recording marks
2015-03-11 13:48:15 -04:00
Calvin Walton
3fe179565e
Use cron job to delete archived files for recordings without marks
...
This way, the raw files for recordings without marks will still be deleted,
but it will be after a delay - by default, 5 days, the same as other
temporary files. This gives someone the ability to manually force the
recording to be processed by using bbb-record --rebuild
If the recording is processed by bbb-record --rebuild, it is no longer
eligible for this automatic deletion (raw files will be kept)
2015-03-11 13:40:56 -04:00
Calvin Walton
746451b999
Allow forcing 'no marks' recordings to be processed with bbb-record --rebuild
...
Some logic updates to make it more consistant with the bbb-record --delete
ordering too, to reduce races with the rap-worker.
2015-03-11 13:40:56 -04:00
Calvin Walton
eedbafa94f
Adjust recording system to archive, but not process, recordings with no marks
...
This allows them to be preserved for a period of time, rather than be
deleted immediately. Useful for recovering recordings when someone forgot
to press the record button during the session.
2015-03-11 13:40:56 -04:00
Calvin Walton
aa0aaf2300
Clean up the bbb-record --republish logic
...
It's a bit simpler now, and does things in the correct order to avoid races
with the rap-worker.
2015-03-11 11:18:57 -04:00
Calvin Walton
789c55d462
Fix bbb-record --republish
...
With the new rap worker, it has to recreate the processed done file in order
to trigger the publishing step.
2015-03-11 11:01:53 -04:00
Richard Alam
a7e9db483b
Merge pull request #555 from antobinary/flash-redirect
...
Addition to pull req #554
2015-03-10 12:14:57 -04:00
Anton Georgiev
efc126f410
styled the wrong div
2015-03-10 16:11:56 +00:00
Fred Dixon
d738f09110
Merge pull request #553 from antobinary/temp-revert
...
Display the filename of the presentation (partial revert of #548 )
2015-03-10 11:32:53 -04:00
Fred Dixon
d7a9f2da7e
Merge pull request #554 from antobinary/flash-redirect
...
Offer to redirect to the HTML5 client if Flash is disabled (not available)
2015-03-10 11:32:40 -04:00
Anton Georgiev
edb667a419
minor styling changes
2015-03-10 15:28:39 +00:00
Anton Georgiev
743a213ece
Merge branch 'master' into flash-redirect
2015-03-10 15:19:11 +00:00
Anton Georgiev
94766d2aa4
(revrt) Display the filename of the presentation
2015-03-10 14:41:14 +00:00
Fred Dixon
d31cf04ea2
Merge pull request #552 from perroned/conversation-issues-2
...
Fixed issue where on mobile you could initiate a chat with yourself
2015-03-10 10:14:16 -04:00
perroned
493c7701fd
Fixed issue where you can chat with yourself
2015-03-10 07:07:23 -07:00
Fred Dixon
4f023dd91c
Merge pull request #548 from OZhurbenko/meteor-ui
...
Mobile View's changes
2015-03-10 01:25:02 -04:00
Fred Dixon
0043f71d11
Merge pull request #550 from gthacoder/meteor-client-popups
...
Logout dialog box modifications + push menu enhancements.
2015-03-10 00:09:52 -04:00
Maxim Khlobystov
0e2559a15a
Cleaning up.
2015-03-09 18:20:29 -07:00
Maxim Khlobystov
bda1db32a9
Got rid of the unwanted calls for the push menu when user clicks navbar buttons.
2015-03-09 18:13:16 -07:00
Maxim Khlobystov
9a00fbf418
Increased the size of Logout dialog box for mobile devices in landscape mode to make it easier to click Yes/No.
2015-03-09 17:59:01 -07:00
Maxim Khlobystov
41b2727adb
Allowed users to close the Logout dialog box by clicking outside on mobile devices.
2015-03-09 14:30:25 -07:00
Maxim Khlobystov
c54caa3f3d
Tied the font sizes inside the Logout dialog box on mobile devices in landscape to the page height and thus made the dialog box look consistent across devices with different aspect ratios.
2015-03-09 13:43:39 -07:00
Maxim Khlobystov
c36afdeb47
Made the Logout dialog box bigger in landscape orientation for the mobile devices only.
2015-03-09 13:31:19 -07:00
Fred Dixon
0807684ec1
Merge pull request #549 from gthacoder/meteor-client-push-menu
...
HTML5 client's push menu.
2015-03-08 09:45:27 -04:00
Maxim Khlobystov
f1623a143c
Replaced the push menu collapse button's chevron icons with the hamburger menu icon.
2015-03-08 01:30:44 -05:00
Maxim Khlobystov
52be0c0751
Positioned every element under the shield correctly when the push menu is opened.
2015-03-07 21:58:26 -05:00
Maxim Khlobystov
093382d3ff
Made it impossible for the main content of the page to be shifted in landscape orientation, prevented problems on switching between views.
2015-03-06 22:05:00 -05:00
Maxim Khlobystov
ba80d03b07
Saved the navbar from being disabled when the sliding menu is opened.
2015-03-06 22:04:40 -05:00
Maxim Khlobystov
96c1a3fc4a
Added some opacity to the rest of the page when the sliding menu is opened.
2015-03-06 22:04:18 -05:00
Maxim Khlobystov
716cb56830
Added the transparent shield over the view with sliding menu opened to detect the user's click.
2015-03-06 22:04:00 -05:00
Maxim Khlobystov
a105b2b6b5
Made the sliding menu push the rest of the page right instead of covering it.
2015-03-06 22:03:25 -05:00
Maxim Khlobystov
165ee6e753
Got rid of the darkened screen appearing along with the sliding menu.
2015-03-06 22:02:28 -05:00
Anton Georgiev
ee69c62309
first check if the html5 client is running and then attempt to redirect the user
2015-03-06 22:44:13 +00:00
Anton Georgiev
deec36b411
style the redirect page a bit
2015-03-06 22:43:51 +00:00
Anton Georgiev
5ebb2f5f3c
Allow moderators to use the html5 client.
...
Temporarily they will have exactly the same permissions as viewers do.
This commit's goal is to facilitate the redirect to the html5 client in the event that Flash is not detected on the system
2015-03-06 20:53:13 +00:00
Oleksandr Zhurbenko
7ef15d846f
Whiteboard's name is changed to static and the name of the presentation file is not displayed anymore
2015-03-06 08:57:11 -08:00
Oleksandr Zhurbenko
84351383f2
Merge branch 'master' into meteor-ui
2015-03-06 08:40:09 -08:00
Oleksandr Zhurbenko
c7124a1d15
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-03-06 08:24:53 -08:00
Oleksandr Zhurbenko
8437646cc4
Mobile UI changes
2015-03-06 08:22:41 -08:00
Oleksandr Zhurbenko
7d2b70f26f
Minor changes in the mobile view
2015-03-05 16:34:19 -08:00
Anton Georgiev
e77b295517
Merge branch 'master' into flash-redirect
2015-03-05 22:56:34 +00:00
Chad Pilkey
446f5f317c
Merge pull request #547 from antobinary/meteor-listenonly-audio
...
bbb_webrtc_bridge_sip.js fix, HTML5 client can join audio even if no Flash users have joined audio
2015-03-05 17:44:34 -05:00
Anton Georgiev
d02a30f3c2
Merge branch 'master' into meteor-listenonly-audio
2015-03-05 22:23:58 +00:00
Fred Dixon
8d8ed43985
Update start.sh
...
Added definition for HOME to start.sh help meteor start from within upstart job.
2015-03-05 16:52:04 -05:00
Fred Dixon
c4bfaa7c5b
Merge pull request #546 from kepstin/stun-turn-js
...
Fix timestamp calculation generating turn server credentials
2015-03-05 16:45:40 -05:00
Calvin Walton
0a6d03ca79
TURN: The timestamp is actually the expiry time
...
Make sure to add the TTL to the current time, so the generated expiry
time is in the future.
2015-03-05 16:27:30 -05:00
Calvin Walton
dfa9fd00e2
TURN server password: Use second-based timestamps
...
The expiration timestamp should be a standard unix timestamp measured in
seconds, not the millisecond-based Java time.
2015-03-05 16:21:46 -05:00
Anton Georgiev
f62fd4ce31
due to this the html5 client was not able to join a voice conf without a flash user already joined
2015-03-05 21:10:27 +00:00
Fred Dixon
63132411b8
Merge pull request #545 from antobinary/client-code-relocation
...
HTML5 client code relocation. Deleting the previous version of the client
2015-03-05 15:55:19 -05:00
Anton Georgiev
7a4c5cd7c2
remove the code from the old version of the html5 client
2015-03-05 20:24:43 +00:00
