Commit Graph

934 Commits

Author SHA1 Message Date
Mohamed Amine Ben Salah
f1e3d28127 fixes notifications automated test 2020-07-17 16:13:47 -03:00
KDSBrowne
df1486fabf Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-07-16 12:12:42 +00:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
6fba72f282
Merge pull request #10061 from KDSBrowne/issue-9986
Auto select default.pdf after deleting the current presentation
2020-07-14 10:36:44 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Anton Georgiev
e48306431a
Merge pull request #9498 from Tainan404/issue-8744
Replace unsafe react lifecycle methods
2020-07-14 10:30:37 -04:00
KDSBrowne
f063fedb9c auto select default.pdf if no actual current / new current active on delete 2020-07-14 13:49:00 +00:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Vitor Mateus De Almeida
cd289a47c3 Fix visual bug 2020-07-06 09:58:50 -03:00
Vitor Mateus De Almeida
8cf7dee86c Fix visual bug when change webcams placement 2020-07-02 10:28:36 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
296092739c Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-minimize-presentation 2020-06-30 20:54:59 +00:00
Lucas Zawacki
65892677ee Make file video player work on every browser 2020-06-30 17:41:44 -03:00
KDSBrowne
0cb1dc0a65 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-06-25 19:20:18 +00:00
Vitor Mateus De Almeida
2454440a8d Fix exceptions and layout size when panels change 2020-06-20 02:46:10 -03:00
Vitor Mateus De Almeida
c721e00bc3 Fix webcams area auto adjust when minimize presentation 2020-06-17 11:53:13 -03:00
Vitor Mateus De Almeida
e09e1be1cf Fix NaN exception 2020-06-16 20:00:44 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Vitor Mateus De Almeida
9ed57fd22d Fix Inconsistent resize behaviour 2020-06-16 12:20:24 -03:00
Vitor Mateus De Almeida
006f77caf9 Layout doesn't change when pass a slide 2020-06-16 10:16:38 -03:00
Vitor Mateus De Almeida
3b3a6a32f5 Fixes 2020-06-09 00:09:46 -03:00
Vitor Mateus
a1d4311cec wip 2020-06-04 20:01:17 -03:00
KDSBrowne
23e306b9e6 handle userData autoSwap and hidePresentation params 2020-06-01 13:29:43 +00:00
Anton Georgiev
f510fdc484
Merge pull request #9517 from KDSBrowne/2.2-restore-presentation-on-update
Restore minimized presentation for viewer on (slide or zoom change / pub…
2020-05-29 13:20:31 -04:00
KDSBrowne
be10e25eef make presentation area not visible when minimized 2020-05-25 20:18:58 +00:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
KDSBrowne
3f79eefb18 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-05-25 13:10:50 +00:00
KDSBrowne
4d8df0f91e restore presentation area when presentation changes 2020-05-14 21:06:55 +00:00
KDSBrowne
321d2cbd37 hide default content conponent if hidePresentation and autoSwapLayout 2020-05-12 14:42:34 +00:00
KDSBrowne
f5d004c322 restore minimized presentation for viewer (slide or zoom change / published poll / added annotation) 2020-05-12 12:58:14 +00:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
Vitor Mateus
8163eebe0d Fix presentation size 2020-05-07 18:27:00 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Vitor Mateus
ee846a6302 calculates layout optimization 2020-04-30 19:18:03 -03:00
KDSBrowne
9d9528798f Add client logger and error code messages 2020-04-29 16:34:37 +00:00
KDSBrowne
de7e2780c7 Fix exception in presentation when publishing poll while minimized 2020-04-27 17:25:22 +00:00
Tainan Felipe
fef2d8aa2f Replace the legacy react lifecycle in the cursor component 2020-04-27 11:34:41 -03:00
Vitor Mateus
00259ab371 WIP Resizable works fine 2020-04-23 11:07:44 -03:00
Tainan Felipe
83f7f92f2d Remove windows variable and change canFetch location 2020-04-13 14:43:35 -03:00
Ghazi Triki
535f2d665a Fix presentation download by using the presentation id not its name. 2020-04-12 18:09:33 +03:00
Fred Dixon
df40e6b214
Merge pull request #9019 from capilkey/2.3-simple-wb
Whiteboard performance improvements
2020-04-09 08:12:16 -04:00
Chad Pilkey
40b18b0662 whiteboard performance improvements 2020-04-08 20:03:56 +00:00
Tainan Felipe
b89a277973 Verify if needs to preload slide 2020-04-07 18:24:09 -03:00
Tainan Felipe
1bed0fee22 Add preloading for slides 2020-04-07 18:19:16 -03:00
KDSBrowne
f3b5b417f1 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-04-06 00:55:27 +00:00
Anton Georgiev
b47b5daa13
Merge pull request #8855 from KDSBrowne/issue-8800
Improve current presentation toast
2020-04-03 09:16:26 -04:00
KDSBrowne
0bd6687387 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-04-01 22:55:52 +00:00
KDSBrowne
20cd9f539f reduce re-renders of actionbar / show all uploads dropped separately in toast 2020-04-01 22:54:47 +00:00
KDSBrowne
a2d0d9ecd2 fix upload toast overflow on mobile landscape 2020-04-01 14:32:56 +00:00
Vitor Mateus
5b9aafd0d3 The presentation gets the size from the layout manager 2020-03-25 09:52:23 -03:00
KDSBrowne
4fbced8cd0 add ellipsis to long presentation name / no multiple presentation change toasts 2020-03-24 02:21:09 +00:00
Mohamed Amine Ben Salah
4b9b897b0c renames file drop zone data-test & page close function name 2020-03-19 14:26:01 -03:00
Mohamed Amine Ben Salah
475c441855 adds presentation upload notification 2020-03-19 14:01:55 -03:00
KDSBrowne
346cc869db close upload presentation toast when current presentation changes 2020-03-12 15:49:57 +00:00
KDSBrowne
9741f90965 fix console errors 2020-03-12 13:56:12 +00:00
KDSBrowne
57b2dfff69 open modal when selecting a failed or loading presentation / fix delete bug 2020-03-12 12:45:51 +00:00
KDSBrowne
cd03037b14 fix upload toast close btn position / remove gradient background on toast elements 2020-03-11 14:46:54 +00:00
KDSBrowne
fd1afe9b7f change session variable name / add comments 2020-03-10 15:19:14 +00:00
KDSBrowne
cc57f6fb6a fix console warning for state update 2020-03-10 14:25:27 +00:00
KDSBrowne
9217d1db7e open upload modal on presentation select in toast 2020-03-10 14:01:08 +00:00
KDSBrowne
ab176c3e24 replace map with filter / move intl out of container / rename session variable / fix alignment 2020-03-10 12:58:14 +00:00
Anton Georgiev
0958e422aa
Merge pull request #8485 from KDSBrowne/move-quick-poll
Move quick poll button to presentation tool bar
2020-03-09 18:05:32 -04:00
KDSBrowne
4965fcc2aa Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-03-09 21:14:13 +00:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
KDSBrowne
3881ce2410 fix quickpoll dropdown menu not displaying corretly on mobile 2020-03-04 18:46:45 +00:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
KDSBrowne
ad808fb970 add conversion error messages / remove unused message 2020-02-28 21:57:05 +00:00
KDSBrowne
62d50a6bad add picture dropzone / bug fixes 2020-02-25 19:29:14 +00:00
KDSBrowne
a2655d1027 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-02-13 16:27:32 +00:00
KDSBrowne
29c69b47a5 unblock modal on presentation upload 2020-02-13 16:24:01 +00:00
Anton Georgiev
a8f4827af8 utilize Meteor connection id instead of trusting client side meetingId, userId 2020-02-06 15:48:16 -05:00
KDSBrowne
b815272708 disable quick poll when active poll / make menu item use full width 2020-01-29 18:36:17 +00:00
Anton Georgiev
04ad738a7d
Merge pull request #8564 from MaximKhlobystov/puppeteer-tests-fixes
Fixes for Puppeteer tests
2020-01-28 14:41:40 -05:00
Maxim Khlobystov
7518b4cd99 Make the Puppeteer tests work with master branch 2020-01-28 14:25:27 -05:00
KDSBrowne
41e8e882e0 allow presentation toggle from actions btn 2020-01-25 01:02:36 +00:00
Anton Georgiev
e847c4eab8
Merge pull request #8426 from KDSBrowne/issue-8341
Fix exception when publishing poll while presentation swapped (chrome)
2020-01-21 09:47:09 -05:00
Vitor Mateus
1f27b9760e Merge remote-tracking branch 'upstream/master' into issue-8504 2020-01-17 10:25:44 -03:00
Vitor Mateus
1ae6324392 Detect aspect ratio to autochange webcams placement #8504 2020-01-17 10:20:03 -03:00
KDSBrowne
d417050555 fix button outline displaying when no poll detected 2020-01-14 02:29:31 +00:00
KDSBrowne
5c6f94b4e9 remove dropdown menu for single quick poll 2020-01-10 20:18:43 +00:00
KDSBrowne
c30e58ea27 move quick poll from actions bar to presentation toolbar 2020-01-10 19:00:06 +00:00
KDSBrowne
75a3f6ed7d add prop to enable / disable download option (Upload presentation dialog) 2019-12-24 14:48:44 +00:00
KDSBrowne
dcf1462482 fix error for invalid viewBox values 2019-12-18 21:35:03 +00:00
KDSBrowne
7c253dda0f fix tooltips after tippy.js update 5.1.1 2019-12-03 18:49:09 +00:00
Anton Georgiev
c7c29e37e9
Merge pull request #8368 from felcaetano/enable-change-slides-with-page-up-down
Swapping PAGE_UP and PAGE_DOWN key bindings
2019-11-26 17:13:34 -05:00
felcaetano
e13cf362b2
Swapping PAGE_UP and PAGE_DOWN key bindings
Swapping the keys as requested by @kaitkrull  to fit most of the remotes.
2019-11-26 19:00:28 -03:00
Anton Georgiev
f8ba84637e
Merge pull request #8128 from felcaetano/enable-change-slides-with-page-up-down
Added event listener to change slides with Page Up and Page Down
2019-11-14 13:25:19 -05:00
Richard Alam
4c6bdebd00
Merge pull request #8225 from riadvice/big-pdf-conversion
Detect big PDF files and check the page size
2019-10-29 16:47:26 -04:00
KDSBrowne
655af26b32 replace negative lookahead (not supported by firefox) 2019-10-27 14:18:16 +00:00
KDSBrowne
84d109fe2e improve yes / no and true / false detection 2019-10-26 13:38:04 +00:00
KDSBrowne
7339686b69 fix quickpoll showing invalid option 2019-10-26 13:37:24 +00:00
Ghazi Triki
ba109530ae Disallow converting PDF files that have at least one big weighted page. 2019-10-16 08:37:03 +01:00
Chad Pilkey
62872c50e8
Merge pull request #8054 from jfsiebel/multiple-upload-problem
Fix multiple clicks on upload button
2019-09-30 17:26:15 -04:00
felcaetano
83c1cba273 Added a switch statment to keep the code cleaner as suggested by @capilkey 2019-09-18 20:29:09 -03:00
felcaetano
de22a644d6 Added event listener to change slides with Page Up and Page Down
This used to be a feature in the Flash client and this is necessary for presentation remotes to work with the HTML client.
2019-09-18 14:12:05 -03:00
KDSBrowne
e9b28b8848 add space between current presentation / presentation file name (rtl) 2019-09-06 15:35:47 +00:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Joao Siebel
5a4ae178ec Fix multiple clicks on upload button
close #8016
2019-08-30 09:48:59 -03:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
Chad Pilkey
442c9dfa58 show presentation and wb controls after auto swap back 2019-08-13 10:41:47 -07:00
Chad Pilkey
dc99353219 add max and min zoom for mobile 2019-08-12 21:54:02 +00:00
Chad Pilkey
2b94d06133 protect against no slide position 2019-08-01 10:50:39 -07:00
Anton Georgiev
311ad5706f
Merge pull request #7750 from diegobenetti/issue6956-turn-webcams-fullscreen-when-no-presentation
Turn webcams fullscreen when no presentation is selected
2019-08-01 13:34:35 -04:00
Chad Pilkey
e1dadf689b remove pointless destructures 2019-07-31 12:23:05 -07:00
Chad Pilkey
3781a94a23 move slide position data into its own collection 2019-07-31 12:22:32 -07:00
Vitor Mateus
ea7f4cff58 Remove events when unmount 2019-07-30 12:03:29 -03:00
Vitor Mateus
3c0898b7aa Merge remote-tracking branch 'upstream/master' into issue-7022-2 2019-07-29 17:10:34 -03:00
Vitor Mateus
1d44ee5794 Fix fullscreen multiwebcams 2019-07-26 16:24:53 -03:00
Vitor Mateus
e8f15b97b6 Fix fullscreen edge cases 2019-07-26 13:48:51 -03:00
Chad Pilkey
e69931a0af Merge remote-tracking branch 'upstream/master' into fix-pan-lag 2019-07-25 16:29:52 -07:00
Chad Pilkey
c344a17adb pan/zoom and cursor refactor for better performance 2019-07-25 15:55:25 -07:00
Vitor Mateus
db1825a15c Code cleanups 2019-07-23 19:24:31 -03:00
Vitor Mateus
120764ee33 Adjustments to fullscreen toggle #7022 #7067 2019-07-23 16:56:39 -03:00
Vitor Mateus
429bce991e Path to fullscreen-button changed 2019-07-22 13:59:34 -03:00
Tainan Felipe
3b71f7fd86 fix typo 2019-07-18 15:45:11 -03:00
Tainan Felipe
4281b696a4 Add token to log and ids to select 2019-07-18 15:42:35 -03:00
Tainan Felipe
ebd950e8ff Fix same name files failing in upload 2019-07-11 14:46:44 -03:00
Diego Benetti
cc6d4ecd41
Merge branch 'master' into issue6956-turn-webcams-fullscreen-when-no-presentation 2019-07-08 14:01:32 -03:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Diego Benetti
ee1ef66af7 Removes feature to disable the upload presentation confirm button 2019-07-03 15:58:58 -03:00
Anton Georgiev
3fcb95ab44 log structure {logCode, extraInfo}, comment 2019-06-28 21:45:50 +00:00
Joao Siebel
8f0783d34f update variable name 2019-06-26 13:29:34 -03:00
KDSBrowne
57ae29ea13 fix user name not displaying on cursors in rtl 2019-06-25 15:04:45 +00:00
Chad Pilkey
94b1e35a00 fix exception in pres upload 2019-06-23 14:50:15 -07:00
Joao Siebel
8e64792b66 add hint for chat when disconnected 2019-06-17 17:49:59 -03:00
Joao Siebel
c6c8ca400b Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-06-12 15:56:14 -03:00
Joao Siebel
7f7845c47b disable some UI actions when meteor is down 2019-06-12 15:40:58 -03:00
KDSBrowne
27bdf23586 add formatted numbers to zoom tools 2019-06-06 15:52:05 +00:00
KDSBrowne
eb142c7c0d fix accessibility issues as presenter 2019-06-06 15:04:02 +00:00
Anton Georgiev
06cd9e65d0
Merge pull request #7531 from KDSBrowne/0A-access-32
Improve the upload presentation modal experience
2019-05-31 16:26:05 -04:00
KDSBrowne
a0fa2d44a2 use file extension instead of mime type for accepted files 2019-05-30 17:46:05 +00:00
KDSBrowne
b74e0600b5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-fix-dropzone-style 2019-05-29 19:34:28 +00:00
KDSBrowne
7f703a5893 switch present label to confirm 2019-05-29 19:21:18 +00:00
KDSBrowne
5cc67ec62d add text to upload modal message / improve confirm btn 2019-05-28 21:18:49 +00:00
KDSBrowne
af9faa2979 switch upload modal confirm btn label when presentations need uploading 2019-05-24 19:51:50 +00:00
Anton Georgiev
2d991cb078
Merge pull request #7286 from KDSBrowne/2.2-issue-7279
Fix refPresentationContainer requestFullscreen is not a function
2019-05-22 14:52:18 -04:00
Ghazi Triki
76371b9b6e Merge remote-tracking branch 'bigbluebutton/master' into html5-rtl 2019-05-16 17:32:58 +01:00
KDSBrowne
027ee7161b fix console error 2019-05-14 19:45:12 +00:00
KDSBrowne
8d0485b306 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into _summit-add-tr-to-upload-table 2019-05-14 19:33:54 +00:00
KDSBrowne
f0a5666c52 add formatted messages 2019-05-14 16:51:13 +00:00
Ghazi Triki
1f6326f7fd Change layout direction for RTL languages.
Update styles for RTL layout.
2019-05-14 14:17:19 +01:00
KDSBrowne
cf01beb875 add th elements to table in presentation uploader 2019-05-09 18:30:16 +00:00
KDSBrowne
f2e2948df3 add formatted message to notification 2019-05-09 17:57:06 +00:00
KDSBrowne
2b9d0cccee add notification when presentation changes 2019-05-09 17:44:54 +00:00
KDSBrowne
4f0ca9b67b add filename to buttons in presentation uploader 2019-05-08 21:47:00 +00:00
KDSBrowne
f69e44b2a8 make delete presentation btn announce presentation to be removed 2019-05-08 12:42:05 +00:00
Anton Georgiev
0803f814c1
Merge pull request #7159 from diegobenetti/issue6613-cursor-not-showing-multi-user-whiteboard
Cursor not showing multi user whiteboard
2019-05-07 11:34:51 -04:00
KDSBrowne
f18f4dbdf3 fix fullscreenRef prop error 2019-05-02 17:35:13 +00:00
KDSBrowne
5105a3bc09 make all fullscreen buttons use the same toggle function 2019-04-24 14:20:53 +00:00
KDSBrowne
f6d53d0c1b fix requestFullscreen is not a function error 2019-04-23 13:34:40 +00:00
KDSBrowne
0e724fb890 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-High-contrast-outline 2019-04-18 14:29:17 +00:00
Anton Georgiev
093a8a1ecc
Merge pull request #7244 from KDSBrowne/2.2-fix-animations-iOS-12.3
Update animations to also work with iOS 12.3 beta
2019-04-16 11:12:20 -04:00
KDSBrowne
8c1d9b6c50 fix presentation toolbar tooltip positions 2019-04-13 21:22:47 +00:00
KDSBrowne
5e573bf58d add arrow key shortcuts to switch presentation slides 2019-04-13 03:48:21 +00:00
KDSBrowne
83127bcdae fix animations not working on iOS 12.3 beta 2019-04-11 15:04:10 +00:00
KDSBrowne
ce98eeee77 fix remaining outline issues 2019-04-10 14:59:25 +00:00
Anton Georgiev
3775d1ebc2
Merge pull request #7199 from diegobenetti/issue7060-change-close-to-hide-presentation
Change close presentation to hide presentation
2019-04-08 15:52:02 -04:00
Diego Benetti
9fcc4b7228 Changes close presentation to hide presentation 2019-04-08 15:48:45 -03:00
KDSBrowne
38ba8f8895 add outlines for high contrast themes (windows) 2019-04-08 14:22:22 +00:00
Anton Georgiev
1b2ee2e09e
Merge pull request #7103 from Tainan404/issue-7071
Fix modal closing when get conversion error
2019-04-05 15:16:55 -04:00
KDSBrowne
88785d9f00 prevent upload dropzone displaying red for valid file types 2019-04-05 03:35:55 +00:00
Diego Benetti
51bff92d74 Fixes cursor coordinates issues 2019-04-04 18:15:52 -03:00
Diego Benetti
4909c6a46a Removed if statement which had no use now 2019-04-03 16:47:31 -03:00
Diego Benetti
8172d8215e Fix to show presenter's name correctly alongside the cursor when multiuser whiteboard is active 2019-04-03 14:45:53 -03:00
Chad Pilkey
7f33179732
Merge pull request #7120 from Tainan404/issue-6998
Fix client crashing when prensentation isn't converted
2019-04-02 13:51:37 -04:00
Tainan Felipe
c644ab6d1a Remove null exceppetion 2019-04-02 14:10:00 -03:00
Chad Pilkey
47119414cf
Merge pull request #7069 from jfsiebel/sort-presentation-list
Sort presentation list
2019-04-01 15:50:20 -04:00
Tainan Felipe
d8409dbada Change fix to a componentDidUpdate function 2019-03-29 11:48:22 -03:00
Tainan Felipe
a3609debc4 Fix misspelling 2019-03-28 08:51:38 -03:00
Tainan Felipe
8bf431441e Fix client crashing when prensentations isn't converted 2019-03-27 17:48:20 -03:00
Tainan Felipe
b4bbfbb7c6 Fix modal closing when get some conversion error 2019-03-25 13:20:18 -03:00
Pedro Beschorner Marin
a8d38fd156 Pulling presentation-close-button upfront 2019-03-20 09:57:54 -03:00
Pedro Beschorner Marin
b0c3480fb1 Trying to fix fit-to-width 2019-03-19 16:50:08 -03:00
Joao Siebel
b4e03af60c prevent some unnecessary re-render when processing pages 2019-03-19 09:58:21 -03:00
Joao Siebel
99ae611090 order presentation by upload timestamp. close #6840 2019-03-18 15:13:15 -03:00
Anton Georgiev
af4edb7cbc
Merge pull request #6884 from eduardohfnascimento/fix-upload-types
Change as mime types are coded
2019-03-14 12:57:31 -04:00
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
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
5664bf2655 Add missing package and fix bug 2017-06-07 12:52:45 +00:00
Oswaldo Acauan
2b3859d906 Fix linter errors and add missing package 2017-06-07 12:28:41 +00:00
Oswaldo Acauan
ccb6fd2a53 Fix merge conflicts 2017-06-07 12:01:18 +00: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
Oswaldo Acauan
9217ef7183 Fix bug when changing the current presentation 2017-05-23 14:05:42 +00: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
Oswaldo Acauan
b6bb795fa3 Add presenter upload capabilities 2017-05-05 17:17:38 -03: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
Oswaldo Acauan
1dc3bccb0d Add presenter upload capabilities 2017-05-03 17:51:17 -03:00
Oswaldo Acauan
ff5d3d1211 Merge remote-tracking branch 'upstream/master' into presentation-uploader
* upstream/master: (83 commits)
  resolve issues with modal on breakouts
  Update generate_css_dpi.sh comments.
  Added multi-resolution generated css files for the mobile client.
  Added a shell script to generate multi-dpi css files for the mobile client.
  Fix origin on pencil cursor
  Fix a missing bracket in mobile demo
  Delete services directory.
  New cursors for flash client
  update mobile demo to support https
  Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml
  Delete services/bbb-web-api project.
  Delete bbb-web-api project.
  Renamed clours for mobile application styles.
  Handle audio on refactored modal (#2)
  Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration.
  fix lint issues
  Fix the audio-modal
  fix tabIndex for the settings closed caption submenu
  remove extra list separator
  fix console errors for missing key and invalid prop
  ...
2017-05-03 13:36:54 -03:00
Oswaldo Acauan
71fc15a803 Add presenter upload capabilities 2017-05-03 13:36:16 -03: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
Oleksandr Zhurbenko
b4f904d3ea Adjusted cursor functionality to the new structure 2017-02-23 16:11:27 -08:00
Oleksandr Zhurbenko
56989c54ac Added Cursor functionality 2017-02-23 15:27:48 -08:00
Oleksandr Zhurbenko
fe01f81e27 changed slide-controls to presentation-toolbar
.. and removed duplicate strings from the locales
2017-02-23 12:20:21 -08:00
Oleksandr Zhurbenko
48c3c5252e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-restructuring 2017-02-23 10:26:03 -08:00
Oleksandr Zhurbenko
119beae88b Restructured whiteboard code 2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
09090eda13 Removed an unnecessary import from the cursor service 2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac Restructured the whiteboard code 2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
10c8b86a0d Renamed whiteboard to presentation 2017-02-23 10:14:35 -08:00