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

502 Commits

Author SHA1 Message Date
JaeeunCho
c7e43f2b77 HTML5-clent scroll on chat - changed to display messages automatically 2016-11-21 15:02:12 -08:00
Anton Georgiev
924eaa17c3 Merge pull request #3445 from KDSBrowne/Lock-Settings-Availability 
Lock settings available to Presenter/Moderator
 2016-11-21 14:07:11 -05: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
KDSBrowne
2e3407e128 clean up - more readable 2016-11-21 06:32:12 -08:00
KDSBrowne
4dd268e25a added new suggestions 2016-11-18 21:28:01 -08: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
Matthew Marangoni
c9221c94f3 removed unecessary import statements 2016-11-18 13:35:02 -08:00
Matthew Marangoni
aa65afffa4 adjusted to meet component/container structure conventions and simplify code 2016-11-18 13:24:59 -08: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
Anton Georgiev
e644576063 Merge pull request #3435 from JaeeunCho/messages_v1 
HTML5-client : fixed messages from the logged out users on public-chat
 2016-11-17 16:03:51 -05:00
KDSBrowne
bdcc8b9bd6 added new suggestions, need to fix console warning 2016-11-17 12:10:05 -08:00
Oswaldo Acauan
15f59f9781 Fix bug related to presentation handlers 2016-11-17 15:54:24 +00:00
KDSBrowne
6f1680318c update 2016-11-16 07:15:17 -08:00
Matthew Marangoni
0abcc06bfc linting fixes & updated based on feedback 2016-11-15 13:00:28 -08:00
Anton Georgiev
f0a18f6210 improve dropdown slide switch to pass a number, not string so server checks pass 2016-11-15 16:30:13 +00:00
KDSBrowne
3359ec499a clean up 2016-11-15 08:22:05 -08:00
Anton Georgiev
9b3b28129f fix slide switching (typo) 2016-11-15 16:19:33 +00:00
Anton Georgiev
1cff965131 Merge branch 'Action-Options-Availability' of github.com:KDSBrowne/bigbluebutton into merge-pr-kert-1 2016-11-15 16:09:47 +00:00
KDSBrowne
cba6e75735 cleaning up 2016-11-14 18:48:56 -08:00
Anton Georgiev
0598591fc7 remove reference to undef 2016-11-14 22:24:24 +00:00
JaeeunCho
909862e44c HTML5-clent messages on chat - changed icon for logged out users 2016-11-14 14:18:25 -08:00
Anton Georgiev
3a141dcadd resolve browser warning 2016-11-14 21:41:25 +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
JaeeunCho
3e04e716f5 Merge remote-tracking branch 'upstream/master' into messages_v1 2016-11-14 12:37:16 -08: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
KDSBrowne
2296a122f5 Actions button only available to Presentor 2016-11-07 10:19:00 -08:00
KDSBrowne
2e3fe72cf4 Lock settings available to Presentor/Moderator 2016-11-07 09:52:21 -08: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
JaeeunCho
aedf4561de HTML5-client messages for logged out user on chat 2016-10-31 15:17:06 -07:00
JaeeunCho
e541487596 Merge remote-tracking branch 'upstream/master' into messages_v1 2016-10-31 14:18:37 -07:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
JaeeunCho
8bb915e8cd HTML5-clent messages on chat 2016-10-25 10:22:55 -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