Anton Georgiev
a58bfd1349
fix for the logoutURL - the string had different spellings
2015-03-13 21:01:54 +00:00
Fred Dixon
946e3bd147
Merge pull request #564 from perroned/overflowing-chat-box
...
Fixed issue of overflowing chatbox
2015-03-13 16:22:40 -04:00
perroned
41ee26f99d
Fixed issue of overflowing chatbox
2015-03-13 13:18:50 -07:00
Fred Dixon
52d2f69f82
Update bbb-conf
...
Properly detect if bbb-html5 is installed
2015-03-13 15:41:52 -04:00
Chad Pilkey
0e76927bb3
Merge pull request #562 from BBBManager/bbb-lock-settings
...
Bbb lock settings
2015-03-13 14:33:51 -04:00
Fred Dixon
bc736f74bc
Update bbb-conf
...
Remove hard-coded IP address (used for testing)
2015-03-12 20:16:47 -04:00
Fred Dixon
2d4b1decda
Update bbb-conf
...
Fixed spelling error
2015-03-12 19:58:34 -04:00
Fred Dixon
0fc048af0d
Update bbb-conf
...
Commented # set -x to turn off echoing of statements
2015-03-12 19:58:06 -04:00
Fred Dixon
7ff25b38c0
Merge pull request #563 from ffdixon/update-bbb-conf
...
Update bbb-conf to detect and start/stop meteor (bbb-html5 server)
2015-03-12 19:42:50 -04:00
Fred Dixon
834662aef1
Updates to bbb-conf to start/stop meteor (bbb-html5 server)
2015-03-12 19:41:26 -04:00
Tiago Daniel Jacobs
0f130e9f69
Removed unused property
2015-03-12 21:40:16 +00:00
Tiago Daniel Jacobs
f6139c5b4a
Updating the config.xml with the lockOnJoin* properties
2015-03-12 21:23:36 +00:00
Tiago Daniel Jacobs
71d1d70a4e
Hide label and checkbox of lockOnJoin configuration
2015-03-12 21:14:42 +00:00
Tiago Daniel Jacobs
e52262cf15
Added lockOnJoinConfigurable property to lock config (missed some files)
2015-03-12 20:52:52 +00:00
Tiago Daniel Jacobs
4fff479e03
Added lockOnJoinConfigurable property to lock config.
2015-03-12 20:52:38 +00:00
Fred Dixon
a77f741daf
Merge pull request #560 from antobinary/ip-independent-logouturl
...
html5client: LogoutURL reuse
2015-03-12 16:16:22 -04:00
Anton Georgiev
0aa5e2473b
Merge branch 'master' into ip-independent-logouturl
2015-03-12 20:04:09 +00:00
Richard Alam
778df2da9d
Update ChatBox.mxml
2015-03-12 14:37:20 -04:00
Fred Dixon
c2d97d9cb6
Merge pull request #556 from matnunes/bugfix-1892
...
Bugfix issue 1892 (ChatBox)
2015-03-12 13:52:33 -04:00
Fred Dixon
2c5d4d105e
Merge pull request #551 from bigbluebutton/bbb-lock-settings-fix
...
Fixed problem when changing presenter with webcam
2015-03-12 13:52:14 -04:00
Richard Alam
9050cfb28b
Merge pull request #559 from antobinary/font-fix
...
html5client: Fix for ionicons for Firefox - they could not be located previously
2015-03-12 13:44:05 -04:00
Anton Georgiev
1c6e3c7d70
Merge branch 'master' into font-fix
2015-03-12 16:04:51 +00:00
Anton Georgiev
f92e592edd
fix for firefox - would not display the ionicons
2015-03-12 16:02:56 +00:00
Fred Dixon
ba3d99ac15
Merge pull request #558 from perroned/scrolling-user-panel
...
Fixed issue where the entire panel was scrolling
2015-03-12 12:00:24 -04:00
perroned
c02b177bf9
Fixed issue where the entire panel was scrolling
2015-03-12 08:45:40 -07:00
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
Anton Georgiev
f8b8451057
cleaning up
2015-03-10 21:03:16 +00:00
Anton Georgiev
5d1844f00b
obtain the logoutURL from the enter api. Store it on the client side
2015-03-10 20:58:51 +00:00
Anton Georgiev
2dcc67873b
Merge branch 'master' into ip-independent-logouturl
2015-03-10 19:19:18 +00: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
Tiago Daniel Jacobs
3c6601a5df
Fixing infinite loop in the presenter change event.
2015-03-10 05:36:13 +00:00
Tiago Daniel Jacobs
f4087ab270
Fixing infinite loop in the presenter change event.
2015-03-10 05:34:22 +00: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
