Richard Alam
9a628da93d
- remove bbb-commons-message dependency
2017-05-10 17:21:55 -07:00
Chad Pilkey
ce81cbae86
fix TextObject fontsize scaling
2017-05-10 18:25:09 -04:00
Chad Pilkey
ce22063e42
remove outdated whiteboard ctrlkey code, try hard annotation edges
2017-05-10 18:24:42 -04:00
Richard Alam
b55beeb8fa
- wire up redis publisher
2017-05-10 14:37:14 -07:00
Richard Alam
0d53d2bf93
- fix compile issues
2017-05-10 14:24:36 -07:00
JaeeunCho
fc5856a4ce
HTML5 - linted code
2017-05-10 14:05:18 -07:00
JaeeunCho
ca808195f2
HTML5 - added locked status for users
2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Richard Alam
76a6d99ca3
- move java classes from bbb-web into bbb-common-web
2017-05-10 13:22:50 -07:00
KDSBrowne
73819c9d1d
fix switch statment
2017-05-10 11:39:03 -07:00
KDSBrowne
7e0ff7bf76
clean up code more
2017-05-10 11:24:09 -07:00
KDSBrowne
f0bce326b9
clean up code
2017-05-10 11:10:27 -07:00
KDSBrowne
bd3c8fb405
add aria tags
2017-05-10 08:12:24 -07:00
Anton Georgiev
e8b01dcdcc
Merge pull request #3909 from antobinary/fix-cc
...
HTML5: Changes to the closed captions settings menu
2017-05-10 07:48:58 -04:00
Fred Dixon
23d5de3d2a
Merge pull request #3926 from riadvice/fix-arabic-locales
...
Use the correct Arabic locale for the flash client.
2017-05-10 06:59:06 -04:00
Ghazi Triki
a7f6d8483c
Use the correct Arabic locale for the flash client.
2017-05-10 11:04:33 +01:00
Richard Alam
0c200871da
- add Jackson Json dependencies
2017-05-09 14:19:22 -07:00
Anton Georgiev
acb7ff80f8
Merge pull request #3924 from antobinary/address-error-500-and-stuck-users
...
HTML5: Add logic to trigger logout if user timed out on auth step
2017-05-09 16:18:35 -04:00
Anton Georgiev
e8fb481722
add logic to trigger logout if user timed out on auth step
2017-05-09 16:04:30 -04:00
Richard Alam
422ee08ea1
- setup tests
2017-05-09 11:47:44 -07:00
Fred Dixon
10bd63e35d
Merge pull request #3921 from hostbbb/load_flash_white
...
flash blue to white screen
2017-05-09 10:17:46 -04:00
KDSBrowne
9462221af6
remove unneeded ref and id's
2017-05-09 07:13:55 -07:00
KDSBrowne
735bdb4a87
fix query selector console error
2017-05-09 07:07:55 -07:00
Chad Pilkey
4519c6752a
improve PollResult scaling
2017-05-08 19:17:16 -04:00
Chad Pilkey
76d21023e3
change DrawObject base class to Shape which is lighter than Sprite
2017-05-08 18:19:19 -04:00
Chad Pilkey
249f15c799
update PollResultObject to work with whiteboard 2.0
2017-05-08 18:18:55 -04:00
Stephen Dame
6fff8c0a8a
flash blue to white screen
2017-05-08 14:09:47 -07:00
JaeeunCho
4012a0d077
HTML5 - fixed navbar to be displayed
2017-05-08 14:03:22 -07:00
Calvin Walton
98bb4a9be2
Merge pull request #3918 from kepstin/recording-cleanup
...
rap-process-worker: Write processing_time file only if processing succeeded
2017-05-08 16:44:43 -04:00
Calvin Walton
da79d1e3b3
rap-process-worker: Write processing_time file only if processing succeeded
...
If processing didn't succeed, the directory where it is trying to write
the file might not exist, causing an exception in the worker which leads
to it getting stuck in a retry loop.
2017-05-08 16:10:59 -04:00
Richard Alam
2aa12e9301
- comment out println
2017-05-08 12:57:32 -07:00
Richard Alam
511fe8882a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-05-08 12:45:05 -07:00
Richard Alam
edf3cb4a24
Merge pull request #3916 from capilkey/multi-user-2.0-take4
...
Whiteboard clean up for 2.0
2017-05-08 15:44:45 -04:00
Richard Alam
ddf5eb9caa
- upgrade dependencies versions
2017-05-08 12:43:19 -07:00
Chad Pilkey
a52a7e94b8
add back in the accessbilityName for the TextButton
2017-05-08 14:57:51 -04:00
Chad Pilkey
6bfb18e6f2
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into multi-user-2.0-take3
2017-05-08 13:57:43 -04:00
Chad Pilkey
f2bc898750
new multiuser whiteboard icon and fixes for text object
2017-05-08 13:46:47 -04:00
Richard Alam
9db13d946e
Merge pull request #3913 from ritzalam/bbb-2x-mconf
...
Merging latest master branch into 2x branch
2017-05-08 13:10:22 -04:00
Richard Alam
44e3fb8a07
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-05-08 08:51:31 -07:00
KDSBrowne
8bb1da0ed5
fix focus and tab order bugs
2017-05-06 16:04:59 -07:00
Chad Pilkey
155b5ec626
Merge pull request #3903 from riadvice/text-tool-fix
...
Prevent Flash client from crashing when text tool is used
2017-05-06 17:46:09 -04:00
Ghazi Triki
3541b0ec33
Check event target variable after extracting it from its event.
2017-05-06 21:04:42 +01:00
KDSBrowne
569ba42042
fix userlist styling
2017-05-06 09:01:16 -07:00
Anton Georgiev
0665d61904
Merge pull request #3906 from Klauswk/FixDevClientReconnection
...
Fix client reconnection timeout
2017-05-05 17:22:00 -04:00
Anton Georgiev
1f640ea3e4
only offer taking over a locale for cc to moderators
2017-05-05 15:52:23 -04:00
KDSBrowne
77d529b2ac
fix error for out of bound index
2017-05-05 12:11:28 -07:00
Richard Alam
9a4d049e24
Merge pull request #3908 from ritzalam/bbb-2x-mconf
...
merge Pedro's screen share fix
2017-05-05 14:49:56 -04:00
Richard Alam
4bee4d66c0
Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf
2017-05-05 11:48:06 -07:00
Richard Alam
acaaf62849
Merge pull request #18 from pedrobmarin/2.0-small-fixes
...
2.0 small fixes
2017-05-05 14:23:35 -04:00
Fred Dixon
26a62bd398
Merge pull request #3907 from kepstin/webrtc-stats
...
Update webrtc stats bridge for modern Chrome/Firefox APIs
2017-05-05 14:21:48 -04:00
