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
KDSBrowne
d1543584ba
change file permission to 644
2017-05-17 09:07:41 -07:00
KDSBrowne
f4d6f173ea
fix new lint issues
2017-05-17 09:02:13 -07:00
KDSBrowne
16e507fbb2
fix merge conflicts
2017-05-17 08:54:48 -07: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
KDSBrowne
675a886fd0
fix merge conflicts
2017-05-16 09:28:28 -07:00
KDSBrowne
df76d33cba
set files permission to 644
2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c
Fix client lint issues except those which are comment related
2017-05-16 08:37:17 -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
Maxim Khlobystov
0535edf6c1
Upgrade the landing page test to enter the actual HTML5 client
...
This commit adds the action of submitting the landing page form to the test spec.
Note: Geckodriver 0.11.1 has a bug that prevents running our landing page test on Firefox 5.3 (version 5.2 works fine).
2017-05-16 03:15:22 +00: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
Maxim Khlobystov
0c41baa439
Setup wdio + Finish the dummy landing page title test
...
This commit adds the config file for the wdio test runner. Using the packaged runner instead of the particular Jasmine runner allows us to do the following:
- Use the global browser object (simplifies access to the Selenium methods from any particular assertion)
- Avoid installing Jasmine globally
The dummy landing page title test actually does the job now.
2017-05-15 01:29:00 +00:00
Maxim Khlobystov
2013109236
Do initial WebdriverIO setup + Add dummy landing page title test
...
This commit adds 2 packages:
- WebdriverIO main package
- Jasmine integration for WebdriverIO
Dummy landing page spec is created (supposed to test the title, but doesn't actually do that yet). This new spec follows the Page Object pattern.
2017-05-14 03:52:43 +00:00
Oleksandr Zhurbenko
371419c41c
Text shape preserves white space now and handles new lines
2017-05-12 12:46:10 -07:00
Oleksandr Zhurbenko
84aab7706a
Text shape preserves white space now and handles new lines
2017-05-12 12:43:06 -07:00
JaeeunCho
92bc296bc0
HTML5 - fixed closed-caption display
2017-05-12 12:17:08 -07:00
KDSBrowne
9e672c2c88
remove commented code
2017-05-12 11:23:55 -07:00
KDSBrowne
a824ca2a79
fix lint issues
2017-05-12 11:11:42 -07:00
KDSBrowne
dd1e830dc2
fix merge conflicts
2017-05-12 10:52:12 -07:00