Commit Graph

623 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
cc7f8b4fac Updating the new slide's ratios and offsets right away 2016-01-22 22:51:41 -08:00
Oleksandr Zhurbenko
0f7f3ed7b8 Added check to see if the properties have been already updated by displayThisSlide() after receiving a presentation_page_changed message. 2016-01-22 15:53:24 -08:00
Oleksandr Zhurbenko
6eb3fbe50d Removed old unused console logs from the code. 2016-01-22 11:14:57 -08:00
Oleksandr Zhurbenko
8fdb83d01a Assigning widthRatio to default value when the currentSlideDoc is not loaded yet. Removing errors from the console. 2016-01-22 11:07:14 -08:00
Oleksandr Zhurbenko
f287f5f4cb Simply updating data in the Slides collection instead of removing and adding whole objects 2016-01-21 10:29:18 -08:00
Oleksandr Zhurbenko
8d18271579 Enabling whiteboard helpers 2016-01-20 16:41:05 -08:00
Oleksandr Zhurbenko
5c9b42fb0f Removed the duplicated call of the displayThisSlide() 2016-01-19 15:04:00 -08:00
Oleksandr Zhurbenko
edfaf08757 Typo left after switching to ES6 2016-01-18 11:49:53 -08:00
Oleksandr Zhurbenko
7c56af1f16 Removed callingLocation from BBB.getCurrentSlide 2016-01-18 11:48:36 -08:00
Maxim Khlobystov
ec8c1f83ab Fixed a small typo. 2016-01-15 11:41:16 -05:00
Maxim Khlobystov
cc6ffe15df Got all the single-line comments back. 2016-01-15 00:46:41 -05:00
Maxim Khlobystov
a844cb9356 Started using ES2015 inheritance for the whiteboard models instead of the auxiliary function created by the transpiler. 2016-01-13 18:30:58 -05:00
Maxim Khlobystov
e74ebe25fb Removed unnecessary CoffeeScript dependancy. 2016-01-12 15:24:12 -05:00
Maxim Khlobystov
52220a42cb Moved to ES2015. 2016-01-12 15:15:16 -05:00
Oleksandr Zhurbenko
da7242737b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements
Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
2015-12-13 20:20:10 -08:00
Oleksandr Zhurbenko
b051765713 Fixed position of Raise Hand button in tablet/cellphone portrait views 2015-12-13 20:07:14 -08:00
Gabriel Campes
791290e8b9 Add set presenter to HTML5 2015-12-07 13:33:52 -02:00
Gabriel Campes
be9e582a1d Add kick user to HTML5 2015-12-04 14:38:19 -02:00
Anton Georgiev
ed8b38478c Merge pull request #2923 from antobinary/pr-test
html5client:clear slide when presenter removes current presentation
2015-12-03 18:17:01 -05:00
Anton Georgiev
f5adeb34d8 reuse existing functionality 2015-12-03 23:15:29 +00:00
Anton Georgiev
f1d547bf42 clear slide when presenter removes current presentation 2015-12-03 23:04:17 +00:00
Anton Georgiev
0fa709441d Merge pull request #2922 from antobinary/pr-test
html5client: reworked viewing slide change; moved the cursor out of Presentation collection
2015-12-03 15:24:21 -05:00
Anton Georgiev
007911ad85 remove extra callback 2015-12-03 20:23:20 +00:00
Anton Georgiev
1e4477d1c2 moved the cursor into its own collection 2015-12-03 20:01:27 +00:00
Anton Georgiev
59f1ff2394 force display of slide even if .rendered does not trigger. Will need to decouple pointer coord from Presentation 2015-12-03 17:03:04 +00:00
Oleksandr Zhurbenko
3581e8abeb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
2015-12-02 17:09:51 -08:00
Oleksandr Zhurbenko
bd6db1afb6 Corrected styling for whiteboard controls and an upload container 2015-11-30 17:46:38 -08:00
Oleksandr Zhurbenko
ff33347114 Took the whiteboard controls out of the whiteboard container, removed check for the opened upload window 2015-11-29 11:45:08 -08:00
Maxim Khlobystov
04528eeafe Made the horizontal border between chat and presentation areas one pixel wide on mobile. 2015-11-28 21:44:41 -08:00
Maxim Khlobystov
7cd8702d98 Removed border radius on both chat and presentation areas for mobile devices. 2015-11-28 21:36:54 -08:00
Maxim Khlobystov
ad0a23c02e Changed the mobile navbar icons (thus reducing the number of animations) and redesigned the Settings menu. 2015-11-28 21:18:58 -08:00
Maxim Khlobystov
f7eb9b2a06 Included the navbar under the dark overlay when offset menu is open in portrait, removed some redundant code. 2015-11-28 18:49:53 -08:00
Oleksandr Zhurbenko
cb33ef7586 presentationProgress() didn't work and didn't display slide numbers for a presenter 2015-11-27 16:54:26 -08:00
Oleksandr Zhurbenko
ab7affc1f2 Got rid of exceptions in the console 2015-11-27 13:40:33 -08:00
Oleksandr Zhurbenko
d7287a9309 Unnecessary important 2015-11-27 12:20:03 -08:00
Anton Georgiev
0aa7038ae1 fix bug-shapes were flushed no matter which meeting ends 2015-11-27 16:40:31 +00:00
Oleksandr Zhurbenko
c14995a14b Unused and duplicated code 2015-11-26 17:04:54 -08:00
Oleksandr Zhurbenko
cc92e186ca Corrected the centering for raise hand button in case when there is no current presentation 2015-11-26 17:03:06 -08:00
Oleksandr Zhurbenko
38eaf0252d Removed vertical scrolling in the desktop view 2015-11-26 15:38:04 -08:00
Anton Georgiev
1b0dca557d remove (presenter) in useritem 2015-11-24 19:40:45 +00:00
Anton Georgiev
b2fd1c32a7 try to re-join instead of alerting error; reset listenOnly defaults 2015-11-24 19:09:00 +00:00
Anton Georgiev
c59b3ed82c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-23 22:02:19 +00:00
Anton Georgiev
3e3f7c6c8e fix lost annotation on presentation change 2015-11-23 22:01:44 +00:00
Anton Georgiev
1d5055e3c6 Merge pull request #2910 from gthacoder/meteor-client
HTML5 client: Grunt configuration update + UI bug fixes and adjustments.
2015-11-23 13:20:09 -05:00
Maxim Khlobystov
3ab831cb5a Fixed the internal padding of the currently active emoji button. 2015-11-22 16:03:11 -08:00
Maxim Khlobystov
3ca40ee29e Added some internal padding to the mobile userlist menu and removed its border radius. 2015-11-22 15:52:00 -08:00
Maxim Khlobystov
fda4f77fdc Updated the color scheme for the mobile userlist to match the desktop experience. 2015-11-22 15:42:02 -08:00
Maxim Khlobystov
4cc3c1ab65 Got the invisible navbar title back on mobile. 2015-11-22 14:02:25 -08:00
Maxim Khlobystov
421dd23b31 Got the missing right hamburger button back on mobile. 2015-11-22 13:56:14 -08:00
Maxim Khlobystov
e4df76f98f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client 2015-11-21 20:29:46 -08:00