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

1781 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
e92e694793 Corrected identation 2016-12-22 17:47:18 -08:00
Oleksandr Zhurbenko
bb1a8b09b8 Display closed-captions box based on the value from the Session storage 2016-12-22 16:44:31 -08:00
JaeeunCho
48fe95e360 HTML5 Client - removed soundForUnreadeMessages() from nav-bar 2016-12-22 15:37:17 -08:00
JaeeunCho
e92e75564a HTML5 Client - changed sound for unreadMessages function from nav-bar to app 2016-12-22 15:34:20 -08:00
KDSBrowne
def71823c5 replace css pixel values with em 2016-12-22 13:33:30 -08:00
KDSBrowne
acf204ae37 remove top margin from test audio button 2016-12-22 13:13:33 -08:00
KDSBrowne
e4390de53a position enter session button 2016-12-22 13:08:34 -08:00
KDSBrowne
4dd23e12b7 clean up css and style source dropdown 2016-12-22 13:01:56 -08:00
KDSBrowne
de49563043 improve join audio modal menu 2016-12-22 11:32:26 -08:00
KDSBrowne
ba554eef2b remove listen only modal menu 2016-12-22 09:47:12 -08:00
JaeeunCho
0a4248d144 HTML5 Client sound - added sound for unreadMessages 2016-12-22 08:17:22 -08:00
Lajellu
11e5809340 HTML5 - Remove unncessary background-color CSS 2016-12-21 13:13:00 -08:00
Lajellu
ec49a0a343 HTML5 - Fix Recording Indicator Logic 
Original:
The indicator is always visible.
If the meeting is currently being recorded,
Then indicator turns red

Changed to:
If the meeting is currently being recorded
Then the indicator is displayed and red
 2016-12-21 11:13:08 -08:00
Anton Georgiev
20eea9cb06 Merge pull request #3531 from JaeeunCho/muteIcon 
HTML5 Client userlist - added muted/unmuted button for the current user
 2016-12-21 13:04:45 -05:00
Lajellu
b99d0a2407 HTML5 - Emoji - fix merge conflicts 2016-12-21 09:14:46 -08:00
Lajellu
a7afa00b0f HTML5 - Emojis - Remove the extra icons added in by the previous merge 2016-12-21 09:01:33 -08:00
Anton Georgiev
d408bb1522 Merge pull request #3514 from KDSBrowne/New-Settings-Update 
New settings update - Application Menu
 2016-12-21 12:01:26 -05:00
KDSBrowne
9dfc0791a8 remove clearing storage 2016-12-21 09:00:14 -08:00
Lajellu
9a77ace223 Merge remote-tracking branch 'upstream/master' into completeEmojiIcons 2016-12-21 09:00:12 -08:00
Anton Georgiev
9ba6a2c5ae Merge pull request #3529 from Lajellu/hideUnusableSlideCtrls 
HTML5 - comment out unimplemented presenter slide control UI
 2016-12-21 11:43:43 -05:00
KDSBrowne
9c4f3e5c50 import as LocalStorage and clear specific values 2016-12-21 08:31:16 -08:00
Anton Georgiev
69f3571101 Merge pull request #3524 from KDSBrowne/UI-Update-Changes01 
UI Changes Update
 2016-12-21 11:10:27 -05:00
Oleksandr Zhurbenko
875023eb03 Styled the closed-captions box 2016-12-20 15:54:39 -08:00
JaeeunCho
a8a8791699 HTML5 Client userlist - added muted/unmuted button for the current user 2016-12-20 15:39:11 -08:00
Matthew Marangoni
10c4bd2f50 Close button added to all join audio menus 2016-12-20 13:30:23 -08:00
Lajellu
8389d2b2e3 HTML5 - comment out Join Video to fix DOM positioning 
The reason there was so much space between `Join Audio` and `Status` was that `Join Video` was in between. Join Video was removed
to fix this positioning.

Leave Audio and Join Video icons are being hidden, which still holds the space for that component in the DOM, but does not show
it.
`Join Audio` should not be commented out because the icon is displayed at certain times.
`Join Video` can be commented out for now for UI purposes and put back when it's implemented.
 2016-12-20 12:27:16 -08:00
Matthew Marangoni
ba19b1443a Update new audio and mute icons 2016-12-20 11:45:48 -08:00
Matthew Marangoni
9e33ccdedc remove old console logs 2016-12-20 11:18:45 -08:00
Matthew Marangoni
428d9f6297 Update tab and escape keyboard navigation 2016-12-20 11:12:27 -08:00
Oleksandr Zhurbenko
596f985bc2 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-20 10:50:01 -08:00
Lajellu
95903abe7c HTML5 - comment out unimplemented presenter slide control UI 2016-12-20 10:33:14 -08:00
Lajellu
b3f1d9f804 HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues 2016-12-20 10:06:01 -08:00
Lajellu
98db4c8eec HTML5 - fixes merge conflicts bw master and this branch 2016-12-20 09:18:24 -08:00
KDSBrowne
72d53f54ac remove unused import 2016-12-19 14:19:06 -08:00
KDSBrowne
d79fabaeb6 add callback to cancel button 2016-12-19 14:01:52 -08:00
KDSBrowne
73db970152 add suggestions and store settings until logout 2016-12-19 13:45:09 -08:00
Anton Georgiev
0c6197c539 Merge pull request #3506 from oswaldoacauan/audio-stream-volume 
[HTML5] Mic Volume and Device Selector
 2016-12-19 14:13:07 -05:00
Oswaldo Acauan
8ebb41de3a Change default constraints for the audio-stream-volume component 2016-12-19 17:15:48 +00:00
Oswaldo Acauan
37942569fb Prevent blank device selector comobos 2016-12-19 17:11:43 +00:00
Oswaldo Acauan
d1c4116aee Add missing semicolon 2016-12-19 11:35:33 +00:00
Oswaldo Acauan
66478d0c55 Fix merge conflicts 2016-12-19 11:34:41 +00:00
KDSBrowne
533eb29d58 cleaned up 2016-12-18 17:55:32 -08:00
KDSBrowne
e730d7241f removed unused line 2016-12-18 17:13:37 -08:00
KDSBrowne
90e63b0b54 moved this.setState 2016-12-18 17:00:42 -08:00
KDSBrowne
06ef0d09fb moved initialization to constructor 2016-12-16 09:01:40 -08:00
KDSBrowne
83ba4d3d12 removed unused import 2016-12-16 08:58:38 -08:00
KDSBrowne
a6c4713e1a removed unused import 2016-12-16 08:56:17 -08:00
Anton Georgiev
0ea28a8ecd Merge pull request #3516 from KDSBrowne/Hide-VideoButton-Temp 
Hide Cam button Temporarily
 2016-12-16 10:42:15 -05:00
KDSBrowne
80ede2cd87 removed empty function in chat component 2016-12-16 06:42:07 -08:00
KDSBrowne
8795cbac6a removed duplicate Participants heading 2016-12-15 12:03:54 -08:00
KDSBrowne
f7710913f0 update button icon to white 2016-12-15 11:34:01 -08:00
KDSBrowne
811e5c97c2 added basic tool tip for testing 2016-12-15 10:29:19 -08:00
KDSBrowne
959208f86e align chevron vertically with text to right 2016-12-15 09:29:17 -08:00
KDSBrowne
4a4df3512a removed bold font style 2016-12-15 08:28:45 -08:00
KDSBrowne
5d328560a1 added suggestion 2016-12-15 08:15:04 -08:00
KDSBrowne
632ffbb752 removed css for button 2016-12-15 08:10:31 -08:00
KDSBrowne
b6d3a759fb removed chat X icon 2016-12-15 08:05:05 -08:00
Anton Georgiev
2df9f6e10b Merge pull request #3479 from JaeeunCho/scroll_v1 
HTML5-clent scroll on chat
 2016-12-15 10:31:32 -05:00
KDSBrowne
a4fc8440ea cleaned up 2016-12-14 16:02:08 -08:00
KDSBrowne
d2d0720889 undo a previous css change 2016-12-14 15:46:24 -08:00
KDSBrowne
c932ef7637 added close button to private chat 2016-12-14 13:21:39 -08:00
KDSBrowne
ae70ce1116 temporarily hide the Cam button 2016-12-14 11:55:35 -08:00
KDSBrowne
c29bbf870f removed unused line 2016-12-14 09:43:07 -08:00
KDSBrowne
0ddde5200d removed unused line 2016-12-14 09:39:58 -08:00
KDSBrowne
83091a969d changed behaviour of fontSizeName bug 2016-12-14 08:42:25 -08:00
KDSBrowne
4bdfb54b4e fixed lint issues 2016-12-14 07:57:54 -08:00
KDSBrowne
adcb46cb41 cleaned up code 2016-12-14 07:50:35 -08:00
KDSBrowne
6512b7be8a fixed bug, removed console logs 2016-12-14 07:40:13 -08:00
Anton Georgiev
1a6062d329 Merge pull request #3497 from mmarangoni/html5-stun-audio 
Action bar & join audio improvements
 2016-12-14 10:01:52 -05:00
KDSBrowne
eb7f58e2bb fixed issues, ready to set up save 2016-12-13 20:04:26 -08:00
KDSBrowne
38b9227f04 improved application settings - incomplete 2016-12-13 19:40:32 -08:00
Matthew Marangoni
0daa2798d5 updated with master/fixed merge conflicts 2016-12-09 12:39:48 -08:00
Matthew Marangoni
7e68432c29 Merge remote-tracking branch 'upstream/master' into html5-stun-audio 2016-12-09 12:30:33 -08:00
Anton Georgiev
e154873612 add missing char: 2016-12-09 14:51:49 +00:00
Anton Georgiev
358dc2f1fd change version to client build 2016-12-09 14:49:50 +00:00
Oswaldo Acauan
cb28149e4f Add audio device selector and mic volume checker 2016-12-08 16:17:17 -02:00
Oswaldo Acauan
5622296b69 Add audio device selector and mic volume checker 2016-12-08 16:17:08 -02:00
Matthew Marangoni
76f5de8722 mute button container and component improvements 2016-12-08 10:11:49 -08:00
Anton Georgiev
cf0238cba3 cleaning up 2016-12-08 16:20:47 +00:00
Anton Georgiev
b102e85840 remove ref to clientBuildInfo 2016-12-08 16:04:28 +00:00
Anton Georgiev
8608c6b716 comply with feedback - about component 2016-12-08 15:59:52 +00:00
Anton Georgiev
fe30dde5dd fix conflict 2016-12-08 15:58:58 +00:00
Anton Georgiev
58423e7785 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into minor-fixes 2016-12-08 15:43:08 +00:00
Oswaldo Acauan
836e100461 Merge branch 'master' into audio-stream-volume 
* master:
  Update Meteor and all packages to the lastest releases
  fix import for Logger
  Fix user-list icons margin and render
  Fix chat placeholder and user left messages on private chats
  Update bigbluebutton-release
  Fix jumbo circle buttons
  Revert modal overlay to be a solid white
  Fix [aria-hidden] elements being hidden
  Fix navbar and actions-bar padding so titles are aligned
  moved all logic out of UI component
  cleaned up
  removed component name duplication
  cleaned up code
  gen_webvtt: Parse entire events file, instead of iterparse
  cleaned up css, still needs fixing
  broken down into components - need to fix css
  bbb-web: Fix bug that was breaking getRecordings in test-install
  record-and-playback: Fixed issue with text gathered from slids used on preview
 2016-12-08 11:11:26 -02:00
Anton Georgiev
b1eb7cdd72 Merge pull request #3503 from oswaldoacauan/update-meteor-packages 
[HTML5] Update Meteor and all packages to the latest releases
 2016-12-08 07:47:22 -05:00
Oswaldo Acauan
eb6d008e59 Update Meteor and all packages to the lastest releases 2016-12-08 10:29:15 -02:00
Oswaldo Acauan
012416fe07 Add audio stream volume component 2016-12-08 10:09:29 -02:00
Anton Georgiev
b56ee1e553 add client information in About 2016-12-07 21:14:14 +00:00
Anton Georgiev
3ed395d079 update client information 2016-12-07 20:52:07 +00:00
Anton Georgiev
b7c47d900a reduce logging of cursor 2016-12-07 20:50:51 +00:00
Anton Georgiev
98bfae960b fix import for Logger 2016-12-07 16:12:46 +00:00
Anton Georgiev
aaecd871b6 Merge pull request #3491 from KDSBrowne/Audio-Components-Breakdown 
Added audio-setting components
 2016-12-07 10:34:49 -05:00
Oswaldo Acauan
c497c995fd Fix user-list icons margin and render 2016-12-07 11:53:19 -02:00
Oswaldo Acauan
48da206411 Fix chat placeholder and user left messages on private chats 2016-12-07 11:48:29 -02:00
Oswaldo Acauan
dfbb35e365 Fix jumbo circle buttons 2016-12-07 10:02:21 -02:00
Oswaldo Acauan
7796334dfd Revert modal overlay to be a solid white 2016-12-07 09:56:20 -02:00
Oswaldo Acauan
b3c292894f Fix [aria-hidden] elements being hidden 2016-12-07 09:49:15 -02:00
Matthew Marangoni
6f300b4832 isolated mute button, reduced button movement on actions bar, improved join listen only 2016-12-06 13:15:23 -08:00
Oswaldo Acauan
4458c5ae1b Merge branch 'master' into design-improvements 
* master:
  Add important to the hidden rule
  Add missing end parentesis
  Fix style for hidden/aria-hidden attributes
  Flex 4: mostly fix chat input and send button ui
  Flex 4 AIR: switch from png to font icons
  Flex4: AIR transition to common library usage (main, part, chat finished)
 2016-12-06 17:18:49 -02:00
Oswaldo Acauan
e2aaf1690d Fix navbar and actions-bar padding so titles are aligned 2016-12-06 17:17:09 -02:00
KDSBrowne
2c79b353c4 moved all logic out of UI component 2016-12-06 11:15:00 -08:00
Anton Georgiev
7d982caf99 Merge pull request #3490 from oswaldoacauan/fix-hidden-styles 
[HTML5] Fix style for hidden/aria-hidden attributes
 2016-12-06 14:06:56 -05:00
Oswaldo Acauan
d3ac2f4061 Improve chat design based on feedback 2016-12-06 15:30:56 -02:00
Oswaldo Acauan
3155b9a7c5 Improve chat design based on feedback 2016-12-06 15:07:22 -02:00
Oswaldo Acauan
6fdc7d12a1 Refactor the user-list styles to use global variables for margins and paddings 2016-12-06 14:39:48 -02:00
Oswaldo Acauan
4e4023373a Add missing aliases to some emoji icons 2016-12-06 14:39:16 -02:00
Oswaldo Acauan
182516c764 Fix user-list unread counter height 2016-12-06 11:48:30 -02:00
Oswaldo Acauan
3309a1ad95 Improve navbar button hover and focus style 2016-12-06 11:39:48 -02:00
Oswaldo Acauan
f5f859bd55 Fix wrong padding on circular buttons 2016-12-06 11:11:47 -02:00
Oswaldo Acauan
3c21fc533d Update circular buttons padding so they are a circle again ^^ 2016-12-06 11:03:00 -02:00
Oswaldo Acauan
dcea1bacd1 Update font-size of icons on circular buttons 2016-12-06 10:53:32 -02:00
Oswaldo Acauan
1821a2af0b Remove buttons box-shadow 2016-12-06 10:52:51 -02:00
Oswaldo Acauan
d60303782a Fix label font-weight on circular buttons 2016-12-06 10:51:45 -02:00
Oswaldo Acauan
644ae8eccf Update navbar/actions-bar paddings 2016-12-06 10:50:32 -02:00
Oswaldo Acauan
706f8bb9a9 Update danger color 2016-12-06 10:37:22 -02:00
Oswaldo Acauan
00125b7b6a Add important to the hidden rule 2016-12-06 00:28:29 -02:00
KDSBrowne
2605ca6311 cleaned up 2016-12-05 17:37:46 -08:00
Oswaldo Acauan
2693fb4392 Add missing padding on modal styles 2016-12-05 19:15:12 -02:00
Oswaldo Acauan
7971541282 Update emoji icons to reflect the names on the font release v7 2016-12-05 18:49:34 -02:00
Oswaldo Acauan
09f97377a8 Remove extra div from actions-bar 2016-12-05 18:41:24 -02:00
Oswaldo Acauan
4c55ea5732 Match actions-bar and navbar paddings 2016-12-05 18:36:57 -02:00
Oswaldo Acauan
875e96a232 Update BBB icon font to the release v7 2016-12-05 18:27:54 -02:00
Oswaldo Acauan
48a2ecdb15 Improve overall components sizing of the navbar 2016-12-05 18:17:31 -02:00
Oswaldo Acauan
a1cd283ab6 Refactor the navbar title separator to use CSS instead of text 2016-12-05 18:09:03 -02:00
Oswaldo Acauan
60b49971d8 Refactor the recording indicator to use CSS instead of SVG 2016-12-05 18:00:09 -02:00
Oswaldo Acauan
b627f93435 Fix presentation title spacing 2016-12-05 17:26:08 -02:00
Oswaldo Acauan
1a5e309335 Remove unnecessary padding on navbar buttons 2016-12-05 17:16:52 -02:00
Oswaldo Acauan
306fcc9c56 Remove duplicated padding on the navbar 2016-12-05 16:58:40 -02:00
Oswaldo Acauan
cda0d56afd Change the unread messages notification on the toggle button 2016-12-05 16:54:20 -02:00
Oswaldo Acauan
3da2f1c80d Add padding to the media container 2016-12-05 16:21:35 -02:00
Oswaldo Acauan
eb44442808 Add missing end parentesis 2016-12-05 16:12:38 -02:00
gcampes
d9f8cf3cf4 Fix style for hidden/aria-hidden attributes 2016-12-05 16:03:19 -02:00
KDSBrowne
d220c17bba removed component name duplication 2016-12-05 09:07:25 -08:00
KDSBrowne
87ccc5ff84 cleaned up code 2016-12-05 08:21:55 -08:00
JaeeunCho
b57742df79 HTML5-clent scroll on chat - added notification button 2016-12-02 11:47:44 -08:00
JaeeunCho
d673d477e2 Merge remote-tracking branch 'upstream/master' into scroll_v1 2016-12-02 11:30:22 -08:00
Anton Georgiev
cfcd41c5bb Merge pull request #3487 from KDSBrowne/New-Logger-Levels 
New logger levels
 2016-12-01 14:03:04 -05:00
KDSBrowne
bf3a65ccf2 added 'warn' level to production 2016-12-01 10:59:58 -08:00
KDSBrowne
24643f01dd using config file for logger level 2016-12-01 08:15:57 -08:00
KDSBrowne
ae45f86e7d cleaned up css, still needs fixing 2016-12-01 07:32:22 -08:00
KDSBrowne
b766b713a0 broken down into components - need to fix css 2016-11-30 19:37:52 -08:00
KDSBrowne
9187a020d6 Added Antons changes 2016-11-30 08:30:52 -08:00
KDSBrowne
043c3f71cd added logger config and set level 2016-11-30 08:29:13 -08:00
gcampes
f4bc748e56 adds const for time remaining in notifications bar 2016-11-29 14:57:13 -02:00
gcampes
eba3e21e92 Changes handlers for breakouts 2016-11-29 14:52:15 -02:00
gcampes
5089c18ef3 imports underscore, removes prefix not needed in variables 2016-11-29 13:49:08 -02:00
gcampes
903ba22713 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  Removed carriage returns from bigbluebutton.properties
  make function export default
  fix Meteor.Error
  removed duplication
  fixed lint issue
  added suggestions
  removed console logs
  fixed lint issues
  added moderator condition
  Shows main setting options based on role
 2016-11-29 08:25:59 -02:00
gcampes
470b6e08c1 Change breakout code 2016-11-28 17:48:02 -02:00
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
929ac08acb Merge branch 'OpenSettings-Menu-Options' of github.com:KDSBrowne/bigbluebutton into kert-pres-2 2016-11-28 19:17:15 +00:00
KDSBrowne
0fc3883397 removed duplication 2016-11-25 08:07:41 -08:00
gcampes
b3c9d60182 Redo some breakouts code 2016-11-25 14:06:36 -02:00
KDSBrowne
b52d06fd85 fixed lint issue 2016-11-25 05:11:50 -08:00
KDSBrowne
59ded8461e added suggestions 2016-11-24 20:00:46 -08:00
gcampes
f75c73b4e6 Polish breakout rooms code 2016-11-24 17:22:04 -02:00
KDSBrowne
4078337569 removed console logs 2016-11-23 18:12:36 -08:00
KDSBrowne
d580f01efd fixed lint issues 2016-11-23 18:01:51 -08:00
KDSBrowne
525279ecb0 added moderator condition 2016-11-23 17:55:14 -08:00
KDSBrowne
f5d82b8d38 Shows main setting options based on role 2016-11-23 12:01:09 -08:00
gcampes
7001ec59fc Adds correct handling for breakouts update 2016-11-23 14:18:36 -02:00
gcampes
1ba90598f6 Fix timer for breakouts 2016-11-23 14:13:41 -02:00
gcampes
655f8dd6d6 Fix merge conflicts 2016-11-23 13:33:51 -02:00
gcampes
0aa6022c89 Changes breakout code to handle the new message format 2016-11-23 13:32:04 -02:00
Oswaldo Acauan
19a81e1d90 Add visual indicator when someone is talking 2016-11-22 18:26:01 +00:00
Anton Georgiev
fdb4decaf7 cleanup 2016-11-22 16:16:13 +00:00
Anton Georgiev
5635f94789 refactor updateVoiceUser.js 2016-11-22 16:15:42 +00:00
gcampes
e14c9159df Fix breakout closing issues 2016-11-22 13:46:08 -02:00
Anton Georgiev
462d72afa0 handle talking event in html5 2016-11-22 15:06:54 +00:00
JaeeunCho
c7e43f2b77 HTML5-clent scroll on chat - changed to display messages automatically 2016-11-21 15:02:12 -08:00
Anton Georgiev
8442a4bda0 cleanup 2016-11-21 21:10:20 +00:00
Anton Georgiev
d3ec5c187a play audio file to test speakers/audio output 2016-11-21 21:06:19 +00: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
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
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
gcampes
9f478416c5 Fix html changing the breakout room url for flash 2016-11-18 15:14:00 -02: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
Gabriel Carvalho de Campes
7cdf04dd66 update clear for meetings, adds breakouts 2016-11-17 13:20:40 -02:00
Gabriel Carvalho de Campes
f9cc5d5873 remove debug code 2016-11-16 15:46:30 -02:00
Gabriel Carvalho de Campes
85013eac1f Fix issues from merge 2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
dad3c1a4c7 Merge conflicts 2016-11-16 13:35:39 -02: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
694e300d55 Polish breakout code 2016-11-14 16:23:04 -02:00
Gabriel Carvalho de Campes
27a8223efc fix .meteor changes 2016-11-14 14:57:39 -02:00
Gabriel Carvalho de Campes
214357adc6 Fix conflicts 2016-11-14 14:54:04 -02:00
Gabriel Carvalho de Campes
4b489df410 update html en locale for breakout rooms 2016-11-14 14:42:09 -02:00
Gabriel Carvalho de Campes
cf7ec18033 revert changes to meteor modules 2016-11-14 14:13:56 -02:00
Gabriel Carvalho de Campes
eb3705321f polish breakout room code html5 2016-11-14 14:12:54 -02:00
Gabriel Carvalho de Campes
3f53620416 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master: (22 commits)
  - create only one netConnection to bbb-apps. Not re-create one when reconnecting.
  - log client out when user is ejected from meeting.
  - reset connectAttemptTimeout as we don't want to fail connection on reconnects.
  - fix rtmpt
  - add more logging to track issues
  Update Gemfile.lock for 1.1-dev
  - log locale version
  - remove user join log
  improve logs for webrtc events
  - improve client side logging.
  add EN string to ClientStatusEvent
  Updated restart of libreoffice for systemd
  - add log to indicate successful connection to bbb-apss
  bbb-web: Escaped strings used in freemarker template for thumbnails
  record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
  Fix import in stunturn reply handler
  Fix handleStunTurnReply function name
  Clean up before PR
  Rever wrong changes on chat handler parameters
  Revert wrong changes on chat handler name
  ...
 2016-11-14 10:00:42 -02:00
Gabriel Carvalho de Campes
39dffd68b4 Update breakout rooms in html5 2016-11-14 09:57:10 -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
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02: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
Gabriel Carvalho de Campes
e8974fe929 Add initial file structure for breakouts api 2016-10-27 15:47:40 -02: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
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
43d9d12e7f remove .trash added in last commit 2016-10-21 16:58:47 -02: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
3923cf4073 Add debug message when handler is completed with errors 2016-10-21 16:29:22 +00:00
Oswaldo Acauan
c7b62a209c Refactor Meeting API 2016-10-21 16:27:47 +00:00