Commit Graph

58 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
5aed767436 Moved SwitchSlide method to 2.0 2017-07-24 14:04:49 -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
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
87943cb3f8 Change relative path of the sass to absolute 2017-07-17 15:21:45 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -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
82a1ad2c8a Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 15:43:41 -07:00
KDSBrowne
70cb30310b remove invalid ARIA attribute values 2017-07-07 06:53:44 -07:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04: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
Klaus
8b6cb71854 Shapes add correct in the collection 2017-06-22 14:24:00 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
443c2f1032 Fixed a bug with ref breaking after changind a slide 2017-06-10 14:57:16 -07:00
Oleksandr Zhurbenko
9e08cb8567 Refs, PropTypes, fixes 2017-06-07 14:25:47 -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
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
0e55b04a7a Switched from the deprecated react-addons-css-transition-group package to a recommended one 2017-06-04 16:20:38 -07:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
Oleksandr Zhurbenko
967c0bb4fb Restructuring, improvements
Removed unnecessary state, 'out of bounds' check, adjusted the coordinate system for the text shape
2017-05-26 13:06:34 -07:00
Oleksandr Zhurbenko
21f09edaeb Fixed a bug with cursor not moving vertically/horizontally 2017-05-26 12:06:35 -07:00
Oleksandr Zhurbenko
4296bac515 Improved presenter's cursor component
Changed naming and removed unnecessary variables from the state
2017-05-26 12:05:19 -07:00
JaeeunCho
050994fc06 HTML5 - removed unused media query 2017-05-18 12:58:21 -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
KDSBrowne
2f79f3ff20 change locale stringformat 2017-05-16 17:02:27 -07:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
Oleksandr Zhurbenko
8de7b895b5 Optimized and validated undo/clear/send annotation methods 2017-05-10 11:59:17 -07:00
Oleksandr Zhurbenko
f4b066ffc2 Added an additional check to prevent rendering the slide if Tomcat failed and didn't publish the slide 2017-05-09 13:40:05 -07:00
Oleksandr Zhurbenko
8482ad5a9b Fixed a bug with cursot mouseEvent not firing after changing the drawing settings 2017-05-08 13:29:54 -07:00
Oleksandr Zhurbenko
56c693cd81 Improved Cursor rendering
The whole presentation component was recalculated when cursor coordinates were changed, that wasn't nice. Now it's good
2017-05-04 14:10:49 -07:00
Oleksandr Zhurbenko
50cbefaf23 Fixed a bug with the shapes' thickness being depended on the slide sizes 2017-05-04 13:20:30 -07:00
Oleksandr Zhurbenko
286f077ed3 Added initial drawing functionality for Line/Rectangle/Triangle/Ellipse 2017-05-01 14:34:24 -07:00
Klauswk
30b7c3c1e4 Merge branch 'master' into AddServerCallback 2017-04-28 17:28:45 -03:00
Oleksandr Zhurbenko
a7966f23be Fixed a bug with the cursor scaling depending on the size of the slide and added an animation for its scaling back 2017-04-27 15:21:04 -07:00
Oleksandr Zhurbenko
0039eba840 Whiteboard scaling/ositioning, svg coordinate system, ui fixes
Fixed whiteboard and wbtoolbar positioning in FF, set a proper SVG coordinate system, fixed scaling (let SVG scale everything)
2017-04-27 15:18:53 -07:00
KDSBrowne
ef18f652aa fix lint issues 2017-04-26 07:08:47 -07:00
Klaus Klein
e56546137b Change callServer function name 2017-04-26 10:47:44 -03:00
Oleksandr Zhurbenko
861256ddbc Changed a variableName to better reflect the content 2017-04-19 12:13:52 -07:00
Oleksandr Zhurbenko
206229e3b8 Added UI for the WhiteboardToolbar 2017-04-18 17:54:51 -07:00
KDSBrowne
a5f1857c67 add descriptions to defined messages 2017-04-10 08:50:03 -07:00
Oleksandr Zhurbenko
a50a883bf9 Switched to a different way of scaling the slide 2017-03-23 14:52:36 -07:00
Oleksandr Zhurbenko
583ec9c404 Added animateTransform for the cursor for smoother animation 2017-03-22 16:24:36 -07:00
Oswaldo Acauan
2090883b03 Refactor Auth logout and credentials getter 2017-03-17 14:23:00 +00:00
Oleksandr Zhurbenko
925842ae96 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-03-13 10:57:00 -07:00
Oleksandr Zhurbenko
ccef7e9562 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-06 12:44:19 -08:00
JaeeunCho
e2964d2c8f HTML5 - changed the location of slide's arrow buttons 2017-03-03 09:55:11 -08:00
Oleksandr Zhurbenko
7b3bc48be4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-02 10:11:59 -08:00
Oleksandr Zhurbenko
652dac0cc0 Initial whiteboard overlay component
Returns correct coordinates
2017-02-28 10:35:56 -08:00