Leonardo Crauss Daronco
72813a908c
Move sanity, process and publish rap workers to run in resque
...
Same as 1bcdc45 but for the other scripts.
2017-07-13 14:36:43 -03:00
Leonardo Crauss Daronco
5aeeee25fd
Move rap archive to resque, first step on moving all steps to resque
...
For now the differences are that the archive worker will run inside
resque (it is a resque worker now) and there is a "rap-trigger" file that
is executed by systemd to detect recordings that need to be archived and
add a job on resque to archive them.
The process os scheduling jobs still needs to be reviewed, but for now will
be done by rap-trigger.
2017-07-13 14:36:43 -03:00
Anton Georgiev
6df3eb2afe
Merge pull request #3940 from JaeeunCho/hidden_closedCaption
...
HTML5 - fixed closed-caption display
2017-05-24 15:57:58 -04:00
Fred Dixon
3749e513ce
Merge pull request #3963 from ffdixon/fix-ip-detection
...
Improved the detection if IP addresses in bbb-conf
2017-05-23 11:29:37 -04:00
Fred Dixon
66aa72e1e7
Improved the detection if IP addresses in bbb-conf
2017-05-23 10:29:16 -05:00
Fred Dixon
8096c2e5a2
Merge pull request #3958 from ffdixon/1.1-0-release
...
Bump version number to 1.1.0
2017-05-22 11:25:06 -04:00
Fred Dixon
eabfd7e862
Bump version number to 1.1.0
2017-05-22 10:23:55 -05:00
Fred Dixon
237c6f8fbc
Update BigBlueButton.html
2017-05-20 12:33:42 -04:00
Jesus Federico
4c2df2e529
Merge pull request #3955 from jfederico/bbb-web
...
bbb-web: Fixed issue in getRecordings not responding the meetingID co…
2017-05-19 11:21:34 -04:00
jfederico
a4b0cb7436
bbb-web: Fixed issue in getRecordings not responding the meetingID correctly
2017-05-19 15:11:08 +00:00
Anton Georgiev
bb75ca73e1
Merge pull request #3953 from antobinary/adjust-3934
...
Revisit pull request #3934
2017-05-19 10:22:55 -04:00
JaeeunCho
607a3f4e5d
HTML5 - put the order at media class
2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06
HTML5 - removed unused media query
2017-05-18 12:58:21 -07:00
JaeeunCho
bba5170f43
Merge remote-tracking branch 'upstream/master' into hidden_closedCaption
2017-05-18 12:42:45 -07:00
Chad Pilkey
7a46382e86
Merge pull request #3946 from riadvice/fix-presenter-share-only
...
Delete the option "presenterShareOnly" in favor of lock settings
2017-05-18 12:29:21 -04:00
Anton Georgiev
409a471ab5
bring catch clause on the same line as closing curly brace
2017-05-18 10:52:59 -04:00
JaeeunCho
8b6f8e857c
HTML5 - removed unused media query
2017-05-17 13:09:10 -07:00
JaeeunCho
5ee206e73e
HTML5 - fixed order and slide control position
2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508
Merge remote-tracking branch 'upstream/master' into hidden_closedCaption
2017-05-17 13:04:09 -07:00
Anton Georgiev
71d4e8b0e0
catch Meteor error on userLeaving
2017-05-17 15:17:27 -04:00
Anton Georgiev
746ef9478c
Merge pull request #3939 from KDSBrowne/userlist-accessibility
...
[HTML5] - Userlist accessibility improvement
2017-05-17 11:52:52 -04:00
Anton Georgiev
e9eef8119b
recover meeting propery needed for lock settings
2017-05-17 11:51:25 -04:00
Anton Georgiev
b4f3c41993
Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format
...
[HTML5] - Change the format of locale strings
2017-05-17 11:42:39 -04:00
KDSBrowne
a2520dbbbc
change format for other locales
2017-05-17 08:35:24 -07:00
Anton Georgiev
a89c70a04c
Merge branch 'userlist-accessibility' of github.com:KDSBrowne/bigbluebutton into userlist-accessibility
2017-05-17 11:27:17 -04:00
Anton Georgiev
fc831440c3
Merge pull request #3932 from antobinary/address-error-500-and-stuck-users
...
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
2017-05-17 11:25:16 -04:00
Anton Georgiev
49a1f09536
minor improve syntax based on review comment
2017-05-17 11:24:12 -04:00
Anton Georgiev
0579506e2e
Merge pull request #3944 from Klauswk/FixUnselectableOption
...
Fix unselectable 'Choose Language' and fallback lang error.
2017-05-17 11:17:38 -04:00
KDSBrowne
985cf43a93
change message descriptions
2017-05-17 07:32:35 -07:00
Ghazi Triki
43d05ffa0b
Remove presenterShareOnly option and all its implementation.
2017-05-17 14:30:54 +01:00
Ghazi Triki
f0d2a5dec2
Map presenterShareOnly options to lock settings. (reverted from commit 450c5d28f3)
2017-05-17 10:16:44 +01:00
KDSBrowne
97514dc5c5
remove default messages
2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20
change locale stringformat
2017-05-16 17:02:27 -07:00
KDSBrowne
f9fae74d08
fix merge conflicts
2017-05-16 09:33:26 -07:00
Anton Georgiev
f1a58eac24
Merge pull request #3941 from OZhurbenko/fix-issue-3938
...
[HTML5] Text Shape 2.0
2017-05-16 11:14:31 -04:00
Anton Georgiev
4e3282b3ea
Merge pull request #3945 from Klauswk/FixLockUserIcon
...
Fix the lock user icon status
2017-05-16 10:14:24 -04:00
Klauswk
2c1507567d
Update app.yaml
2017-05-16 11:10:44 -03:00
Klaus Klein
8d4b69b578
Remove unnecessary fields
2017-05-16 08:26:19 -03:00
JaeeunCho
87b013fd5b
HTML5 - fixed fixed closed-caption display
2017-05-15 14:45:44 -07:00
Ghazi Triki
450c5d28f3
Map presenterShareOnly options to lock settings.
2017-05-15 22:05:00 +01:00
JaeeunCho
3caebca201
Merge remote-tracking branch 'upstream/master' into hidden_closedCaption
2017-05-15 13:08:47 -07:00
Klaus Klein
2b53dd19e5
Code refactored
2017-05-15 16:45:00 -03:00
Klaus Klein
82f638384b
Fix the lock user icon to work as flash, HTML5
2017-05-15 16:26:03 -03:00
Fred Dixon
2ccdb5cbcf
Merge pull request #3943 from perroned/remove-plugin-popup
...
Hide Temasys Popup Fixes #3942
2017-05-15 13:36:00 -04:00
Klaus Klein
95b47fd54a
Fix lang fallback error
2017-05-15 13:32:41 -03:00
perroned
a7c2542c0a
Overwrites popup function
2017-05-15 12:16:30 -04:00
KDSBrowne
fc2a36f14b
remove element refs not being used
2017-05-15 09:01:46 -07:00
Klaus Klein
81ab785daa
Made 'Choose options' unselectable, HTML5 close #3935
2017-05-15 10:58:26 -03:00
Oleksandr Zhurbenko
371419c41c
Text shape preserves white space now and handles new lines
2017-05-12 12:46:10 -07:00
JaeeunCho
92bc296bc0
HTML5 - fixed closed-caption display
2017-05-12 12:17:08 -07:00
