BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,224 Commits 13 Branches 260 Tags 1.1 GiB
fe63234dbb
Commit Graph

226 Commits

Author SHA1 Message Date
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