Klaus
f6e0785e6f
Missing relative path style
2017-09-22 11:31:05 -03:00
Klaus
4d51e0c045
Fix unsplited styles and code duplicated
2017-09-22 11:24:24 -03:00
Klaus
29922c896a
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist
2017-09-21 15:40:18 -03:00
Oleksandr Zhurbenko
f3a17e74a8
Removed unused properteties from the slide object
2017-09-18 17:18:20 -07:00
Oleksandr Zhurbenko
838382b6f9
Moved presentation overlays' rendering to a separate function
2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
537175dad2
Moved part of the presentation display calculations to the server side
2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
c9552247b2
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-18 12:08:14 -07:00
Oleksandr Zhurbenko
9e1c8a4fb7
Permissions fix
...
Can't afford WebStorm :-(
2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8
Improvements based on the PR review
2017-09-17 18:58:37 -07:00
KDSBrowne
72acea229b
remove single quotes from variable
2017-09-12 10:01:07 -07:00
Oleksandr Zhurbenko
43b3b89c6a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-11 12:11:03 -07:00
Anton Georgiev
bf35fa7a4c
Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
...
[HTML5] - Fix Userlist Lock Notification
2017-09-11 12:07:17 -04:00
KDSBrowne
eeb878649a
remove single quotes from variable
2017-09-11 06:42:56 -07:00
KDSBrowne
ef6d3059a7
fix lint issue
2017-09-07 12:06:48 -07:00
KDSBrowne
13e6357b19
fix line endings
2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34
fix undefined check
2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849
handle UserLockedInMeetingEvtMsg
2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07:00
KDSBrowne
31cf7aea42
check for specific meeting id
2017-09-06 11:32:29 -07:00
KDSBrowne
fd9a4cd98e
fix bug in undefined check
2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56
check if lock settings are undefined
2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3
remove ternary operation
2017-09-06 09:08:26 -07:00
Oleksandr Zhurbenko
9ee75331bf
Removed an unnecessary rule
2017-09-05 19:02:23 -07:00
Oleksandr Zhurbenko
65da71c12a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439
PR review fixes
2017-09-05 18:36:15 -07:00
Oleksandr Zhurbenko
b12e0b84a9
Using previously saved draw settings for the initial wb toolbar values
2017-09-05 15:55:18 -07:00
Oleksandr Zhurbenko
3c750575cf
Fixed font-size normalization for the text-shape
2017-09-05 15:47:13 -07:00
Anton Georgiev
a68222dfff
Merge pull request #4181 from JaeeunCho/destroy_meeting_users
...
[HTML5 2.0] End meeting by moderator
2017-09-05 09:54:19 -04:00
Anton Georgiev
50c7974a30
Merge pull request #4323 from KDSBrowne/x2.0-replace-getElementById-instances
...
[HTML5] - Replace Instances of getElementById
2017-09-05 09:51:57 -04:00
JaeeunCho
7a01c61639
fixed isModerator()
2017-09-01 13:00:55 -07:00
JaeeunCho
99ea26c584
added isModerator at service.js
2017-09-01 12:37:14 -07:00
JaeeunCho
ede90b8a40
removed unused line at css
2017-09-01 11:39:17 -07:00
JaeeunCho
43f6fd9c03
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-09-01 11:22:45 -07:00
Anton Georgiev
d60e06e28f
Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
...
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Oleksandr Zhurbenko
2a91c6aa0b
Fixed a bug initial cursor/shape coordinates on page zooming
2017-08-31 18:42:00 -07:00
KDSBrowne
b20859d1c9
fix chat being locked for moderators
2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f
fix the disabling of chat when locked
2017-08-31 14:29:18 -07:00
KDSBrowne
94e44d6a23
remove unused prop
2017-08-31 13:50:20 -07:00
KDSBrowne
a404cc14d1
remove space typo
2017-08-31 13:47:06 -07:00
KDSBrowne
2f9d4bcc0e
move isMeetingLocked condition check to userlist service
2017-08-31 11:12:53 -07:00
Klaus
5bba87525e
Fix navigation error mention by kert
2017-08-31 14:03:40 -03:00
Oleksandr Zhurbenko
28f7f8ad11
Minor fixes and adjustments
2017-08-30 16:12:03 -07:00
Oleksandr Zhurbenko
e4c4f4584d
Prevented publishing messages on random clicks for common shapes, and enabled that for pencil
2017-08-30 13:45:47 -07:00
KDSBrowne
a01451f9fd
handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification
2017-08-30 11:00:56 -07:00
Oleksandr Zhurbenko
f78283a17d
Fixes
...
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
2017-08-29 18:43:55 -07:00
KDSBrowne
b2fcfef145
move if condition
2017-08-29 16:26:43 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5
Rewrite of the cursor component
2017-08-29 13:58:48 -07:00
KDSBrowne
126f4589e1
move if conditions
2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f
add suggested changes
2017-08-29 12:25:01 -07:00
KDSBrowne
7271be05f8
remove getElementById usage in message-list-item component
2017-08-28 08:30:50 -07:00
