Commit Graph

179 Commits

Author SHA1 Message Date
Anton Georgiev
e1f63c0aec make function export default 2016-11-28 19:36:58 +00:00
Anton Georgiev
7f9228ac02 fix Meteor.Error 2016-11-28 19:36:06 +00:00
Anton Georgiev
5635f94789 refactor updateVoiceUser.js 2016-11-22 16:15:42 +00:00
Anton Georgiev
462d72afa0 handle talking event in html5 2016-11-22 15:06:54 +00:00
Anton Georgiev
ba7e69333c Merge pull request #3475 from oswaldoacauan/refactor-api-shapes
[HTML5] Refactor API Shapes (whiteboard)
2016-11-21 13:38:03 -05:00
Oswaldo Acauan
bf99bb50d4 Clear shapes after clearing an presentation 2016-11-21 16:04:42 +00:00
Anton Georgiev
c98813e7b3 Merge pull request #3460 from mmarangoni/html5-stun-audio
Mute, Unmute, Leave Audio
2016-11-18 17:03:13 -05:00
Oswaldo Acauan
4fe83bf79d Refactor Shapes API 2016-11-18 17:59:11 +00: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
e932bb88fd Remove wrong commited files 2016-11-18 12:28:55 +00:00
Oswaldo Acauan
b4f9d88fac Refactor API Cursor's 2016-11-18 12:26:14 +00:00
Oswaldo Acauan
15f59f9781 Fix bug related to presentation handlers 2016-11-17 15:54:24 +00:00
Matthew Marangoni
0abcc06bfc linting fixes & updated based on feedback 2016-11-15 13:00:28 -08:00
Anton Georgiev
9b3b28129f fix slide switching (typo) 2016-11-15 16:19:33 +00:00
Anton Georgiev
0598591fc7 remove reference to undef 2016-11-14 22:24:24 +00:00
Anton Georgiev
8a377e0a18 adjust name of resource + function 2016-11-14 21:40:50 +00: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
caabead5e0 Removes unused code 2016-11-14 16:25:23 -02:00
Gabriel Carvalho de Campes
214357adc6 Fix conflicts 2016-11-14 14:54:04 -02:00
Matthew Marangoni
807f434d72 fixed an error with exit audio 2016-11-11 14:11:00 -08:00
Matthew Marangoni
482fc97388 Added mute/unmute/join listen only/leave audio features to join audio modal 2016-11-11 13:09:34 -08: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
41f06644c2 Fix import in stunturn reply handler 2016-11-03 17:23:00 +00:00
Oswaldo Acauan
6a8f997b00 Fix handleStunTurnReply function name 2016-11-03 13:35:05 +00:00
Oswaldo Acauan
71fb7abd70 Refactor stuns/turns handler 2016-11-03 13:33:14 +00:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Matthew Marangoni
0d3f231ac1 Merge remote-tracking branch 'upstream/master' into html5-stun-audio 2016-10-24 09:08:13 -07:00
Matthew Marangoni
374698c338 beginning work on html5 audio 2016-10-24 09:01:50 -07:00
Gabriel Carvalho de Campes
5aaafa8202 Merge remote-tracking branch 'upstream/master' into refactor-poll-api
* upstream/master: (26 commits)
  - fix check for breakout room  - insert breakout metadata into events.xml  - delete breakout metadata from redis
  Rename meteor method on the client
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
  Fix bug on the clearChats and addChat modifiers
  HTML5 - fixed linebreak with lint
  HTML5 - fixes fullscreen toggle to un-fullscreen
  Monitoring for number of user is not triggered for breakout rooms.
  Updated bbb-record rules to detect recording directories.
  Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
  Added redirect property to RequestBreakoutJoinURL.
  Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
  Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
  Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
  Re-enable recording option for breakout rooms.
  Store breakout room externalMeetingID to be used for generating join URL.
  Store breakout room sequence in akka-apps and bbb-web.
  Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
  Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
  ...
2016-10-24 13:39:37 -02:00
Oswaldo Acauan
0d2225b79c Clean up before PR 2016-10-24 11:20:30 +00:00
Oswaldo Acauan
e1421566be Merge branch 'master' into refactor-meetings-api
* master: (22 commits)
  - fix check for breakout room  - insert breakout metadata into events.xml  - delete breakout metadata from redis
  Rename meteor method on the client
  HTML5 - fixed linebreak with lint
  HTML5 - fixes fullscreen toggle to un-fullscreen
  Monitoring for number of user is not triggered for breakout rooms.
  Updated bbb-record rules to detect recording directories.
  Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
  Added redirect property to RequestBreakoutJoinURL.
  Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
  Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
  Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
  Re-enable recording option for breakout rooms.
  Store breakout room externalMeetingID to be used for generating join URL.
  Store breakout room sequence in akka-apps and bbb-web.
  Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
  Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
  Replace the deprecated shaHex DigestUtils by sha1Hex.
  Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
  Breakout rooms are now sorted by their sequence number.
  Added sequence property breakout room.
  ...
2016-10-24 11:14:14 +00:00
Anton Georgiev
e26e9fd060 Merge pull request #3419 from oswaldoacauan/rewrite-queue-handler
[HTML5] Refactor of RedisHandler and Chat API
2016-10-21 15:47:48 -04:00
Gabriel Carvalho de Campes
242b2f756f change publishVote method and polish poll api code 2016-10-21 16:56:42 -02:00
Oswaldo Acauan
8874c15e9f Rename meteor method on the client 2016-10-21 18:47:33 +00:00
Gabriel Carvalho de Campes
8036678aae Changes code based on feedback 2016-10-21 15:42:43 -02:00
Gabriel Carvalho de Campes
0a873c302c Changes poll api to the correct conventions 2016-10-21 15:11:28 -02:00
Oswaldo Acauan
8e27e35e07 Rever wrong changes on chat handler parameters 2016-10-21 17:10:27 +00:00
Oswaldo Acauan
d1786d61a6 Revert wrong changes on chat handler name 2016-10-21 17:08:43 +00:00
Oswaldo Acauan
c590f3ffd9 Merge branch 'rewrite-queue-handler' into refactor-meetings-api
* rewrite-queue-handler:
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
2016-10-21 16:57:01 +00:00
Oswaldo Acauan
85a1a44cc9 Remove left over debug 2016-10-21 16:55:54 +00:00
Oswaldo Acauan
e67c127e8f Fix chat being always inserted when the server start 2016-10-21 16:54:17 +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
6676feb933 Fix bug on the clearChats and addChat modifiers 2016-10-21 11:56:03 +00:00
Oswaldo Acauan
a76ab6e7e6 Refactor API Slides 2016-10-21 11:41:17 +00:00
Oswaldo Acauan
b04e071389 Revert Meteor version to stable release 2016-10-19 17:54:09 +00:00
Oswaldo Acauan
077cf8471c Change filenames based on slack feedback 2016-10-19 17:49:38 +00:00