Commit Graph

642 Commits

Author SHA1 Message Date
gcampes
272ce793f5 Change user object that goes into the components. feat. oswaldoacauan 2016-04-06 09:48:48 -03:00
gcampes
4896cc51e1 adds icon and tooltip react component 2016-04-06 09:48:47 -03:00
gcampes
85e5f341d8 Added dummy user-list react-components 2016-04-06 09:48:41 -03:00
gcampes
3b171164d3 Added comment 2016-04-06 09:48:39 -03:00
Oswaldo Acauan
6d4a0c32a5 Refactor 2016-04-06 09:48:39 -03:00
gcampes
a1823b1235 testing remote branching 2016-04-06 09:48:37 -03:00
gcampes
a948575a6e Started the user list as a react component 2016-04-06 09:48:37 -03:00
Anton Georgiev
a46d3656f9 Merge pull request #3037 from lfzawacki/correctly-unjoin-voice-for-offline-user
html5: Correctly kick user out of voice in markUserOffline
2016-03-07 15:50:48 -05:00
Anton Georgiev
e34b6ced79 fix emoji bug caused by Chrome vs FF behav difference 2016-03-07 20:40:32 +00:00
Lucas Zawacki
6b56521fbd html5: Correctly kick user out of voice in markUserOffline
The old code was wrongly setting obj.voiceUser when it should set obj.user.voiceUser
and caused problems when for example:

* user joins audio
* user hits F5
* user reconnects without webrtc audio enabled
* html5 client reports user still in audio and leaving/joining doesnt work anymore
2016-03-03 17:38:26 -03:00
Lucas Zawacki
85a0fda657 Correct Meteor.log for unsupported json messages 2016-03-02 15:44:25 -03:00
Lucas Zawacki
72591a6e9d Refactor icons to make it easier to extend and modify 2016-03-02 12:48:29 -03:00
Lucas Zawacki
92d5aaf5d0 Remove extra calls to updateVoiceUser in user mute/unmute
This is supossed to be called when handling messages from the redis queue
and when called here would cause errors because it had no callback function.

The correct way is not calling it here, but handling the muting/unmiting when
receiving messages (which is already done).
2016-03-02 12:44:34 -03:00
Oleksandr Zhurbenko
b19f22740b Changed WhiteboardPaper.cursor.cursor to cursorDOM
Resolves #2955
2016-02-01 12:55:53 -08:00
Oleksandr Zhurbenko
d0112ff7b7 Corrections 2016-02-01 10:38:15 -08:00
Oleksandr Zhurbenko
34ff1e19ba Reworked ES6 on the server side 2016-01-29 17:33:40 -08:00
Oleksandr Zhurbenko
1775053d39 Changes the default value for the presentation's title when it gets removed 2016-01-27 13:58:56 -08:00
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