Oleksandr Zhurbenko
6ea4d39da9
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-25 15:08:29 -07:00
Anton Georgiev
4e34a7f551
screenshare displays except at refresh
2017-07-25 16:56:40 -04:00
Klaus
d44299d221
Fix the missing string name
2017-07-25 15:57:20 -03:00
Klaus
9cd3ac3f87
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
2017-07-25 13:43:26 -03:00
Klaus
22d80b605f
Fix presenter assign
2017-07-25 13:21:07 -03:00
Anton Georgiev
1bdeb248c1
Merge pull request #4117 from Klauswk/html5-2x-fix-audio
...
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
2017-07-25 10:30:43 -04:00
Klaus
51f7161e45
Flat breakouts
2017-07-25 10:51:33 -03:00
Klaus
b1bb4a6866
Flat poll
2017-07-25 09:26:45 -03:00
Oleksandr Zhurbenko
5aed767436
Moved SwitchSlide method to 2.0
2017-07-24 14:04:49 -07:00
Klaus
916713b1df
Add safe true, preventing mess with the arrays, and refactored the shapes
2017-07-24 17:32:35 -03:00
Oleksandr Zhurbenko
a0f9015860
Moved ClearAll and Undo to 2.0
2017-07-24 13:29:02 -07:00
Anton Georgiev
75c39f9340
Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio
2017-07-24 16:06:52 -04:00
Anton Georgiev
350dd16fb7
Merge branch 'html5-2x-fix-audio' of github.com:Klauswk/bigbluebutton into html5-2x-fix-audio
2017-07-24 15:34:18 -04:00
Anton Georgiev
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Matthew Marangoni
2f48cca53e
Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x
2017-07-24 12:14:18 -07:00
Klaus
97b38fb0e6
Presentation reflects akkaApps
2017-07-24 15:46:53 -03:00
Matthew Marangoni
8902742573
wrapped BBB instantiation into init function and added to startup
2017-07-24 11:36:56 -07:00
Anton Georgiev
cacac6c9c6
Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare
2017-07-24 14:17:04 -04:00
Klaus
78a6fee038
Slides reflecting akkaApps
2017-07-24 14:50:44 -03:00
Klaus
d72df301c6
Move to 2.0
2017-07-24 11:15:46 -03:00
Klaus
5c2369b992
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-24 11:00:30 -03:00
Klaus
73068ff8d2
Handling meeting end
2017-07-21 16:34:28 -03:00
Klaus
fade555d55
Add check for user permission
2017-07-21 15:17:25 -03:00
Klaus
39288e6e70
Add clear history, copy and save as chat options
2017-07-21 13:27:28 -03:00
Klaus
a63d8d5cf4
Add function to export public chat to clipboard and file
2017-07-21 11:39:51 -03:00
Klaus
7cf05cdbf5
Add public history clear eventHandler and method
2017-07-21 11:39:40 -03:00
Matthew Marangoni
4e66ecf0e2
moved BBB import to startup
2017-07-20 08:57:12 -07:00
Matthew Marangoni
01f98fb4be
renamed htmlBBB to simply BBB
2017-07-20 07:57:15 -07:00
Matthew Marangoni
f521ef0402
Merge remote-tracking branch 'upstream/master' into call-manager
2017-07-19 11:55:45 -07:00
Matthew Marangoni
8139fa03ab
fixed issue with status being improperly used in custom events
2017-07-19 11:54:48 -07:00
Klaus
b2556695c4
Fix show public messages
2017-07-19 14:57:07 -03:00
Klaus
2bf0fc65db
Fix statment
2017-07-19 14:20:19 -03:00
Klaus
a4db665a47
Update container.jsx
2017-07-19 09:59:03 -03:00
Klaus
b70702dabe
Dynamic fetching the stun/turn servers
2017-07-19 09:44:47 -03:00
Matthew Marangoni
1feb7629d6
detailed errors and error codes are displayed in the audio notifications when an audio failed case is received
2017-07-18 17:04:12 -07:00
Klaus
a7ca723fe6
Audio only working on html5
2017-07-18 11:59:05 -03:00
Anton Georgiev
2d4db1c9de
Merge pull request #4113 from oswaldoacauan/fix-meeting-add
...
[HTML5 2.0] Fix meeting add
2017-07-18 10:02:08 -04:00
Oswaldo Acauan
507bb61fb2
Change user-list width
2017-07-18 10:55:19 -03:00
Oswaldo Acauan
a0de0545b4
Fix welcomeMessage from meeting object
2017-07-18 10:31:00 -03:00
Oswaldo Acauan
c6f517b3cb
Fix selector and get welcomeMessage from meeting object
2017-07-18 10:25:11 -03:00
Oswaldo Acauan
04b6b753fe
Fix missing prop on meeting object
2017-07-18 10:23:16 -03:00
Oswaldo Acauan
dbb6b5cd12
New user-list colors
2017-07-18 10:12:26 -03:00
Oleksandr Zhurbenko
d49efd548d
Fixed shape's display
...
The version went missing during the switch to 2.0
2017-07-17 16:47:18 -07:00
Oleksandr Zhurbenko
a03ff03a84
Fixed shape's thickness
2017-07-17 16:41:07 -07:00
Oleksandr Zhurbenko
23263c997b
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-17 16:01:05 -07:00
Klauswk
7173c0e20c
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-17 16:54:37 -03:00
Anton Georgiev
ed5460cba6
Merge pull request #4040 from Klauswk/html5-2x-captions-messages
...
[HTML5 2.0] Move captions messages to 2.0
2017-07-17 15:52:15 -04:00
Anton Georgiev
bc9083c0cf
Merge pull request #4109 from Klauswk/fix-sass-path
...
[HTML5 - 2.0] Change relative path of the sass imports to absolute
2017-07-17 14:58:02 -04:00
Klaus
6b0edb353e
Change all from single quotes to double quotes
2017-07-17 15:56:05 -03:00
Klaus
5767583a86
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages
2017-07-17 15:37:06 -03:00
Klaus
87943cb3f8
Change relative path of the sass to absolute
2017-07-17 15:21:45 -03:00
Klaus
2343ef3f1f
Add missing merge file
2017-07-17 13:38:18 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Klaus
d4ffcc0221
Add assign presenter to html5
2017-07-17 09:49:11 -03:00
Klaus
b630fcd632
Fix presenter assign
2017-07-17 09:00:18 -03:00
Oleksandr Zhurbenko
1508ed566c
Resolved some of the issues related to the 2.0 switch
2017-07-14 16:20:16 -07:00
Oleksandr Zhurbenko
d7a4cd7a67
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
2017-07-14 16:15:26 -07:00
Oleksandr Zhurbenko
d7ec74dcde
Added initial PanZoomDrawListener
2017-07-14 16:14:38 -07:00
Oleksandr Zhurbenko
82a1ad2c8a
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
2017-07-14 15:43:41 -07:00
Anton Georgiev
07ca5f5794
Merge pull request #4086 from oswaldoacauan/guest-policy
...
[HTML5] Guest Policy
2017-07-14 15:32:18 -04:00
Oswaldo Acauan
8c99b7e4bb
Fix cb pattern
2017-07-14 16:25:04 -03:00
Anton Georgiev
d2d6e1d029
Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics
...
[HTML5] - Accessibility Contrast & Semantic Fixes
2017-07-14 15:17:49 -04:00
Klaus
a99f8c37c4
Fix annotation incorrect size
2017-07-14 14:45:50 -03:00
Klaus
7fb9bae75e
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-14 14:44:00 -03:00
KDSBrowne
fc8cb5688b
change #fff to -white and fix lint issue
2017-07-14 10:39:33 -07:00
Anton Georgiev
a251305cab
Merge pull request #4036 from KDSBrowne/x0-userlist-jaws-fix
...
[HTML5] - ARIA fixes to work with JAWS
2017-07-14 13:26:07 -04:00
Klaus
baf36d9d5f
Fix the html5 2.0 user logout
2017-07-14 13:59:02 -03:00
Matthew Marangoni
d9a115aab6
added error code handling for fail cases
2017-07-14 08:57:06 -07:00
Anton Georgiev
a00410847c
Merge pull request #4083 from Klauswk/html5-breakout-messages
...
[HTML5 2.0] Move breakout messages to 2.0
2017-07-14 10:39:38 -04:00
Anton Georgiev
586c51fcac
Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
...
[HTML5 2.0] Move emoji messages to 2.0
2017-07-14 10:39:16 -04:00
Oswaldo Acauan
fe9ca6b0c8
Fix welcome message for guest users
2017-07-14 11:23:12 -03:00
Klaus
5f7c008e95
Screenshare messages been handle
2017-07-14 11:18:46 -03:00
Oswaldo Acauan
2e6ee550d2
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy
2017-07-14 11:18:40 -03:00
Oswaldo Acauan
5353a3a80d
Add guest policy to html5
2017-07-14 11:18:07 -03:00
Klaus
712b6914cc
Add base files
2017-07-14 09:32:15 -03:00
Klauswk
38087a1669
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
2017-07-13 17:38:54 -03:00
Klaus
82f383f4ae
Fix typo in createBreakout
2017-07-13 17:35:40 -03:00
Klaus
6c602ba56f
Add missing import and add FIX ME
2017-07-13 17:28:35 -03:00
Klaus
12f1254624
Fix missing merge in redis2x
2017-07-13 17:23:20 -03:00
Klaus
858076924c
Fix import problems
2017-07-13 17:21:27 -03:00
Klaus
963248163d
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
2017-07-13 17:14:02 -03:00
Klaus
c97ad780b5
Fix properties incorrect name
2017-07-13 13:55:05 -03:00
Klaus
05e1951ac1
Use flat object instead of long properties
2017-07-13 10:56:28 -03:00
Klaus
54234cecac
Handling emoji messages
2017-07-13 10:15:42 -03:00
Klaus
f0e26c1bbb
Change missing strings to const
2017-07-12 17:22:26 -03:00
Klaus
111ad9171b
Remove strings and add constants
2017-07-12 17:15:50 -03:00
Klaus
8cd4b752ef
Remove strings and add constants
2017-07-12 17:02:55 -03:00
Klaus
2aa603d195
Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages
2017-07-12 16:29:07 -03:00
Klaus
1dfb054323
A few hotfixes to make the html5 client join again
2017-07-12 15:51:29 -03:00
Klaus
eb5712e96c
Fix chat list
2017-07-12 13:47:58 -03:00
Klaus
e1004b64d3
Filtering correct the messages
2017-07-12 10:54:54 -03:00
Klaus
898f7c97e3
Sending private message
2017-07-12 10:18:26 -03:00
Klaus
e19ea05a75
Remove 'this.window', break the client
2017-07-12 09:59:51 -03:00
Klaus
73f49bb46a
Sending public message
2017-07-12 09:42:16 -03:00
Klaus
188aff42df
Sending message, need to fix the property names
2017-07-11 17:44:07 -03:00
JaeeunCho
ccab71a898
changed MeetingId : meetingId to meetingId
2017-07-11 13:16:10 -07:00
JaeeunCho
fbdea71f8d
changed to divide meeting check
2017-07-11 12:26:07 -07:00
JaeeunCho
9938ee6575
added space under User check
2017-07-11 12:20:47 -07:00
JaeeunCho
b5852c8f45
changed code that Meeting is not existed
2017-07-11 12:19:02 -07:00
JaeeunCho
7fe20bb1f6
moved check logic into userLeaving
2017-07-11 10:43:33 -07:00
Klaus
55a9c0673e
Handling chat messages
2017-07-11 13:57:54 -03:00
KDSBrowne
c8b783e526
improve contrast for hover states in join audio modal
2017-07-11 08:15:19 -07:00
KDSBrowne
efd933bf28
change $color-white to #fff
2017-07-11 07:08:49 -07:00
KDSBrowne
50eb4d81ef
wrap form elements with label
2017-07-07 23:50:33 -07:00
KDSBrowne
44e918b9e6
remove if condition
2017-07-07 23:29:31 -07:00
JaeeunCho
a3c8c61d80
HTML5 - added check that current meeting is existed or not
2017-07-07 13:58:55 -07:00
KDSBrowne
e615869472
adjust contrast in user avatar
2017-07-07 12:12:35 -07:00
KDSBrowne
e4e15008dc
add new line to end of file
2017-07-07 09:42:14 -07:00
KDSBrowne
0a81d59542
remove comments and more palette changes
2017-07-07 09:38:17 -07:00
KDSBrowne
44afafc448
fix color contrast issues
2017-07-07 09:11:22 -07:00
JaeeunCho
28b81b32eb
changed function to pass two parameters
2017-07-07 08:18:19 -07:00
KDSBrowne
70cb30310b
remove invalid ARIA attribute values
2017-07-07 06:53:44 -07:00
Klaus
743e128b0f
Fix Poll display on html5
2017-07-07 09:18:54 -03:00
Klaus
4138f54f17
Fix Poll display on html5
2017-07-07 09:18:37 -03:00
Klaus
28b69208f9
Fix lint problems
2017-07-07 08:23:31 -03:00
Klaus
90ca216507
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-07 08:19:39 -03:00
Klaus
8ef23a559e
Fix lint problems
2017-07-07 08:17:49 -03:00
Klaus
4c1c7ad65a
Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages
2017-07-06 17:36:56 -03:00
Klaus
3d091e7a26
Change if
2017-07-06 15:07:52 -03:00
Klaus
9b32a4db2d
Remove 'nodeJSapp' stuff, is deprecated
2017-07-06 15:01:05 -03:00
KDSBrowne
889209b26d
give ARIA attribute valid values
2017-07-06 09:17:14 -07:00
KDSBrowne
54c16c796a
fix listitem element semantics
2017-07-06 09:01:59 -07:00
KDSBrowne
8aee85ed72
ensure form elements have labels
2017-07-06 08:54:18 -07:00
KDSBrowne
a14ecdabef
rename ARIA attribute to be valid
2017-07-06 08:32:11 -07:00
KDSBrowne
0dfa9ca446
Ensures aria-hidden='true' is not present on the document body
2017-07-06 08:30:50 -07:00
Klaus
dfa13b30f6
Add comment to change in the redis2x
2017-07-06 09:56:39 -03:00
Klaus
94da6f636f
Merge branch 'html5-2x-getAll-messages' of https://github.com/Klauswk/bigbluebutton into html5-2x-getAll-messages
2017-07-06 09:32:14 -03:00
Klaus
2058e14ae7
Fix lint problems
2017-07-06 09:29:17 -03:00
Klaus
cc38576f79
Add missing events
2017-07-06 08:58:38 -03:00
JaeeunCho
440c675e23
made function for duplicated code
2017-07-05 15:56:13 -07:00
JaeeunCho
fd2b5926bc
changed error to warn and add clearUsers
2017-07-05 13:16:21 -07:00
Klauswk
ebb3984828
Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages
2017-07-05 15:28:35 -03:00
Klaus
3f445bc92e
Change log
2017-07-05 14:26:22 -03:00
Anton Georgiev
23f4521954
Merge pull request #4038 from oswaldoacauan/flat-add-meeting
...
[HTML5 2.0] Add flat package and implement on addMeeting modifier
2017-07-05 11:13:23 -04:00
JaeeunCho
1a1fb6dc57
HTML5 - fixed errors when the meeting is ended by apimate
2017-07-05 07:59:18 -07:00
KDSBrowne
05d16db6e8
set unique id attribute
2017-07-04 08:09:23 -07:00
KDSBrowne
61672b4ac7
remove tabIndex attributes
2017-07-04 07:38:55 -07:00
KDSBrowne
33da4d391e
add missing lang attribute
2017-07-04 07:32:22 -07:00
Klaus
86d3e27d47
Merged info with anton's branch
2017-07-03 12:05:35 -03:00
Anton Georgiev
83e14e8206
handle slides messages
2017-06-30 15:16:00 -04:00
Anton Georgiev
2e0f6d8610
trigger syncing with state from akka-apps
2017-06-30 11:19:11 -04:00
Anton Georgiev
19d89c6f92
trigger syncing with state from akka-apps
2017-06-30 10:58:49 -04:00
Klaus
be2caf92a3
Working poll vote
2017-06-30 11:26:19 -03:00
Klaus
5e868f37ac
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-polls-messages
2017-06-30 08:47:58 -03:00
Klaus
9b63e0c215
Add caption messages
2017-06-29 17:22:09 -03:00
Anton Georgiev
c9b877c465
Merge branch 'handle-messages' into presentation-and-slides
2017-06-29 10:39:00 -04:00
Klaus
1c62543715
Remove check from meetingId
2017-06-29 10:27:59 -03:00
Klaus
27a92698cc
Moved the meetingId to be last param
2017-06-29 10:09:11 -03:00
Klaus
6f93a5f9f6
Change to have default meeting param
2017-06-29 09:23:04 -03:00
Klaus
93927a3b53
Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages
2017-06-29 09:22:34 -03:00
Oswaldo Acauan
ace3afeb70
Remove console.log
2017-06-29 09:01:10 -03:00
Oswaldo Acauan
63522c6a95
Use flat package on mongo upsert
2017-06-29 08:54:19 -03:00
Klaus
2098c2dff7
Handle polls messages
2017-06-28 17:37:45 -03:00
Anton Georgiev
3ab794cbdb
obtain meetingId outside handler
2017-06-28 16:04:41 -04:00
Anton Georgiev
7e798b96dd
clearing some linting issues
2017-06-28 15:24:19 -04:00
Anton Georgiev
56da45f071
handle adding presentation, slide 2.0
2017-06-28 15:05:50 -04:00
Klaus
4a24769f20
Change var name
2017-06-28 15:34:22 -03:00
Klaus
0e1d81ceb5
Change var name
2017-06-28 15:33:06 -03:00
Klaus
aab51bdaed
Change import and remove console.err
2017-06-28 15:14:29 -03:00
Klaus
4fe5a074df
Userlist working correct
2017-06-28 14:16:04 -03:00
Klaus
d3a50416cc
Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages
2017-06-28 13:56:33 -03:00
Klaus
894fd70e68
Fix presenter assigned message handle
2017-06-28 13:44:11 -03:00
Anton Georgiev
d899a573a6
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
2017-06-28 11:37:54 -04:00
Anton Georgiev
e0a5fa48f4
add default webcam_stream and adjust emoji
2017-06-28 11:33:03 -04:00
KDSBrowne
1cc5c5df92
change variable name and condition
2017-06-27 20:35:15 -07:00
Matthew Marangoni
545a9ea978
fixed issue with changing locales
2017-06-27 15:41:56 -07:00
Anton Georgiev
724e21a0d6
we do not have 1.0 user messages coming from bbb so use 2.0 only
2017-06-27 18:14:53 -04:00
Oleksandr Zhurbenko
cb25c7641b
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-27 12:41:12 -07:00
Matthew Marangoni
0197aff5ab
Merge remote-tracking branch 'upstream/master' into call-manager
2017-06-27 10:38:53 -07:00
Matthew Marangoni
482591a2f5
spacing fixes
2017-06-27 10:38:31 -07:00
Klaus
83cbb47195
Fix pencil update, thanks to @capilkey
2017-06-27 14:36:37 -03:00
Klaus
6f3aeb7a8d
Fix imports
2017-06-27 09:45:08 -03:00
Klaus
c90d94d5ac
Handle presenterAssigned and emojiStatus
2017-06-27 09:40:28 -03:00
Klaus
5304a87b7b
Add last message
2017-06-27 09:27:57 -03:00
Anton Georgiev
91cfc02d13
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
2017-06-26 17:21:42 -04:00
Anton Georgiev
ff01a66228
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
2017-06-26 17:11:57 -04:00
Anton Georgiev
16168ddd5b
Merge pull request #3997 from Klauswk/DetectSystemLang
...
[HTML5] Add support to default system/browser language
2017-06-26 16:18:22 -04:00
Klaus
43ffe77cd0
Remove unused import
2017-06-26 15:04:26 -03:00
Klaus
c491d28b78
Handle most of the breakout messages
2017-06-26 15:00:28 -03:00
Klaus
e9d13e3b1e
A few fixes
2017-06-26 13:15:28 -03:00
Matthew Marangoni
6f2f541787
change state when joining and leaving audio
2017-06-22 14:31:27 -07:00
Klaus
8b6cb71854
Shapes add correct in the collection
2017-06-22 14:24:00 -03:00
Klaus
0e0af787f3
Add missing files
2017-06-22 10:22:52 -03:00
Klaus
a209f620e0
Add cursor support
2017-06-22 10:22:34 -03:00
Klaus
8aee5dc069
Fix wrong publish name
2017-06-22 10:11:12 -03:00
Klaus
a1c41f220c
Correct handling the whiteboard messages
2017-06-22 10:03:27 -03:00
Klaus
43cdd9754c
Fix imports
2017-06-22 08:48:10 -03:00
Klaus
692de9f417
Handle a few new messages
2017-06-21 13:54:04 -03:00
Anton Georgiev
13193e1d12
Merge pull request #4009 from KDSBrowne/x0-userlistitem-missing-chevron-fix
...
[HTML5] - Missing dropdown menu chevron fix
2017-06-20 15:40:54 -04:00
Anton Georgiev
42393e21b7
Merge pull request #4015 from JaeeunCho/setPreseter_err_html5
...
HTML5 - fixed setPresenter error through HTML5
2017-06-20 15:39:42 -04:00
Klaus
3998139e72
Split redis and api for version migration
2017-06-20 14:17:37 -03:00
Klaus
0c596c304d
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis
2017-06-20 14:16:16 -03:00
Klaus
b3865ef90d
Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis
2017-06-20 14:11:19 -03:00
KDSBrowne
be009fd9ba
fix chat log aria label to work with jaws
2017-06-20 09:01:42 -07:00
Anton Georgiev
367b905ec5
use enter api to get meetingId, authToken, etc
2017-06-19 14:03:12 -04:00
Anton Georgiev
8e16114c3f
html5client login now redirect=true to url+sessionToken
2017-06-19 14:01:24 -04:00
KDSBrowne
8df4c0a174
suggested change
2017-06-19 09:29:32 -07:00
Klaus Klein
ca09b69555
Merge branch 'Acl' into Refactor2x
...
* Acl:
Add check to undefined role
Lint to eslint
Missing merge file
Fix lint problems
Change Acl lookup
Change ACL to be more extensible
Fix a few review comments
Acl refactor working
Mostly working, still problems with user subs
Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
d88d4fb0bc
Add stuff from 2.x
2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
f7d1ff0df2
Text shape and bug fixes
...
Restructured code, fixed a bug with thickness icon not displayed when switching from Text tool, added textshape container
2017-06-16 19:32:41 -07:00
Oleksandr Zhurbenko
a9a8a48413
Fixed a bug with focus not working onBlur in FF
2017-06-16 13:33:10 -07:00
Matthew Marangoni
12d42aaecb
set state for AudioManager when joining or leaving audio
2017-06-16 13:22:17 -07:00
KDSBrowne
30b5fb3259
fix jaws ability to voice users in the userlist
2017-06-16 11:42:28 -07:00
JaeeunCho
613da8b818
HTML5 - removed setPresenter at viewer
2017-06-16 08:15:49 -07:00
JaeeunCho
cf660527a8
HTML5 - fixed setPresenter error through HTML5
2017-06-16 08:14:02 -07:00
JaeeunCho
3bcae276e1
HTML5 - fixed setPresenter error through HTML5
2017-06-14 13:31:49 -07:00
Matthew Marangoni
6dd71a3ee0
fixed merge conflicts
2017-06-14 11:26:11 -07:00
Matthew Marangoni
4beff48938
reconnecting wip
2017-06-14 11:07:18 -07:00
KDSBrowne
5963b1a49f
fix lint issue
2017-06-11 20:47:17 -07:00
Oleksandr Zhurbenko
461a702759
Passing the data from the presenter's text shape to the whiteboard overlay
2017-06-10 19:21:37 -07:00
Oleksandr Zhurbenko
443c2f1032
Fixed a bug with ref breaking after changind a slide
2017-06-10 14:57:16 -07:00
KDSBrowne
9eaa19e8c7
fix lint issue
2017-06-10 12:29:36 -07:00
KDSBrowne
b80fb29fb2
switch to callback ref
2017-06-10 12:21:13 -07:00
KDSBrowne
cb96a26717
remove string concatenation
2017-06-10 11:56:14 -07:00
KDSBrowne
01a250e5b7
fix console error with FindDOMNode() on unmounted component
2017-06-10 11:22:54 -07:00
Oleksandr Zhurbenko
16d03ca32b
Fixed a bug with the text shape's static clipPath id
...
ClipPath worked fine only for the first text shape
2017-06-09 14:55:38 -07:00
KDSBrowne
ae883f1065
remove console log
2017-06-09 12:08:52 -07:00
KDSBrowne
0fc81cf63d
clean up key events
2017-06-09 12:04:21 -07:00
KDSBrowne
65bf70b293
add overflow: visible to show userlist item dropdown menu chevron
2017-06-09 09:27:18 -07:00
KDSBrowne
13ab2134a9
remove console log
2017-06-08 11:06:04 -07:00
KDSBrowne
000575f38a
fix menu not closing on click
2017-06-08 11:05:11 -07:00
KDSBrowne
c189faceff
fix merge conflicts
2017-06-08 11:00:06 -07:00
KDSBrowne
dd4e1ba488
fix keycode events
2017-06-08 10:40:14 -07:00
Klaus Klein
68f52aa107
Remove error from http response
2017-06-08 14:29:35 -03:00
KDSBrowne
3906448d71
fix keydown event bugs
2017-06-08 08:33:25 -07:00
JaeeunCho
d902724309
HTML5 - removed useless line
2017-06-07 14:57:27 -07:00
JaeeunCho
c7e654511c
Merge remote-tracking branch 'upstream/master' into long_string_cc
2017-06-07 14:53:39 -07:00
Oleksandr Zhurbenko
1a8aaefb0e
Fixed svg animation for svg whiteboard-toolbar icons
2017-06-07 14:40:15 -07:00
Oleksandr Zhurbenko
9e08cb8567
Refs, PropTypes, fixes
2017-06-07 14:25:47 -07:00
Oleksandr Zhurbenko
1309bb1808
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-07 14:12:04 -07:00
Oleksandr Zhurbenko
6a228c0b77
Corrected the calls to the server-side
2017-06-07 13:45:49 -07:00
Oleksandr Zhurbenko
017ff470c3
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-07 13:29:35 -07:00
Anton Georgiev
7f909058aa
Merge pull request #3987 from OZhurbenko/refs-to-callbacks
...
[HTML5] String refs to callback refs
2017-06-07 15:11:09 -04:00
KDSBrowne
0c05597f3d
Merge remote-tracking branch 'origin/x0-userlist-accessibility-bug-fixes' into x0-userlist-accessibility-suggestions
2017-06-07 11:37:07 -07:00
KDSBrowne
c2579c7838
fix console error related to messageForm
2017-06-07 11:36:25 -07:00
KDSBrowne
f17dfd04cf
fix focus bug
2017-06-07 06:44:18 -07:00
Klaus Klein
f135dbd129
Add check to undefined role
2017-06-07 10:02:31 -03:00
KDSBrowne
cf9d2d16e1
remove null values being announced by NVDA
2017-06-06 17:56:50 -07:00
Oleksandr Zhurbenko
2bcc03527c
Added a check isPresenter to shapeFactory in order to render either presenter's or viewer's version of the text shape
2017-06-06 17:14:36 -07:00
Oleksandr Zhurbenko
465c0c1517
Changed whiteboard-toolbar's refs to callbacks, fixed a bug with the initial radius of the thickness svg icon
2017-06-06 16:47:31 -07:00
Oleksandr Zhurbenko
4dbf02a344
Fixed a bug with the switches ref
2017-06-06 14:55:46 -07:00
JaeeunCho
5b658dcd97
HTML5 - fixed long string at cc box
2017-06-06 10:32:56 -07:00
JaeeunCho
36c306c36d
Merge remote-tracking branch 'upstream/master' into long_string_cc
2017-06-06 10:31:14 -07:00
KDSBrowne
3cae15da59
fix conflicting keypress events
2017-06-06 10:19:25 -07:00
Anton Georgiev
18d9fb947e
Merge pull request #3986 from OZhurbenko/fix-chat-links
...
HTML5 - Chat links fix
2017-06-06 09:49:32 -04:00
Klaus Klein
e7e1243fef
Add const to defaultLang
2017-06-06 09:43:57 -03:00
Klaus Klein
0d9525164f
Add support to default system/browser language
2017-06-06 09:33:53 -03:00
Oleksandr Zhurbenko
1ba4018629
Cleanup
2017-06-05 20:15:37 -07:00
Oleksandr Zhurbenko
52fae1b8c8
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks
2017-06-05 19:51:20 -07:00
