Commit Graph

505 Commits

Author SHA1 Message Date
Vitor Mateus
e5afdacb50 Merge remote-tracking branch 'upstream/master' into issue-6944 2019-03-12 14:05:32 -03:00
Vitor Mateus
2391b3c94f Fix #6841 and toolbar with 2019-03-12 10:56:05 -03:00
Vitor Mateus
7c76ec4e3a Fix tooltips and fullscreen 2019-03-11 13:21:12 -03:00
KDSBrowne
445865a34f fix button alignment in presentation upload modal 2019-03-10 18:24:47 +00:00
KDSBrowne
2381ebc5c3 fix label toggle for fit to width / page button 2019-03-10 17:21:48 +00:00
Tainan Felipe
e91859b816 Fix poll exception when no presentation selected 2019-03-08 17:46:25 -03:00
Anton Georgiev
68d78ffab8
Merge pull request #6778 from vitormateusalmeida/issue-5191
Updated the slide control toolbar look
2019-03-07 15:47:21 -05:00
eduardohfnascimento
4e25463d8f fix Drop and upload files 2019-03-07 16:53:01 -03:00
Vitor Mateus
f8a03a669a Remove donload button and fix tooltip position 2019-03-07 16:00:01 -03:00
Vitor Mateus
0a1972846a Add min width 2019-03-07 12:52:12 -03:00
Vitor Mateus
b0ff131dea Add download button 2019-03-06 18:57:07 -03:00
Vitor Mateus
7323183a84 Merge remote-tracking branch 'upstream/master' into issue-5191 2019-03-06 11:30:23 -03:00
KDSBrowne
761c11581b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-Edge-support-01 2019-03-05 02:52:49 +00:00
KDSBrowne
de660a0abe make remaining animations work with Edge 2019-03-05 02:46:37 +00:00
Anton Georgiev
8c896d3892
Merge pull request #6882 from MaximKhlobystov/fullscreen-on-edge
Fullscreen in Edge
2019-03-04 09:13:54 -05:00
Anton Georgiev
aac229b833
Merge pull request #6838 from gustavotrott/quick-poll-implement
Quick poll implement
2019-03-04 08:53:18 -05:00
Maxim Khlobystov
93dc1cc3ca Fix for the presentation and video fullscreen buttons in Edge 2019-02-28 15:22:06 -05:00
KDSBrowne
a2c57796bd fix animations / some whiteboard toolbar icons not rendering 2019-02-28 15:11:36 +00:00
Anton Georgiev
bba3030df5 fix incorrect reference in pres isDownloadable 2019-02-25 13:12:00 +00:00
Gustavo Trott
c6b725a36b Resolve conflicts 2019-02-25 09:24:00 -03:00
Anton Georgiev
78ac2c012a handle setting presentation as downloadable prior to uploading it 2019-02-22 21:04:35 +00:00
Anton Georgiev
3003ccf7ab
Merge pull request #6779 from gustavotrott/slide-text-for-accessibility
Add texts extracted from slides for accessibility
2019-02-22 11:00:34 -05:00
Anton Georgiev
ac919bf87b
Remove missed console log 2019-02-22 09:00:28 -05:00
Anton Georgiev
4743b6cf4e added uriEncode for GET param for download presentation 2019-02-21 23:43:11 +00:00
Anton Georgiev
ef002a2fd1 renamed icon "save_notes" to "download" 2019-02-21 22:15:33 +00:00
Anton Georgiev
a1fc31101c adjusted icons, state for download presentation 2019-02-21 21:10:32 +00:00
Gustavo Trott
3f21c82330 implement quick poll feature 2019-02-21 18:01:39 -03:00
Anton Georgiev
a329732e40 WIP localizing presentation-upload 2019-02-20 22:44:44 +00:00
Anton Georgiev
a7c69f6d27 add toggle for presenter to set downloadable for presentations 2019-02-20 22:20:04 +00:00
Anton Georgiev
89225f25a7 include download-presentation-button/* 2019-02-20 19:28:02 +00:00
Anton Georgiev
9438b45a46 use real link to presentation to download 2019-02-20 17:17:17 +00:00
Gustavo Trott
ff05c4f971 Update slides content 2019-02-20 13:38:52 -03:00
Vitor Mateus
2014dd742f Fixes and improvements 2019-02-19 09:27:54 -03:00
Anton Georgiev
b7c0872892 linting of presentation/presentation-uploader/component.jsx 2019-02-15 16:35:44 +00:00
Gustavo Trott
1695e5e967 Add texts extracted from slides for accessibility 2019-02-14 16:42:13 -02:00
Vitor Mateus
61ceab5938 Updated the slide control toolbar look. #5191 2019-02-14 10:03:25 -02:00
Vitor Mateus
7998f46391 Modified presentation toolbar styles 2019-02-12 11:35:52 -02:00
Vitor Mateus
bee218adfb Merge remote-tracking branch 'upstream/master' into issue-6521 2019-02-08 15:23:53 -02:00
Anton Georgiev
48a951d253
Merge pull request #6660 from KDSBrowne/2.2-accessibility-minor-update
Fix minor accessibility issues
2019-02-07 15:23:39 -05:00
KDSBrowne
2df9f0829d fix existing lint errors 2019-02-07 17:47:28 +00:00
KDSBrowne
e172220287 make fullscreen btn label include element name 2019-02-06 21:12:59 +00:00
KDSBrowne
eb3bf6010e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-02-06 17:09:47 +00:00
Anton Georgiev
6b1db968d2
Merge pull request #6686 from KDSBrowne/2.2-accessibility-update-02
Improve create breakoutroom modal accessibility
2019-02-06 11:52:43 -05:00
Vitor Mateus
b62f78e9a9 Change locale for zoom in and zoom out labels 2019-02-06 14:51:40 -02:00
Vitor Mateus
8a8c5a997b Add locale for reset zoom button 2019-02-06 14:42:12 -02:00
Vitor Mateus
100d9a4825 Refactor variable names 2019-02-06 14:05:24 -02:00
KDSBrowne
38a05de498 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-02-06 14:49:44 +00:00
Vitor Mateus
3948c8adb6 Implement reset zoom 2019-02-06 12:03:30 -02:00
Anton Georgiev
42ce30416b
Merge pull request #6634 from vitormateusalmeida/issue-5846
Implement enable/disable Animations
2019-02-05 09:49:36 -05:00
Anton Georgiev
4fa0b0fa2c
Merge pull request #6655 from vitormateusalmeida/issue-6550
Fix fit to width button border
2019-02-04 12:22:41 -05:00
Anton Georgiev
cd531f91ff
Merge pull request #6702 from MaximKhlobystov/html5-logs
Improve logging
2019-02-01 16:03:23 -05:00
Maxim Khlobystov
b86a990612 Add logCode and build number to log messages 2019-02-01 14:12:06 -05:00
KDSBrowne
afe66d560f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-01-30 14:40:55 +00:00
Vitor Mateus
e0ddffbf66 Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-30 10:01:29 -02:00
KDSBrowne
f602611e44 improve create breakoutroom modal accessibility / fix pre-existing lint errors 2019-01-30 02:15:01 +00:00
Anton Georgiev
38afdcf22b
Merge pull request #6640 from pedrobmarin/master-presentation-ui
New UI for presentation/video swap and fullscreen buttons
2019-01-28 12:33:47 -05:00
KDSBrowne
749a609565 fix minor accessibility issues 2019-01-28 13:33:50 +00:00
Vitor Mateus
610dc9d187 Fix fit to width button border 2019-01-28 10:58:34 -02:00
Vitor Mateus
c140acbd6b Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-28 10:14:46 -02:00
Pedro Beschorner Marin
9b882cbe56 Refactored fullscreen and presentation close buttons 2019-01-25 14:21:05 -02:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Anton Georgiev
0190ef4528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logout-endmeeting-menu 2019-01-17 18:53:32 +00:00
Anton Georgiev
ff3898224b
Merge branch 'master' into master-presentation-ui 2019-01-16 17:33:29 -05:00
Vitor Mateus
6a417f7fb3 Import correction 2019-01-16 16:27:48 -02:00
Vitor Mateus
70f16abec6 Limit the zoom functionality (double-tap) to occur only when the pan tool is selected #6520 2019-01-16 16:10:36 -02:00
Lucas Zawacki
bf99fff416 Fix a few more linter errors and remove old translation 2019-01-16 14:01:22 -03:00
Lucas Zawacki
69c89cb555 Fix some linter errors and add translation 2019-01-16 13:50:24 -03:00
Lucas Zawacki
e883d3a2b0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui 2019-01-15 10:31:12 -03:00
Lucas Zawacki
2c98ecb2b8 Aesthetic fixes to buttons 2019-01-15 10:16:01 -03:00
Lucas Zawacki
2a4abad6cc New presentation close button style as per Tyler's suggestions 2019-01-07 15:51:18 -03:00
Lucas Zawacki
bb4a83900c Fullscreen button for videos, presentation and screenshare 2019-01-07 15:15:37 -03:00
Anton Georgiev
e28d04827f
Merge pull request #6466 from vitormateusalmeida/fix-style-border-presentation-toolbar
Fix style border presentation toolbar
2019-01-07 10:50:50 -05:00
Anton Georgiev
66512f9e75
Merge pull request #6411 from zhu/fix-file-uploader-2
Fix file uploader mobile
2019-01-03 13:19:27 -05:00
Lucas Zawacki
6101ca5c13 Close presentation via a button in the top corner 2019-01-02 16:08:33 -03:00
Vitor Mateus
b0df61a3ba Fix border radius in buttons on presentation-toolbar 2018-12-21 15:18:11 -02:00
Vitor Mateus
b4c82553a0 Fix skip to slide handler 2018-12-21 14:03:55 -02:00
Anton Georgiev
84ec63fdee
Merge pull request #6446 from vitormateusalmeida/fix-some-css-bugs
Fix some bugs at BBB HTML5 client
2018-12-19 16:11:27 -05:00
Vitor Mateus
24661a1b99 Add opacity on uploaded presentation item 2018-12-19 16:29:51 -02:00
zhu
a0afca45b8 add dropzoneImagesLabel for images dropzone 2018-12-17 17:30:32 +08:00
zhu
01279fd804 separate pics or files upload in mobile device 2018-12-17 17:27:17 +08:00
zhu
b4d58fbd9c notify user when selected files is rejected 2018-12-17 17:23:00 +08:00
Anton Georgiev
d12c01fb14
Merge pull request #6377 from KDSBrowne/hide-toolbar-onSwap
Hide presentation controls in swapped state
2018-12-14 15:32:48 -05:00
KDSBrowne
f16366c305 hide toolbar when presentation is swapped 2018-12-11 16:28:37 +00:00
KDSBrowne
8b30fe00b3 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-10 02:12:42 +00:00
Anton Georgiev
69873070b6
Merge pull request #6322 from MaximKhlobystov/html5-tests-v3
Update for the automated tests
2018-12-07 16:46:38 -05:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
KDSBrowne
39c75fd449 fix remaining bugs / console errors 2018-12-05 19:31:33 +00:00
João Francisco Siebel
e1f3f259d6 fix messages for zoom controls 2018-12-05 09:40:35 -02:00
João Francisco Siebel
6a84618982 increase zoom increment factor to 25. close #6301 2018-12-05 09:00:12 -02:00
Maxim Khlobystov
835b07384a Fix the selectors in whiteboard tests 2018-11-30 12:59:14 -05:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
Anton Georgiev
c80e379de6
Merge pull request #6104 from Tainan404/zoom-implementation
Add fit-to-width  for html5
2018-10-25 14:31:29 -04:00
Oswaldo Acauan
41cfdaaf30 Fix colors and sizes 2018-10-25 10:46:31 -02:00
Tainan Felipe
ab064f47c9 fiz zoom when fit to width out 2018-10-24 16:50:49 -03:00
Anton Georgiev
ef9f248607
Merge branch 'master' into html5-theming 2018-10-24 14:58:59 -04:00
Tainan Felipe
69e1404ed1 Fix intl 2018-10-24 14:54:19 -03:00
Anton Georgiev
e888f5dc14 removed dummy button examples visible without presentation 2018-10-24 14:01:07 +00:00
Tainan Felipe
2b5c9a32b4 Add intl 2018-10-23 17:34:09 -03:00
Tainan Felipe
60e0446d89 Fix zoom keeps after fit to width 2018-10-23 16:58:13 -03:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
Tainan Felipe
cfd2e3f94b Add create breakout rooms modal 2018-09-28 11:42:07 -03:00
Tainan Felipe
9e496a0c93 Add fit to width feature 2018-09-25 09:47:49 -03:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Tainan Felipe
e501b9e5cc Implement pan zoom 2018-09-04 14:37:36 -03:00
Tainan Felipe
92ecd8d39d Fix misspelling 2018-08-29 17:24:44 -03:00
Tainan Felipe
ce6f1699f7 Add flash comment explaining mistery number 2018-08-29 17:20:42 -03:00
Tainan Felipe
742229e88f Fix lint errors 2018-08-28 16:30:37 -03:00
Tainan Felipe
70e29725ee Fix zoom display alignment 2018-08-28 14:14:02 -03:00
Tainan Felipe
9f6ed96b36 add zoom functions to component 2018-08-28 14:14:01 -03:00
Tainan Felipe
2815955236 state shared between presentation and overlay 2018-08-28 14:14:01 -03:00
Tainan Felipe
7c082c608a Add zoom tooll and styles 2018-08-28 14:14:01 -03:00
Tainan Felipe
257b4cc8ac port flash code to js and implement initial work in zoom 2018-08-28 14:14:01 -03:00
Tainan Felipe
25834dd4f8 zoom calc based in flash 2018-08-28 14:13:18 -03:00
Tainan Felipe
71bd889446 fix toolbars losing border radius when overlap the presentation 2018-08-14 10:30:46 -03:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods
Presentation pods support
2018-08-01 13:49:32 -04:00
Oswaldo Acauan
ce021e6776 Fix race condition 2018-07-27 10:18:45 -03:00
Oswaldo Acauan
0f94c334e0 Fix cursor while mwb is on 2018-07-26 16:35:38 -03:00
Oswaldo Acauan
adb34da217 Fixes for cursor 2018-07-26 16:05:55 -03:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
KDSBrowne
37c9599a70 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 01-bug-fixes 2018-07-23 15:37:28 +00:00
KDSBrowne
c502027427 use withModalMounter to prevent the modal re-opening 2018-07-22 17:45:14 +00:00
Bobak Oftadeh
0db93d35b9 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-20 09:42:11 -07:00
Maxim Khlobystov
3d0b41c166 Pre-select one of the presentations that are about to be uploaded. 2018-07-18 14:47:40 -04:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Oswaldo Acauan
c2f590e3fc Fix cursor and shapes listener not working in some areas. Closes #5768 2018-06-29 14:58:31 -03:00
Oswaldo Acauan
46a469eb2a Prevent scrolling while drawing on iOS. Related #5672 2018-06-26 11:01:05 -03:00
Anton Georgiev
3b5860b686
Merge pull request #5693 from Tainan404/issue-5560
Remove cursor when user leaves the meeting.
2018-06-14 16:11:16 -04:00
Tainan Felipe
a47fe7bdbc remove event listeners 2018-06-14 16:36:22 -03:00
Tainan Felipe
3973b5246d check if user is online when get current cursor 2018-06-14 15:10:42 -03:00
Tainan Felipe
351dfdc79b Add event listener to remove cursor when user reloads/leaves page 2018-06-14 13:48:14 -03:00
James Jung
495933f72e Change keyword to use index than word in locale 2018-06-13 15:35:07 -04:00
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
2018-05-28 14:46:14 -03:00
Oswaldo Acauan
c688eb23ca Move Polling to above slides/webcams and change swapLayout constraints. Closes #5359 2018-04-17 14:55:07 -03:00
Oswaldo Acauan
98eea06d72 Remove width transition from the presentation and unused ids 2018-04-17 10:24:49 -03:00
Oswaldo Acauan
6239f13e26 Fix presentationToolbar being hidden on firefox. Fix #5354 2018-04-17 10:13:37 -03:00
Oswaldo Acauan
86b2cb0040 Fix presentation and webcam not resizing correctly 2018-04-17 10:09:00 -03:00
Anton Georgiev
457eb28cd6
Merge pull request #5327 from oswaldoacauan/webcams-styling
Update on video designs and swap
2018-04-16 17:00:55 -04:00
Oswaldo Acauan
6176f59804 Remove unused onLoad prop from Slide 2018-04-16 12:37:11 -03:00
Oswaldo Acauan
9c2e8472cc Merge branch 'presentation-styles' into webcams-styling 2018-04-13 10:06:11 -03:00
Oswaldo Acauan
d8e8fb99f0 Revert back all presentation stuff since its a lost battle. BabyRage 2018-04-13 09:58:47 -03:00
Oswaldo Acauan
e5daacd41a Merge branch 'presentation-styles' into webcams-styling 2018-04-13 09:19:30 -03:00
Oswaldo Acauan
53343c0e92 Fix presentation failing to mount on start 2018-04-13 09:18:35 -03:00
Oswaldo Acauan
94e767a122 Fix wrong presentationWH after changing presentation 2018-04-12 17:36:16 -03:00
Oswaldo Acauan
dceae48d8c Fix the fit-to-width issue, added a throttle to the resize event and get the presentationWH from the viewBox 2018-04-12 15:45:23 -03:00
Oswaldo Acauan
0c5b278cef Remove fixed size from svg 2018-04-12 09:43:18 -03:00
Oleksandr Zhurbenko
0ae0d56348 Adjusted switchSlide to the new message format 2018-04-11 13:05:30 -07:00
Oswaldo Acauan
2a3e0f0137 Merge branch 'presentation-styles' into webcams-styling 2018-04-10 08:55:59 -03:00
Oleksandr Zhurbenko
a39700bc79 Corrected cursor messages, added whiteboardId 2018-04-09 23:08:23 -07:00
Oleksandr Zhurbenko
6c1e791adb Added a layer for the presentation pods component 2018-04-09 22:24:04 -07:00
Oleksandr Zhurbenko
04d6b06f50 Forgotten file 2018-04-09 16:19:23 -07:00
Oleksandr Zhurbenko
0c8f1a3bfd Adjusted multi-user for 2.1 2018-04-09 16:18:49 -07:00
Oswaldo Acauan
01348ad4f3 Move the presentation controls to ontop of slide 2018-04-09 17:49:05 -03:00
Oswaldo Acauan
5bf71eee98 Add swap functionality 2018-04-09 15:48:21 -03:00
Oswaldo Acauan
0510490dd5 Improve presentation/whiteboard controls and fix presentation area sizing 2018-04-04 15:18:46 -03:00
KDSBrowne
47697cf293 prevent slide control btn from changing shape 2018-03-14 08:51:48 -07:00
Augusto Bennemann
323cdd3232 Fix camera button style and improve videodock code 2018-02-07 17:20:10 -02:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700
Improvements on Presentation Management
2017-12-15 19:03:54 -02:00
Oswaldo Acauan
2eb2bbd8ab Fix case when there is no current selected 2017-12-15 16:49:47 -02:00
Oswaldo Acauan
df23e6bbb1 Remove auto-select current after deleting 2017-12-04 14:19:10 -02:00
Oswaldo Acauan
938c3c2c0d Add actual current pres indicator 2017-12-04 14:18:57 -02:00
Oswaldo Acauan
7f153b3ffd Fix files with defaultFile name not changing properly 2017-12-04 14:18:29 -02:00
Oleksandr Zhurbenko
68391cc782 Added touch events support for the cursor 2017-12-01 19:35:15 -08:00
Oswaldo Acauan
a5024f3b7b Add toast notification for meteor call errors 2017-11-28 10:29:11 -02:00
Oswaldo Acauan
807bd99f82 Fix stuck state on conversion failure 2017-11-28 10:26:00 -02:00
Oswaldo Acauan
e8de534964 Add error handling on presentation upload and covnersion 2017-11-27 15:44:45 -02:00
Oswaldo Acauan
861cf0f2ef Fix upload for files with same name 2017-11-22 12:47:27 -02:00
Tainan Felipe
881a8e153e change name of the variables for goToSlide 2017-11-17 13:54:23 -02:00
Tainan Felipe
221845349e change name of variables in the presentation-toolbar 2017-11-17 08:54:23 -02:00
Tainan Felipe
66c8807f6e change of formattedMessage for formatMessage 2017-11-14 08:41:51 -02:00
Tainan Felipe
7318370a7e Add localization for slides options 2017-11-09 13:45:24 -02:00
Anton Georgiev
8b80d7e9c2
Merge pull request #4621 from Tainan404/fix-upload-percentage
[HTML 5] Rounds upload percentage, localize messages in presentation uploader
2017-11-02 11:03:03 -02:00
Tainan Felipe
9db759074f moved intl messages to locales/en 2017-11-01 14:37:44 -02:00
Tainan Felipe
c1df1da3c4 rounds the file upload percentage 2017-11-01 10:19:18 -02:00
Oleksandr Zhurbenko
df3325e42f Fixed a bug introduced in #4524 2017-10-25 16:12:17 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
Oswaldo Acauan
4063ae548b Remove debug code 2017-09-29 14:47:16 -03:00
Oswaldo Acauan
f8421d4a62 Fix setPresentation on newly uploaded files 2017-09-29 14:44:18 -03:00
Oswaldo Acauan
43685f84d3 Fix intl propType and linter 2017-09-29 11:03:08 -03:00
Oswaldo Acauan
2a7fd5ba4d Rename share method to set to match akka 2017-09-29 10:01:01 -03:00
Oswaldo Acauan
979514f7f1 Fix dropzone not being shown after a file drop 2017-09-29 09:50:20 -03:00
Oswaldo Acauan
d4af5bb028 Remove constraint for not deleting the current presentation 2017-09-29 09:49:42 -03:00
Oswaldo Acauan
15b10b2374 Remove constraint for not deleting the current presentation 2017-09-29 09:43:49 -03:00
Oleksandr Zhurbenko
6e2beab03a Fixed a bug with the multi-user cursors not being displayed if there is no presenter cursor 2017-09-26 14:52:08 -07:00
Oswaldo Acauan
a3f74842b4 Bug fixes 2017-09-26 16:45:33 -03:00
Oleksandr Zhurbenko
f80d0bc083 Linting and moved whiteboard resize events into HoC
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
2017-09-25 16:45:44 -07:00
Oswaldo Acauan
3a4745d590 Fix error while changing the current presentation 2017-09-25 17:49:54 -03:00
Oleksandr Zhurbenko
8b48dc692e Bug fix for the slide pushing toolbar case in multi-user in firefox 2017-09-23 18:40:42 -07:00
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
43c2102adf Fix conversion status messages 2017-09-22 17:45:31 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07: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
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
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -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
2a91c6aa0b Fixed a bug initial cursor/shape coordinates on page zooming 2017-08-31 18:42:00 -07:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03: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
Oleksandr Zhurbenko
e1cf0ad9d5 Rewrite of the cursor component 2017-08-29 13:58:48 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1 Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation 2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
af558ff61d Fixed cursor's rendering including smoothing; adjusted cursor's label 2017-08-22 13:20:12 -07:00
Oleksandr Zhurbenko
6a04851469 Fixed all the eslint errors under components/presentation 2017-08-20 17:16:39 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Oleksandr Zhurbenko
9035386e76 Added multi-cursors 2017-08-14 17:15:11 -07:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
Oleksandr Zhurbenko
f90a1d446f Made whiteboard-toolbar display when multi-user mode is on 2017-08-08 13:55:38 -07:00
Oleksandr Zhurbenko
c61dcbce36 Fixed a cursor display/publish for both presenters and viewers
Plus linting warnings, no multi-user yet
2017-07-28 17:29:40 -07:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Oleksandr Zhurbenko
5aed767436 Moved SwitchSlide method to 2.0 2017-07-24 14:04:49 -07:00
Klaus
97b38fb0e6 Presentation reflects akkaApps 2017-07-24 15:46:53 -03:00
Klaus
78a6fee038 Slides reflecting akkaApps 2017-07-24 14:50:44 -03: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