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

1120 Commits

Author SHA1 Message Date
perroned
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00
perroned
109a8da350 Fixes whitespace 2016-05-16 09:14:28 -05:00
perroned
d9dbb51023 Moves to api/collection/index 2016-05-16 09:14:02 -05:00
Oleksandr Zhurbenko
ecfb86d474 Merged getSlideDimensions' with addSlideToCollection 2016-05-13 16:10:48 -07:00
perroned
642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-13 14:54:19 -05:00
Oleksandr Zhurbenko
5d6f9a83ec Fixed 'Can't wait without a fiber' error 2016-05-13 12:41:22 -07:00
Oleksandr Zhurbenko
0bfc8ceede Retrieving slide dimensions on the server side 2016-05-13 11:01:29 -07:00
perroned
6adaff0c44 Cleans lint 2016-05-13 11:31:06 -05:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
Anton Georgiev
57352f193c rework users publish 2016-05-13 16:11:44 +00:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00
Anton Georgiev
8a6fc308da avoid race cond when subscribing for data 2016-05-13 14:34:29 +00:00
perroned
d966aee2d7 Fixing paths for structure 2016-05-12 14:50:02 -05:00
perroned
3e0c3d1ee1 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 14:30:46 -05:00
Anton Georgiev
ecd3b3de17 log in user properly 2016-05-12 19:22:51 +00:00
perroned
3b8c9c2971 Changing structure to /api/list/index.js 2016-05-12 14:04:00 -05:00
perroned
dc3dd43f1a Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/polls/polls.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 13:58:06 -05:00
Anton Georgiev
783f150442 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/startup/client/routes.js
 2016-05-12 18:08:44 +00:00
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
perroned
3971bdb548 Lints 2016-05-12 11:10:43 -05:00
perroned
dff3dd2436 Moves serverCall to imports service api 2016-05-12 11:10:20 -05:00
perroned
f1f24acda8 Adds some services 2016-05-12 10:43:09 -05:00
perroned
666c96dab9 Adds server call wrapper to service 2016-05-12 10:41:51 -05:00
perroned
38d2bff789 Loads sip li. Adds audio tag 2016-05-11 15:43:07 -05:00
Anton Georgiev
1c50be53a3 fix fonts path 2016-05-11 18:30:24 +00:00
Anton Georgiev
699fde7344 accommodate for poll and deskshare 2016-05-10 20:25:24 +00:00
Anton Georgiev
298927cf4f Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/collections/collections.js
	bigbluebutton-html5/imports/api/meetings/server/meetings.js
	bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/startup/server/helpers.js
	bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
	bigbluebutton-html5/imports/startup/server/publish.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
	bigbluebutton-html5/server/server.js
 2016-05-10 19:39:01 +00:00
Anton Georgiev
45342b8a04 restructure; subscribe for remaining collections 2016-05-10 18:53:05 +00:00
perroned
84acf39fd3 Begins adding phone service 2016-05-10 10:54:55 -05:00
perroned
57add2fa50 rename poll -> polls.js 2016-05-10 10:34:13 -05:00
perroned
587627562c Fixes some api structure 2016-05-10 10:23:22 -05:00
Oleksandr Zhurbenko
1b47318edd Added reactive data source for the slide and shapes 2016-05-09 16:54:53 -07:00
Oleksandr Zhurbenko
84944ebffe Created Initial Draw Components 2016-05-09 15:06:03 -07:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00:00
Anton Georgiev
dcce6d3122 set baseUrl to html5client/ 2016-05-09 19:19:52 +00:00
perroned
67115c0169 Begins adding deskshare functionality 2016-05-06 15:15:47 -05:00
Anton Georgiev
76d599eb32 join route handled via localStorage 2016-05-06 19:12:28 +00:00
perroned
4a7938e1c0 Adds settings and styling 2016-05-06 12:46:14 -05:00
Anton Georgiev
b95c380b56 working on join route 2016-05-06 15:34:00 +00:00
Maxim Khlobystov
67bb61c975 Code style cleanup. 2016-05-05 18:30:57 -04:00
Maxim Khlobystov
d06b9f8b7d Forced the linter tasks to finish despite warnings. 2016-05-05 18:27:27 -04:00
Maxim Khlobystov
1f8df1a3fb Added standalone commands to run JSCS with and without autofixing. 2016-05-05 18:17:34 -04:00
Maxim Khlobystov
726015d172 Made sure JSCS only reruns on modified files. 2016-05-05 18:09:13 -04:00
perroned
1f3fcf611f Fixes button import path 2016-05-05 16:15:32 -05:00
perroned
3769c67534 Adds font control for settings 2016-05-05 16:15:15 -05:00
perroned
d602a66d7f Begins adding modals 2016-05-05 16:14:39 -05:00
perroned
f8893d61da Cleans polling 2016-05-05 14:50:11 -05:00
perroned
e9b5e11ac2 Begins adding polling component 2016-05-05 13:50:18 -05:00
Anton Georgiev
eddef1e1b6 incorrectly merged these 2016-05-04 22:19:41 +00:00
Anton Georgiev
0deaadfd87 Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/client/MainContainer.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/lib/bbb_api_bridge.js
	bigbluebutton-html5/client/whiteboard_models/whiteboard_paper.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
	bigbluebutton-html5/imports/ui/userlist/UserListService.js
	bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
	bigbluebutton-html5/imports/ui/whiteboard/Slide.jsx
	bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
	bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
 2016-05-04 22:04:08 +00:00
Anton Georgiev
fcadb61545 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
 2016-05-04 21:58:35 +00:00
Anton Georgiev
fe8f73d592 linting 2016-05-04 21:49:01 +00:00
Anton Georgiev
0c6c73f891 extract event handlers from redispubsub. rename to camelCase 2016-05-04 20:25:34 +00:00
Anton Georgiev
7b0b3eb177 move files to imports 2016-05-04 18:29:43 +00:00
Anton Georgiev
863fcef7f6 extract logger, redispubsub; export all 2016-05-04 17:00:57 +00:00
Oswaldo Acauan
2d57d7cbed Rename Actionsbar and Navbar to ActionsBar and NavBar 2016-05-04 11:48:53 -03:00
perroned
0abc1fde91 Fixes whitespace issue 2016-05-03 15:02:59 -05:00
gcampes
86d97b59da Fixes infinited tabbed line in html5 chat input controls 2016-05-03 16:06:59 -03:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
Oswaldo Acauan
a22c759fcc Merge with upstream/master 2016-05-02 19:52:32 -03:00
Oswaldo Acauan
01860a8804 Add basic styles for new design 2016-05-02 19:42:54 -03:00
Anton Georgiev
573c1772b3 server side rearrangements 2016-05-02 14:48:20 +00:00
Maxim Khlobystov
88542275d8 Cleanup. 2016-04-28 18:42:04 -04:00
Maxim Khlobystov
1695f58fe6 Split the Meteor command into options stored as Meteor settings. 2016-04-28 18:27:43 -04:00
Anton Georgiev
1c8436170e move the redis configs outside the Meteor obj 2016-04-28 22:01:43 +00:00
Maxim Khlobystov
886928ca4d Got rid of the Karma error in the console (removed Velocity). 2016-04-28 17:44:09 -04:00
Anton Georgiev
0b10a861bb move log out of Meteor 2016-04-28 21:37:15 +00:00
Anton Georgiev
e299281a0a move collections out of Meteor 2016-04-28 21:10:43 +00:00
Oswaldo Acauan
7d31eb43f9 Switch from ion-router to react-router 2016-04-28 15:57:14 -04:00
Anton Georgiev
fc52155db0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router 
Conflicts:
	bigbluebutton-html5/server/redispubsub.js
 2016-04-28 18:49:41 +00:00
Maxim Khlobystov
7504f51543 Cleaning up. 2016-04-28 14:03:18 -04:00
Maxim Khlobystov
4efdc5d361 Fixed the userlist styling. 2016-04-28 13:58:54 -04:00
Maxim Khlobystov
fad6330d39 Fixed the global Sass file and got back some of the missing userlist styles. 2016-04-28 11:44:24 -04:00
Oleksandr Zhurbenko
db667ae58d Linter fixes 2016-04-27 16:38:57 -07:00
Anton Georgiev
892083aa00 working on modules/removing global vars part2 2016-04-27 21:36:22 +00:00
Anton Georgiev
796b5a2d18 working on modules/removing global vars 2016-04-27 21:04:15 +00:00
Maxim Khlobystov
ae26f850bc Translated the main stylesheet to Sass. 2016-04-27 16:33:34 -04:00
Maxim Khlobystov
2831e3d414 Added CSS modules support and adjusted the userlist to work with encapsulated Sass. 2016-04-27 14:30:45 -04:00
Anton Georgiev
3756db1575 do next() if the eventName not among handled 2016-04-26 23:39:54 +00:00
Anton Georgiev
149c6176eb fix unhandled redis messages 2016-04-26 18:07:24 +00:00
Maxim Khlobystov
ee1ea22cd7 Added the ability to dynamically enable/disable the log statements that slow down the whiteboard based on the mode (development/production). 2016-04-26 11:03:09 -04:00
Maxim Khlobystov
4d94efa89c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into react-client 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
 2016-04-25 09:40:37 -04:00
Maxim Khlobystov
f36b0512ad Added options of running HTML5 client in development/production modes. 2016-04-25 08:56:49 -04:00
Anton Georgiev
fe5ff34792 Merge branch 'html5-server-changes' of github.com:antobinary/bigbluebutton into meteor-react-alex 
Conflicts:
	bigbluebutton-html5/server/server.js
 2016-04-25 11:57:35 +00:00
Oleksandr Zhurbenko
b52738be8e Ran linter and autofixed most of the warnings in the new React code 2016-04-22 16:19:17 -07:00
Oleksandr Zhurbenko
8a97afb89e Removed code and files which are not used anymore 2016-04-22 15:09:46 -07:00
Oleksandr Zhurbenko
22eb834d95 Returned tooltips 2016-04-22 14:57:06 -07:00
Oleksandr Zhurbenko
046c9d376b Partially adopted Meteor's recommended file structure 2016-04-22 14:19:20 -07:00
Anton Georgiev
13ac424aa3 fix issue with undefined function return 2016-04-21 22:25:15 +00:00
Anton Georgiev
be0be4f6f0 Merge branch 'html5-server-changes' of github.com:antobinary/bigbluebutton into html5-server-changes 2016-04-21 22:23:24 +00:00
Anton Georgiev
361402eafd make start.sh executable 2016-04-21 21:54:30 +00:00
Oleksandr Zhurbenko
5b5f06d714 Upgraded Meteor to 1.3.2.4 2016-04-21 14:30:54 -07:00
Oleksandr Zhurbenko
6cd0de19f9 Added necessary imports and temporary styling to make it all work after the merge 2016-04-21 12:21:01 -07:00
Oleksandr Zhurbenko
92d262a104 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/.meteor/packages
	bigbluebutton-html5/app/.meteor/versions
	bigbluebutton-html5/app/client/main.js
	bigbluebutton-html5/app/client/main.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/main.jsx
	bigbluebutton-html5/client/views/chat/chat_bar.html
	bigbluebutton-html5/client/views/chat/chat_bar.js
	bigbluebutton-html5/client/views/whiteboard/slide.js
	bigbluebutton-html5/client/views/whiteboard/whiteboard.js
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/redispubsub.js
	bigbluebutton-html5/server/server.js
 2016-04-20 16:09:47 -07:00
Oleksandr Zhurbenko
c796180e24 Commented out unused whiteboard code(temporarily before removing completely) 2016-04-20 10:52:47 -07:00
Oleksandr Zhurbenko
b3512d0a42 Wrapped header, whiteboard and chat into the MainContainer and injected in into the 'main' 2016-04-20 10:43:02 -07:00
Oleksandr Zhurbenko
ecf92afeb4 Commented out annecessary helpers (temporarily before removing) and changed scaleWhiteboard func so that is could work with Whiteboard.jsx 2016-04-20 10:33:36 -07:00
Oleksandr Zhurbenko
34d1a02484 Added a classnames package 2016-04-20 10:32:02 -07:00
Oleksandr Zhurbenko
29a4b8db20 Added an additional check for Polling 2016-04-20 09:08:23 -07:00
Oleksandr Zhurbenko
af09761048 Fixed return statement, added scaling, added dynamic class change for the polling and presenter controls 2016-04-19 16:49:24 -07:00
Oleksandr Zhurbenko
90680f31ef class -> className 2016-04-19 16:44:01 -07:00
Anton Georgiev
d258620068 reuse header creation 2016-04-19 21:16:32 +00:00
Anton Georgiev
6436d4396d extract out meteor methods 2016-04-19 17:43:31 +00:00
Oleksandr Zhurbenko
9305da4a26 Fixed Raise Hand Button's view 2016-04-19 08:44:32 -07:00
Anton Georgiev
cc28e5d377 switch to smarter logging 2016-04-19 15:07:57 +00:00
Oleksandr Zhurbenko
7c698eab3f Fixed a reactive chat update when a chat opponent disappears 2016-04-18 15:59:22 -07:00
Anton Georgiev
41e014e083 use default EventEmitter instead of new pckg 2016-04-18 22:53:05 +00:00
Anton Georgiev
02ebc17100 cleanup 2016-04-18 22:47:11 +00:00
Anton Georgiev
3f45800e7d event emitter for redis messages 2016-04-18 21:58:36 +00:00
Oleksandr Zhurbenko
c5717e9ea3 Cleanup 2016-04-13 15:01:34 -07:00
Oleksandr Zhurbenko
f5b3ffbaa3 Ported Whiteboard template to React 2016-04-13 15:01:06 -07:00
Oleksandr Zhurbenko
3c3a7d061f Switched header template to React 2016-04-13 14:56:25 -07:00
gcampes
a39a2cfac1 Fix user-list fade-in animation on mobile 2016-04-06 10:09:10 -03:00
gcampes
0777bc7cb6 Fix an issue with the emoji status resulted from the last merge 2016-04-06 10:09:04 -03:00
gcampes
126b28d432 Adds emoji status icons to the react user list component 2016-04-06 10:08:52 -03:00
Maxim Khlobystov
f675681ce4 Set Grunt to rerun the syntax check on any JS/JSX file change. 2016-04-06 10:08:42 -03:00
Maxim Khlobystov
755c564efa Cleaning up. 2016-04-06 10:08:38 -03:00
Maxim Khlobystov
0cceeee8c2 Updated the instructions on running Grunt. 2016-04-06 10:08:33 -03:00
Maxim Khlobystov
f2dcb7b96c Got rid of unused Grunt plugins. 2016-04-06 10:08:29 -03:00
Maxim Khlobystov
32a84adc7a Got the old start script back to allow the way to run Meteor outside the build process. 2016-04-06 10:08:24 -03:00
Maxim Khlobystov
7131115746 Removed unused configuration files left by Meteor and Meteorite, as well as the old start script. 2016-04-06 10:08:20 -03:00
Maxim Khlobystov
76aa113dda Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide. 
Conflicts:
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/views/whiteboard/whiteboard.js
	bigbluebutton-html5/server/collection_methods/users.js
	bigbluebutton-html5/server/server.js
 2016-04-06 10:08:08 -03:00
Maxim Khlobystov
a01ee713ed Added an option to autofix linter warnings (where possible) on build. 2016-04-06 10:06:13 -03:00
Maxim Khlobystov
69df37265d Incorporated linting into the build process. 2016-04-06 10:06:08 -03:00
Maxim Khlobystov
30b6a3c5b7 Added lint checking to the HTML5 client. 2016-04-06 10:06:02 -03:00
Maxim Khlobystov
1c311fb9cf Combined two npm configuration files together and put it into the root directory of HTML5 client (required by Meteor to recognize the location of packages installed). 2016-04-06 10:05:52 -03:00
gcampes
c8be1b103e Change how proptype is imported in react components 2016-04-06 10:05:46 -03:00
gcampes
91bad29ceb Remove .jshintrc file 2016-04-06 10:05:31 -03:00
Gabriel Carvalho de Campes
96eca4cf1f Update README.md 2016-04-06 10:05:26 -03:00
gcampes
97cd032833 Move user-list's data fetching and actions to a separate file 2016-04-06 10:05:22 -03:00
gcampes
d2455d43d6 Change user-list to import and export rather than having everything global 2016-04-06 10:05:17 -03:00
Maxim Khlobystov
a2a902bfa8 Upgraded to Meteor 1.3 Beta and replaced the Atmosphere's Classnames package with its npm analogue. 2016-04-06 10:05:07 -03:00
Gabriel Carvalho de Campes
e445fb4b94 Update README.md 2016-04-06 10:05:00 -03:00
gcampes
a10280c3b5 Solve rendering issue 2016-04-06 10:04:55 -03:00
gcampes
8ca2e8837a Change user list css 2016-04-06 10:04:37 -03:00
Oswaldo Acauan
41efd5b5ff Update README from UserList 2016-04-06 10:04:32 -03:00
Oswaldo Acauan
cc435eb424 Fix user-list sharing status list 2016-04-06 10:04:22 -03:00
Oswaldo Acauan
4174a59b2f Fix user-list unread badge styles 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserListItem.jsx
 2016-04-06 10:04:09 -03:00
Oswaldo Acauan
1e61823fb9 Change user-list to a tabular markup 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserItem.jsx
 2016-04-06 10:00:40 -03:00
gcampes
a0c54d63dc Update react UserList readme 2016-04-06 10:00:08 -03:00
gcampes
2488cfc392 Refactor react component code 2016-04-06 10:00:01 -03:00
gcampes
a51734f2c0 Add lock settings to the react component and fix mic icons 2016-04-06 09:59:56 -03:00
gcampes
73d6d7d8bb Change the way actions are handled 2016-04-06 09:59:47 -03:00
gcampes
f303fe4df4 Adds event handling for kick user 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserItem.jsx
 2016-04-06 09:59:41 -03:00
gcampes
82fdebb4b5 Adds key to icons 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserItem.jsx
 2016-04-06 09:55:33 -03:00
Oswaldo Acauan
0c3dbd4a72 Add sharing icon status. WIP 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserItem.jsx
 2016-04-06 09:54:09 -03:00
gcampes
5aa8736176 Changes username into a button component 2016-04-06 09:52:44 -03:00
gcampes
756cdf12d6 Changes the name of the event handlers 2016-04-06 09:52:41 -03:00
gcampes
27fc4a6981 Adds some words in comment 2016-04-06 09:52:38 -03:00
gcampes
4e8fc3d548 Adds event handling for the set presenter click 2016-04-06 09:52:21 -03:00
gcampes
f9cd087fac Adds event handling for the useritem click, which opens the private chat 2016-04-06 09:52:18 -03:00
Oswaldo Acauan
092e8de63a Remove unused files 2016-04-06 09:52:12 -03:00
Oswaldo Acauan
dc255ef3eb Add UserItem component unread badge 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserItem.jsx
 2016-04-06 09:50:26 -03:00
gcampes
fc22cb33bb Adds the status icons 2016-04-06 09:49:46 -03:00
Oswaldo Acauan
86c590e98e Fix warning message raised from Icon component 2016-04-06 09:49:40 -03:00
gcampes
bcae6e2051 Solve syntax issues 2016-04-06 09:49:39 -03:00
gcampes
e5c6753f84 Change es6 to react.createClass 2016-04-06 09:49:38 -03:00
Oswaldo Acauan
6e1c2e3adb Rever changes to start.sh 2016-04-06 09:49:32 -03:00
gcampes
6f8422fc2f Change file names and adds status icon 2016-04-06 09:49:30 -03:00
Oswaldo Acauan
f5b8bdbf02 Add reusable components for buttons, icons and tooltips 2016-04-06 09:49:29 -03:00
gcampes
568f6f3406 Create new react components 2016-04-06 09:49:23 -03:00
Oswaldo Acauan
52a7b1e3e3 Add generic button component 2016-04-06 09:49:22 -03:00
gcampes
f3a739d8c4 Move react folder from views 2016-04-06 09:49:21 -03:00
gcampes
1f34ff8f7b Adds new react folder structure 2016-04-06 09:49:05 -03:00
Oswaldo Acauan
5932cfa2de Changed boilerplate stuff to icon component 2016-04-06 09:48:51 -03:00
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
Oleksandr Zhurbenko
33ebc407dc Removing the slide when the presentation is deleted 2016-04-04 13:59:55 -07:00
Oleksandr Zhurbenko
30848def3f Fixed switching between presentations 2016-04-01 17:04:25 -07:00
Oleksandr Zhurbenko
ef7d71044c Fixed switching slides 2016-04-01 16:04:36 -07:00
Oleksandr Zhurbenko
b3a456857e Added the ability to see the shapes' drawing process for viewers 2016-03-31 17:19:31 -07:00
Oleksandr Zhurbenko
c1bb196e0f Slide can be displayed on the initial load 2016-03-28 13:33:45 -07:00
Oleksandr Zhurbenko
ed374f6cd1 No need in fat arrows in this cases 2016-03-25 14:15:26 -07:00
Oleksandr Zhurbenko
a827ec5eae Cleaning up 2016-03-23 14:40:49 -07:00
Oleksandr Zhurbenko
0f773355d8 Fixed the emojis' functionality 2016-03-23 14:31:13 -07:00
Oleksandr Zhurbenko
0bf473f244 Emojis start displaying with React 2016-03-22 14:50:44 -07:00
Oleksandr Zhurbenko
801d3819b0 Moved Button.jsx to 'shared' 2016-03-21 20:39:38 -07:00
Oleksandr Zhurbenko
c089ec93de 'plus' button is not used anymore 2016-03-18 14:12:19 -07:00
Oleksandr Zhurbenko
dc23eb6652 Switched the rest of whiteboard controls to react and united them with uploader menu 2016-03-18 12:57:43 -07:00
Oleksandr Zhurbenko
464726b4ba Switched presenter uploading menu to React 2016-03-17 12:41:01 -07:00
Oleksandr Zhurbenko
a52ac721a5 Fixed class names in the presenter-uploader-file-item 2016-03-16 16:26:04 -07:00
Oleksandr Zhurbenko
b670691488 classNames instead of classes 2016-03-16 16:17:59 -07:00
Oleksandr Zhurbenko
8c4e95c81f Fixed a typo in a key name 2016-03-16 15:02:08 -07:00
Oleksandr Zhurbenko
85744b4ca6 PresentationListItem and UploadingListItem components 2016-03-14 14:40:17 -07:00
Oleksandr Zhurbenko
ddf17c58ea Removed and replaced previous polling teplate and helpers 2016-03-13 14:11:33 -07:00
Oleksandr Zhurbenko
52662ac45a Removed unused parameter from Button.jsx, cleaned up 2016-03-12 16:27:29 -08:00
Oleksandr Zhurbenko
ff12344a34 Polling module 2016-03-11 15:09:59 -08:00
Oleksandr Zhurbenko
325dd563eb Fixed styling problem with toPublic button 2016-03-11 15:04:44 -08:00
Oleksandr Zhurbenko
3389efc251 Changed machine-generated code to more readable 2016-03-11 15:04:09 -08:00
Oleksandr Zhurbenko
cdbc951e56 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 2016-03-11 11:26:54 -08: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
849fad0455 Made html5 chat working with react 2016-02-26 19:17:11 -08:00
Oleksandr Zhurbenko
ace43d18ab Visibility helper is not used anymore 2016-02-22 15:24:03 -08: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
perroned
f2b5273160 mark screensharing as true on callback 2016-01-18 07:25:17 -08:00
perroned
0ec6efb6c4 only needed for html5 2016-01-18 07:24:46 -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
perroned
ffd1bf8672 Adding deskshare subscription to new routing method 2016-01-14 06:20:46 -08:00
Anton Georgiev
66e869e503 trying a different routing mechanism to address a routing bug with user lock 2016-01-14 06:09:14 -08: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
perroned
4571b0532c media preview code 2016-01-13 10:37:10 -08:00
perroned
2a65639adb Use new deskshare collection 2016-01-13 10:06:57 -08:00
perroned
73c1eddc05 Updated parameters for initating verto calls. 2016-01-13 10:05:22 -08:00
perroned
e55ac3c7f8 Load deskshare libraries from Flash 2016-01-13 10:04:01 -08:00
perroned
ed1ed3ab05 Added deskshare collection 2016-01-13 10:02:11 -08:00
perroned
4ae45bff9b Updated verto audio joining 2016-01-13 10:01:00 -08:00
perroned
ee2f4a5dc3 Fix detection of when deskshare is initiated and ended through different collection 2016-01-13 10:00:28 -08:00
perroned
e7f8237a21 Removed deskshare library files from client 2016-01-13 10:00:17 -08: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
perroned
e7884e831b Merge remote-tracking branch 'anton/webrtc-desktop-temp-4' into html5client-mod-verto-addition-2 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2016-01-07 10:40:52 -08:00
Anton Georgiev
155aebdc65 allow late joining ds for html5 client, event if Meteor started late 2015-12-22 22:55:16 +00:00
Anton Georgiev
88d969cd45 fix string in common message 2015-12-22 22:50:34 +00:00
Anton Georgiev
2969c9136e html5 promote BBB.x vs getInSession where possible 2015-12-22 20:49:45 +00:00
perroned
9775d5a2f8 Say FF addon isn't there until detection 2015-12-15 13:00:11 -08:00
perroned
5d08f78ad5 Add everything audio to its own file 2015-12-15 12:59:37 -08: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
Anton Georgiev
7b15231cdb cleaning up issues with webrtc ds display 2015-12-11 22:39:00 +00:00
Anton Georgiev
cad6c2a175 add a check for user 2015-12-11 20:32:44 +00:00
Anton Georgiev
1a2447b5b9 hooking up to server side 2015-12-11 20:30:55 +00:00
perroned
34aa2b03fc Use voice bridge received from server 2015-12-10 10:55:30 -08:00
perroned
5c74f5f446 Update whiteboard controls template 2015-12-10 10:38:27 -08:00
perroned
7625a199b1 Add deskshare object to meetings 2015-12-10 07:58:25 -08:00
perroned
0a3f91c65b Fixed indentation error 2015-12-10 07:58:06 -08:00