BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,093 Commits 13 Branches 260 Tags 1.1 GiB
6017786a85
Commit Graph

149 Commits

Author SHA1 Message Date
Klaus
5767583a86 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages 2017-07-17 15:37:06 -03:00
Klaus
7fb9bae75e Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-14 14:44:00 -03:00
Klaus
712b6914cc Add base files 2017-07-14 09:32:15 -03:00
Klauswk
38087a1669 Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:38:54 -03:00
Klaus
6c602ba56f Add missing import and add FIX ME 2017-07-13 17:28:35 -03:00
Klaus
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
Klaus
90ca216507 Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-07 08:19:39 -03:00
Klaus
4c1c7ad65a Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages 2017-07-06 17:36:56 -03:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus
be2caf92a3 Working poll vote 2017-06-30 11:26:19 -03:00
Klaus
9b63e0c215 Add caption messages 2017-06-29 17:22:09 -03:00
Klaus
93927a3b53 Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages 2017-06-29 09:22:34 -03:00
Klaus
2098c2dff7 Handle polls messages 2017-06-28 17:37:45 -03:00
Klaus
a209f620e0 Add cursor support 2017-06-22 10:22:34 -03:00
Klaus
3998139e72 Split redis and api for version migration 2017-06-20 14:17:37 -03:00
Klaus Klein
ca09b69555 Merge branch 'Acl' into Refactor2x 
* Acl:
  Add check to undefined role
  Lint to eslint
  Missing merge file
  Fix lint problems
  Change Acl lookup
  Change ACL to be more extensible
  Fix a few review comments
  Acl refactor working
  Mostly working, still problems with user subs
  Code refactored
 2017-06-19 11:28:17 -03:00
Klaus Klein
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Klaus Klein
8a31d29e17 Acl refactor working 2017-06-01 14:32:04 -03:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -03:00
Klaus Klein
71d3c06d5e Fix few lint issues 2017-04-28 11:03:35 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
 2017-03-06 19:21:40 +00:00
perroned
92c3cdb746 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2017-02-23 19:20:37 +00:00
Oswaldo Acauan
99cfdb2062 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:44 +00:00
Oswaldo Acauan
8bd65c1a43 Merge remote-tracking branch 'upstream/master' into refactor-api-users 
* upstream/master: (47 commits)
  Updated with correct version
  Check for initial values in application.conf
  remove defaultMessage
  Remove wrong selector when upserting captions
  Localize other labels through the application
  localize labels for AudioSettings component
  localize label for AudioTest component
  hide option to reset status if there is no status (emojis)
  drop voice in main room when joining breakout room
  add defaultMessage for Public Chat
  localize Join/Leave Audio labels
  Remove console logs
  Fix ´get_all_meetings_request´ being published multiple times
  Clean captions when handling the history reply
  Fix presentation slide coordinates
  - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
  use localized Public Chat label
  finish locals for the audio modal
  Returning number of users that participated in each meeting in getRecordings call
  add comment for condition
  ...
 2017-02-23 17:46:30 +00:00
Oswaldo Acauan
a609c1feab WIP. Refactor of get 2017-02-23 17:45:51 +00:00
perroned
2d04f057cc Cleans up html5 screenshare 2017-02-22 20:31:09 +00:00
Oswaldo Acauan
b6bb8cc08d Refactor user api handlers 2017-02-22 17:55:39 +00:00
Oswaldo Acauan
1f9f47ce16 Fix assignPresenter method 2017-02-22 13:42:42 +00:00
Oswaldo Acauan
28ba2fb4b0 WIP - Refactor users api 2017-02-07 15:29:27 +00:00
Oswaldo Acauan
fda22b0653 Refactor methods/events for user leaving iteractions 2017-02-07 13:08:06 +00:00
Oswaldo Acauan
32ba6ad724 Refactor method listenOnlyRequestToggle 2017-02-06 16:27:09 +00:00
Oswaldo Acauan
9c2b42e99a Refactor publishers and method kickUser to the new pattern 2017-02-06 15:56:09 +00:00
Oswaldo Acauan
b4679bc601 Refactor Captions API 2017-01-18 12:53:33 +00:00
gcampes
655f8dd6d6 Fix merge conflicts 2016-11-23 13:33:51 -02:00
gcampes
bdb6780f7a Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  removed unecessary import statements
  adjusted to meet component/container structure conventions and simplify code
  Remove wrong commited files
  Refactor API Cursor's
  Fix bug related to presentation handlers
  linting fixes & updated based on feedback
  HTML5-clent messages on chat - changed icon for logged out users
  fixed an error with exit audio
  Added mute/unmute/join listen only/leave audio features to join audio modal
  HTML5-client messages for logged out user on chat
  HTML5-clent messages on chat
 2016-11-21 10:53:55 -02:00
Oswaldo Acauan
b0e784ec60 Merge remote-tracking branch 'upstream/master' into refactor-api-shapes 
* upstream/master:
  Remove wrong commited files
  Refactor API Cursor's
 2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72 Refactor Shapes API 2016-11-18 17:35:28 +00:00
Oswaldo Acauan
b4f9d88fac Refactor API Cursor's 2016-11-18 12:26:14 +00:00
Gabriel Carvalho de Campes
85013eac1f Fix issues from merge 2016-11-16 15:44:05 -02:00
Anton Georgiev
74cf17e812 Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1 2016-11-14 21:31:21 +00:00
Gabriel Carvalho de Campes
214357adc6 Fix conflicts 2016-11-14 14:54:04 -02:00
Oswaldo Acauan
1df46bb201 Refactor of Presentations API 2016-11-11 19:02:46 +00:00
Oswaldo Acauan
2cf4bd3f5a Merge conflicts 2016-11-10 15:13:02 +00:00
Oswaldo Acauan
c7b62a209c Refactor Meeting API 2016-10-21 16:27:47 +00:00
Gabriel Carvalho de Campes
a7335633d4 Refactor Poll API 2016-10-21 11:21:09 -02:00
Oswaldo Acauan
a76ab6e7e6 Refactor API Slides 2016-10-21 11:41:17 +00:00
Oswaldo Acauan
1d30281cf2 Refactor server Chat API 2016-10-19 12:18:47 +00:00
Oleksandr Zhurbenko
f64ed1fd4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning 2016-08-20 16:37:11 -07:00
Lajellu
76679c9cb9 removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename service in slide controls 2016-08-05 13:13:48 -07:00
Lajellu
12ec76d375 Fixes slide control PR comments 2016-08-05 11:39:24 -07:00
Lajellu
219078f49d adds slide controls and new bbb icons 2016-08-02 15:55:20 -07:00
Lajellu
1ead9ced59 adds presentation controls 2016-07-26 13:56:43 -07:00
Anton Georgiev
6a984c2b68 adding captions support in html5 (part1) 2016-07-14 12:03:30 -07:00
Oleksandr Zhurbenko
e39963d4de Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/package.json
 2016-06-02 15:20:41 -07:00
Anton Georgiev
9cf03a8ce8 move helpers; extract nodejsApp 2016-06-01 17:18:13 +00:00
Oleksandr Zhurbenko
1c4c2befb3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
	bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx
	bigbluebutton-html5/imports/ui/shared/Button.jsx
	bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx
	bigbluebutton-html5/package.json
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/collection_methods/slides.js
	bigbluebutton-html5/server/server.js
 2016-05-25 15:04:20 -07:00
Oleksandr Zhurbenko
f1e3dd71b9 Made text Shape object consistent with the others 2016-05-25 09:45:04 -07:00
Oleksandr Zhurbenko
654b80126f Fixed namespace problem (for FF) 2016-05-20 11:36:20 -07:00
Oleksandr Zhurbenko
82c45ef6de Removed Svg component; added the ability to display an image from the new Slide component 2016-05-20 11:28:52 -07:00
Anton Georgiev
cbef1c4abd split emitter.on; move to api 2016-05-16 19:12:49 +00:00
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00
Oleksandr Zhurbenko
ecfb86d474 Merged getSlideDimensions' with addSlideToCollection 2016-05-13 16:10:48 -07: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
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +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
587627562c Fixes some api structure 2016-05-10 10:23:22 -05:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +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
Anton Georgiev
573c1772b3 server side rearrangements 2016-05-02 14:48:20 +00:00
Anton Georgiev
1c8436170e move the redis configs outside the Meteor obj 2016-04-28 22:01:43 +00: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
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
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
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
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
Anton Georgiev
13ac424aa3 fix issue with undefined function return 2016-04-21 22:25:15 +00: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
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
Anton Georgiev
cc28e5d377 switch to smarter logging 2016-04-19 15:07:57 +00: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
Maxim Khlobystov
755c564efa Cleaning up. 2016-04-06 10:08:38 -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
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