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

1571 Commits

Author SHA1 Message Date
Gabriel Carvalho de Campes
5f8ce76e1e Removes white line from app service 2016-09-12 17:28:57 -03:00
Gabriel Carvalho de Campes
1ae62c52ca Changes callback handler for show and hide on dropdown component 2016-09-12 17:19:03 -03:00
Gabriel Carvalho de Campes
60d545d434 Removes comment from app service 2016-09-12 17:18:36 -03:00
Gabriel Carvalho de Campes
ce04e64ee8 Merge remote-tracking branch 'upstream/master' into compact-userlist 
* upstream/master:
  add colour notification to caption tab when locale is switched
  Added "getBreakoutRoomInListen" method in Conference.as
  Switch moderator back to the main audio conference when close all breakout rooms button is clicked.
  HTML5 Dropdown - fixed warnings and added style
  Invite participants to existing breakout rooms.
 2016-09-12 17:12:54 -03:00
Gabriel Carvalho de Campes
f4c8282ebf Changes dropdown for actions on userlist 2016-09-12 17:12:20 -03:00
Gabriel Carvalho de Campes
edee8f5097 Removes capitalize from chat title 2016-09-12 17:11:37 -03:00
Gabriel Carvalho de Campes
ab7f31e8b6 Changes to dropdown component 2016-09-12 17:11:03 -03:00
Gabriel Carvalho de Campes
2b0cdfe6f9 Changes actions to use new dropdown WIP 2016-09-07 17:25:46 -03:00
JaeeunCho
9b594e8a52 HTML5 Dropdown - fixed warnings and added style 2016-09-07 12:17:15 -07:00
Gabriel Carvalho de Campes
af4167c480 merge conflicts 2016-09-07 14:14:49 -03:00
Oswaldo Acauan
0d06f98266 Fix SPACE/ENTER behavior 2016-09-07 14:43:54 +00:00
Gabriel Carvalho de Campes
c5ca8188a0 Change user-list-item css 2016-09-07 14:41:31 +00:00
Oswaldo Acauan
c92de43d73 Fix wrong behavior with ENTER/SPACE 2016-09-07 12:04:10 +00:00
Oswaldo Acauan
9b12853a67 Fix wrong behavior with TAB 2016-09-07 11:55:50 +00:00
Oswaldo Acauan
942e16951d Remove unused constructor 2016-09-06 19:29:04 +00:00
Oswaldo Acauan
4cef1e85b4 Remove duplicated component 2016-09-06 19:27:02 +00:00
Oswaldo Acauan
86896983c9 Merge remote-tracking branch 'upstream/master' into presentation-upload 
* upstream/master: (30 commits)
  User in not redirected automatically to the logoutURL.
  Fix errors in recording scripts.
  - fix issue where client cannot join using rtmpt
  Remove a few matterhorn references that were missed.
  Update the Gemfile.lock file to match gem changes
  Improve wave length guessing
  Remove a bunch of unused/old audio processing code.
  Drop streamio-ffmpeg from required gems
  Drop old/broken matterhorn script, and old video processing code.
  fix exception with cc localeCode vs. code
  - do not recycle http connection. Use a fresh one for each request to prevent exception    when reusing old connection.
  - comment out record option for breakout rooms pending further testing.
  - change jws failed to start timeout from 60s to 90s. Sometimes it takes about    30s to download the libs especially for those far from the server or those with    slow connection.
  - custom poll was sent to the wrong actor. Route it to the correct meeting actor.
  - propagate meeting metadata from parent to breakout room
  add a fourth help image for mac screenshare
  add property to closed caption transcript model for the locale code
  Added more explanation for Mac FireFox in screenshare-help.html
  - do not display the "Record" label.
  Hide breakout rooms checkbox.
  ...
 2016-09-06 19:10:31 +00:00
Oswaldo Acauan
d88d566d55 Fixes and improvements on the Dropdown and Modal components 2016-09-06 19:10:18 +00:00
Gabriel Carvalho de Campes
a7c13c8378 positions the dropdown in the correct position for the user actions 2016-09-01 20:30:11 +00:00
Oswaldo Acauan
82eaf3b663 Change dropdown component 2016-09-01 20:19:37 +00:00
Oswaldo Acauan
3de6ae4fc5 Rewrite leave session modal to the new modal component 2016-09-01 16:29:51 +00:00
Oswaldo Acauan
249dd85f92 Move old settings modal to the new component 2016-09-01 13:56:41 +00:00
Oswaldo Acauan
7a33f9ee67 Remove unused modal logs 2016-08-31 19:53:40 +00:00
Oswaldo Acauan
9a9b74665f Add new modal component 2016-08-31 19:52:17 +00:00
Anton Georgiev
2e82f33dd7 Merge pull request #3333 from antobinary/html5-audio 
html5client: removed a package depencency; adjustments for Meteor 1.4.1.1; removed an error log
 2016-08-31 13:10:25 -04:00
Oleksandr Zhurbenko
51eb78c38f Submenu for closed captions, initial commit 2016-08-29 19:13:53 -07:00
Anton Georgiev
349b216928 omit hiredis package; cleanup 2016-08-29 21:34:03 +00:00
Oleksandr Zhurbenko
44c79ffcc3 Removed unused code and fixed linter warnings 2016-08-26 12:41:43 -07:00
Matthew Marangoni
cd842e0346 merged to upstream 2016-08-25 12:23:09 -07:00
Anton Georgiev
899a6de14b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-audio 2016-08-25 18:19:07 +00:00
Anton Georgiev
7f77f5835b apply 1.4.1.1 patch 2016-08-25 18:17:25 +00:00
Matthew Marangoni
43f7369806 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-25 11:12:40 -07:00
Gabriel Carvalho de Campes
2b81f071cd Merge branch 'userlist-compact-mode' into compact-userlist 
* userlist-compact-mode:
  finishes initial ui for the compact userlist
  adds some compact states in the userlist
 2016-08-25 17:57:30 +00:00
Gabriel Carvalho de Campes
1d8f859e74 finishes initial ui for the compact userlist 2016-08-25 17:50:37 +00:00
Anton Georgiev
826c6e55bd Merge pull request #3323 from antobinary/html5-audio 
HTML5client: rework start.sh; fix for environment selection; fix ._id undefined bug
 2016-08-25 13:28:34 -04:00
Anton Georgiev
a4dc2301a0 fix bug related to change presentation 2016-08-25 15:57:31 +00:00
Matthew Marangoni
0697e3a753 fixed some height/padding/margin issues in submenus 2016-08-25 08:46:22 -07:00
Jaeeun Cho
926387ce63 HTML5 dropdown for settings menu - modify aria-labelledby and aria-describedby for each menus 2016-08-25 07:34:27 -07:00
Anton Georgiev
e1cec10670 clean up 2016-08-24 23:13:42 +00:00
Matthew Marangoni
526923c59e renamed all settings modal files to match conventions 2016-08-24 16:00:38 -07:00
Anton Georgiev
bc79cd0452 rework start.sh so it picks up NODE_ENV 2016-08-24 22:59:18 +00:00
Anton Georgiev
cf45e2ab96 remove obsolete package version and environment path 2016-08-24 22:50:57 +00:00
Jaeeun Cho
c04c71695a HTML5 dropdown for settings menu - modify accessibility for each menus 2016-08-24 13:25:27 -07:00
Jaeeun Cho
8f70d252f2 HTML5 dropdown for settings menu - changing directory structure 2016-08-24 12:22:05 -07:00
Gabriel Carvalho de Campes
39b4b9676a adds some compact states in the userlist 2016-08-24 18:56:06 +00:00
Jaeeun Cho
724f61ba9b HTML5 dropdown for settings menu 2016-08-24 10:49:57 -07:00
Jaeeun Cho
a838926485 Merge remote-tracking branch 'upstream/master' into dropdown 2016-08-24 08:13:44 -07:00
Matthew Marangoni
aa533468f9 fixed scss import relative paths 2016-08-24 08:06:51 -07:00
Matthew Marangoni
f0a5c550a7 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-24 07:37:54 -07:00
Laily Ajellu
401a529450 HTML5 - removes config.js and removes a package not needed anymore from .meteor/packages 2016-08-24 07:23:50 -07:00
Jaeeun Cho
8eddccc66c HTML5 dropdown for settings menu 2016-08-24 07:17:30 -07:00
Laily Ajellu
361ce7f19f HTML5 - adds captions to config file 2016-08-23 16:48:11 -07:00
Laily Ajellu
f0cdbfaf2e Fixed merge conflicts 2016-08-23 16:45:28 -07:00
Jaeeun Cho
426d7baba7 html5-client dropdown settings menu 2016-08-23 15:19:13 -07:00
Laily Ajellu
2105e911ef HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js 2016-08-23 14:35:28 -07:00
Jaeeun Cho
0eca848647 Dropdown with dropdown_v3 branch 2016-08-23 12:18:49 -07:00
Matthew Marangoni
00ff50112e removed all inline css and css hidden class for screen readers 2016-08-23 11:04:49 -07:00
Laily Ajellu
ce50f58c36 HTML5 - removes old settings and changes setting dependant files 2016-08-23 07:35:06 -07:00
Jaeeun Cho
0605c61ba7 Merge remote-tracking branch 'upstream/master' into dropdown_v3 2016-08-23 07:10:50 -07:00
Jaeeun Cho
add3cb0d9a Dropdown with dropdown_v3 branch 2016-08-23 07:05:54 -07:00
Oleksandr Zhurbenko
7054b36721 Minor corrections 2016-08-22 08:34:46 -07:00
Oleksandr Zhurbenko
ab975cd9b7 Changed update to upsert for the cursor updates 2016-08-20 20:30:38 -07:00
Oleksandr Zhurbenko
576a8b287f Added a check for cursor data 
Since it is undefined sometimes
 2016-08-20 19:59:32 -07:00
Oleksandr Zhurbenko
da70d2cd89 Changed CC's split limit to 1,000 characters 2016-08-20 19:57:28 -07:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
f64ed1fd4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning 2016-08-20 16:37:11 -07:00
Oleksandr Zhurbenko
ad5121106f Meteor 1.4.1 2016-08-20 16:28:03 -07:00
Oleksandr Zhurbenko
993b7d2ca2 Added handling for edit_caption_history_message 2016-08-19 21:25:43 -07:00
Oleksandr Zhurbenko
df9b79e52d Fixed a bug with collapsing whitespaces 2016-08-19 21:23:46 -07:00
mmarangoni
72e11bf94f fixed min height, destructured focus method, minor text fixes 2016-08-19 14:58:52 -07:00
Jaeeun Cho
47f1447bc4 Dropdown with dropdown_v2 branch 2016-08-19 17:20:17 -04:00
Lajellu
19ff007adb Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup 2016-08-19 14:08:46 -07:00
Lajellu
dedaa4e7aa Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-19 13:50:14 -07:00
Jaeeun Cho
8a32f61f2f Dropdown with dropdown_v2 branch 2016-08-17 16:03:22 -04:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
Jaeeun Cho
7ac2a83575 Dropdown with dropdown_v2 branch 2016-08-15 15:44:20 -04:00
Oswaldo Acauan
e5c29a9bec Change operations order to prevent currentSlide being undefined 2016-08-15 19:25:36 +00:00
Jaeeun Cho
a113774369 Dropdown with dropdown_v2 branch 2016-08-15 13:26:22 -04:00
Jaeeun Cho
8e47a5f937 dropdown _v2 2016-08-11 16:05:26 -04:00
Oleksandr Zhurbenko
bce22aba4e Fixed bugs related to retrieving the data on the client side 2016-08-09 15:35:16 -07:00
Oleksandr Zhurbenko
33359acc52 Creating a new empty captions object when a moderator takes ownership over the locale 2016-08-09 12:29:11 -07:00
Oleksandr Zhurbenko
76574be9c2 Fixed a bug with adding an empty initial captions object 2016-08-09 12:25:49 -07:00
Oswaldo Acauan
1dd5aa8ec5 Revert wrong config 2016-08-09 19:23:01 +00:00
Oswaldo Acauan
3a16921a49 Fix typo 2016-08-09 19:22:23 +00:00
Oswaldo Acauan
390d00015e Add notification bar and show notification for bad connection status 2016-08-09 16:28:49 +00:00
Richard Alam
dcd226dc9f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2016-08-09 14:26:40 +00:00
mmarangoni
2ea5968146 Added comments for various functions 2016-08-09 07:18:31 -07:00
Oleksandr Zhurbenko
10272d5317 Changed the way of how we iterate through captions' collection 2016-08-08 14:45:09 -07:00
perroned
a9a448bbdf Removes verto configs from html5 client 2016-08-08 18:32:06 +00:00
Oleksandr Zhurbenko
d51d0ed3c5 Removed an unused dependency and updated Meteor to 1.4.0.1 2016-08-05 19:03:08 -07:00
Jaeeun Cho
8beec9df6b change Session Leave at SettingsModal 2016-08-05 17:52:04 -04:00
Jaeeun Cho
76d42f2c8c add Session Leave at SettingsModal 2016-08-05 17:36:49 -04:00
Jaeeun Cho
2b4076493c Merge remote-tracking branch 'upstream/master' into dropdown for settings 2016-08-05 17:29:51 -04:00
Jaeeun Cho
a097afe8a0 add dropdown menu for settings 2016-08-05 17:05:15 -04:00
Lajellu
33061b3a01 HTML5 slide controls: chgs zoomForm to zoomWrapper and adds a min width to zoomWrapper 2016-08-05 13:40:34 -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
mmarangoni
916d3f4b92 Linting for settings modal 2016-08-05 12:21:35 -07:00
Lajellu
41019e81a9 HTML5 slide controls 'order' attribute moved to a higher line 2016-08-05 12:13:37 -07:00
perroned
fc8438f61a move some data into verto JS 2016-08-05 18:42:02 +00:00
Lajellu
12ec76d375 Fixes slide control PR comments 2016-08-05 11:39:24 -07:00
mmarangoni
c141576ef7 Merge remote-tracking branch 'upstream/master' into html5test 2016-08-05 09:26:18 -07:00
mmarangoni
5ab7f7127b Fixed focus when tabbing or shift-tabbing to menu 2016-08-05 09:01:32 -07:00
perroned
c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
 2016-08-04 18:23:45 +00:00
Lajellu
219078f49d adds slide controls and new bbb icons 2016-08-02 15:55:20 -07:00
Lajellu
565150b382 Merge remote-tracking branch 'upstream/master' into presentationControls 2016-08-02 15:38:28 -07:00
Oswaldo Acauan
6f9c4219ad Fix typo 2016-07-28 19:57:42 +00:00
Oswaldo Acauan
afe1a66e02 Fix conflicts and merge master 2016-07-28 19:50:44 +00:00
Oswaldo Acauan
da70b92c9d Add missing files 2016-07-28 19:49:16 +00:00
Oswaldo Acauan
b8e4a2692c Add handlers for kick 2016-07-28 19:48:26 +00:00
Oleksandr Zhurbenko
79c06588e3 Updated update_caption_owner_message 
So that owner_id could be updated in  multiple objects
 2016-07-28 11:53:13 -07:00
Oleksandr Zhurbenko
1fd07f9265 Updated indirect dependencies 2016-07-27 15:47:08 -07:00
mmarangoni
efaf05a27e fixed up/down/space/enter keypress events 2016-07-27 15:33:32 -07:00
Oleksandr Zhurbenko
d510907179 Upgraded Meteor to 1.4 2016-07-27 14:50:35 -07:00
perroned
8c7fdc0036 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/prod/lib/verto_extension.js
 2016-07-27 19:32:01 +00:00
Anton Georgiev
a1fde6ae12 add httpS flag in config instead of detecting prod vs dev env 2016-07-27 16:36:33 +00:00
Oleksandr Zhurbenko
ed51c99803 Adjusted view to the new CC data format 2016-07-26 16:05:22 -07:00
Lajellu
bd46e8c2ff adds new icons 2016-07-26 14:28:58 -07:00
Lajellu
1ead9ced59 adds presentation controls 2016-07-26 13:56:43 -07:00
Oswaldo Acauan
2c93c41fc5 Update handler payload check 2016-07-26 18:50:18 +00:00
Anton Georgiev
860916efc1 refactor 2 cases 2016-07-26 17:47:36 +00:00
Anton Georgiev
3e070872cf fix issue with slide calc under https 2016-07-26 17:33:35 +00:00
Oleksandr Zhurbenko
6c7cb5a65b Changed the way we store captions on the initial history retrieving 2016-07-25 16:33:33 -07:00
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07:00
perroned
a22b21f61b Merge remote-tracking branch 'anton/fix-webrtc-deskshare' into join-components-with-skeleton 2016-07-22 19:36:19 +00:00
perroned
2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-07-22 19:20:00 +00:00
Oleksandr Zhurbenko
a3fa660bc5 Removed unused code 2016-07-22 11:47:54 -07:00
perroned
c1abe4ac4f Fixes renamed function 2016-07-22 17:31:35 +00:00
Anton Georgiev
a4d173c1a4 fix missing lib for video-broadcast 2016-07-22 15:54:03 +00:00
Oleksandr Zhurbenko
c5c0f32df6 Handling all messages related to closed-captions 
send_caption_history_reply_message , update_caption_owner_message , edit_caption_history_message
 2016-07-21 18:27:26 -07:00
Oswaldo Acauan
34fedc8e46 Fix user-list toggle 2016-07-21 14:24:50 +00:00
Oleksandr Zhurbenko
331ad1e3c4 Fixed a bug when we couldn't retrieve the initial Chat history 
Happened when meeting and chat messages appeared before the Meteor joined
 2016-07-18 10:42:53 -07:00
Lajellu
f1d79376ee Fixes Cursor propTypes 2016-07-18 08:30:04 -07:00
Oleksandr Zhurbenko
3ecf387297 Updated packages to get rid of warnings in CssTransitionGroup 2016-07-15 16:16:49 -07:00
Lajellu
1acdc0a13b Adds cursor xy tracking 2016-07-15 13:50:03 -07:00
Oleksandr Zhurbenko
9b85629f2c Initial handling of the 'update_caption_owner_message' 2016-07-14 13:55:49 -07:00
Anton Georgiev
6a984c2b68 adding captions support in html5 (part1) 2016-07-14 12:03:30 -07:00
Oswaldo Acauan
a32617cf65 Remove unused import/prop 2016-07-12 14:04:39 +00:00
Oswaldo Acauan
d804f0d217 Add .meteor/dev_bundle to gitignore 2016-07-12 14:03:13 +00:00
Oswaldo Acauan
306ef94237 Fix conflicts 2016-07-12 14:02:48 +00:00
Anton Georgiev
51ccf1ddfc Merge pull request #3211 from OZhurbenko/issue-3206 
Minor fixes
 2016-07-12 09:52:38 -04:00
Anton Georgiev
bbaff47d2b Merge pull request #3210 from Gcampes/user-avatar-changes 
Update on user avatar and user item
 2016-07-12 09:52:12 -04:00
Oswaldo Acauan
584a772983 Remove Meteor dev_bundle 2016-07-11 20:20:07 +00:00
Oswaldo Acauan
8fcc5d87a7 Merge branch 'master' into feature-chat 
* master:
  Hide webcam component
 2016-07-11 20:18:32 +00:00
Oswaldo Acauan
97389d7edf Fix React warnings for unknown props 2016-07-11 20:10:55 +00:00
Oswaldo Acauan
2d1b9ede84 Minor fixes 2016-07-11 19:42:54 +00:00
Oleksandr Zhurbenko
8c37e10ee0 Set a viewport 2016-07-11 12:10:30 -07:00
Oswaldo Acauan
6760723565 Prevent useless rerenders on MessageList 2016-07-11 18:22:06 +00:00
Gabriel Carvalho de Campes
94c10c9ed0 Fix muted status dash sizing 2016-07-11 18:20:24 +00:00
Matthew Marangoni
937b38c303 starting keydown events 2016-07-11 10:43:42 -07:00
Matthew Marangoni
a37799f19f Merge remote-tracking branch 'upstream/master' into html5test 
Conflicts:
	bigbluebutton-html5/imports/ui/components/modals/settings/SettingsModal.jsx
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/SessionMenu.jsx
 2016-07-11 10:37:00 -07:00
Gabriel Carvalho de Campes
2622126482 change the size of the avatar status indicators 2016-07-11 17:25:16 +00:00
Oswaldo Acauan
0f77c8fa13 Change reduce/map order on chat service 2016-07-11 17:12:01 +00:00
Oswaldo Acauan
b70b724d99 Change reduce/map order on chat service 2016-07-11 17:07:35 +00:00
Matthew Marangoni
8175ecef2f Added aria and tabbing features 
- All pages in the settings modal now contain aria labels and descriptions
- Tabbing has been fixed and is now contained within the settings modal
- Tab order has been correct
- Menu's and submenus changed to container-style instead of lists
- Fixed scrolling issue caused by resize buttons in Application submenu
- aria roles have been added to all submenus
 2016-07-11 10:01:09 -07:00
Oswaldo Acauan
ee2ca176b3 Refactor services to classes 2016-07-11 16:28:55 +00:00
Oleksandr Zhurbenko
8947f732b3 Restructuring 2016-07-11 08:49:26 -07:00
Oswaldo Acauan
9b53090c81 Change Auth service to be a singleton class 2016-07-11 13:45:24 +00:00
Oswaldo Acauan
0b8bca049c Hide webcam component 2016-07-11 10:13:55 -03:00
Oswaldo Acauan
aa154e5b63 Merge after git conflict/lost object 2016-07-11 12:35:08 +00:00
Oswaldo Acauan
1c0132ed5b Merge after git conflict/lost object 2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
87c4ee98ea Added a white background for the slide 
Since it is transparent for some SVG files
 2016-07-09 14:42:33 -07:00
Oleksandr Zhurbenko
bcfa3d41ec Linting 2016-07-08 16:13:26 -07:00
Oleksandr Zhurbenko
7948571525 Added support for png and check to see if the image is ready 
resolves #3206
 2016-07-08 16:11:52 -07:00
Gabriel Carvalho de Campes
0dd7f3811c Separates user status in avatar 2016-07-08 19:09:16 +00:00
Gabriel Carvalho de Campes
1dde9f25e8 Merge remote-tracking branch 'origin/master' into user-avatar-changes 
* origin/master:
  Remove unused imports
  upgrade sip.js to 0.7.5
  Moved polling files back to components folder
  Adds link to meteor issue on comment, remove unused import
  Remove logs, and add some removed code back
  Changes Router in order for the livereloading to work again
  Fixed a small issue with reduce() in the poll annotation
  Made polling buttons accessible
  try to fix the reload issue
  Updated packages and fixed some of the warnings introduced by React 15.2.0
  Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
  Centering polling buttons
  Title and calculated styling for the polling UI
  Replaced polling under the whiteboard
  fixes html5 clinet logout and nav-bar
  fixes html5 clinet logout and nav-bar
  fixes html5 clinet logout and nav-bar
  fixes html5 clinet logout and nav-bar
 2016-07-08 12:40:25 +00:00
Gabriel Carvalho de Campes
352011e92c Remove unused imports 2016-07-08 12:22:49 +00:00
Gabriel Carvalho de Campes
537d8753fe Merge remote-tracking branch 'origin/master' into router-changes 
* origin/master:
  upgrade sip.js to 0.7.5
  Moved polling files back to components folder
  Fixed a small issue with reduce() in the poll annotation
  Made polling buttons accessible
  Updated packages and fixed some of the warnings introduced by React 15.2.0
  Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
  Centering polling buttons
  Title and calculated styling for the polling UI
  Mark open chat as active
  Remove some old code
  Changes the way user actions are rendered
  Replaced polling under the whiteboard
  Solve issues from github comments
  Remove color-generator because it is not being used
  polish code
  Updates the userlist

Conflicts:
	bigbluebutton-html5/imports/ui/components/app/container.jsx
 2016-07-08 11:59:05 +00:00
Anton Georgiev
107e49caba Merge pull request #3202 from OZhurbenko/polling-ui 
HTML5 Polling UI
 2016-07-07 17:24:59 -04:00
Oswaldo Acauan
b33e26a43d Improve chat form events 2016-07-07 18:52:21 +00:00
Oswaldo Acauan
03aa1aada3 Fix some chat styles 2016-07-07 18:16:08 +00:00
Oleksandr Zhurbenko
3522e1039e Moved polling files back to components folder 2016-07-07 10:08:26 -07:00
Oswaldo Acauan
930f92932d Add chat notification for unread messages 2016-07-07 16:51:55 +00:00
Gabriel Carvalho de Campes
6c4eae35bb Adds link to meteor issue on comment, remove unused import 2016-07-07 16:15:12 +00:00
Gabriel Carvalho de Campes
e8f1a877c4 Remove logs, and add some removed code back 2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes
ac3353d855 Changes Router in order for the livereloading to work again 2016-07-07 14:01:40 +00:00
Oswaldo Acauan
dad812aa5d Add unread messages service 2016-07-07 12:50:32 +00:00
Oswaldo Acauan
782ef206d9 Change Storage services to be Reactive 2016-07-07 12:50:07 +00:00
Oleksandr Zhurbenko
6266da7ccd Fixed a small issue with reduce() in the poll annotation 2016-07-06 12:38:13 -07:00
Oleksandr Zhurbenko
92db94099d Made polling buttons accessible 2016-07-05 14:49:31 -07:00
Gabriel Carvalho de Campes
7f8f4417e4 try to fix the reload issue 2016-07-05 18:59:18 +00:00
Gabriel Carvalho de Campes
5bb53547a9 Changes the avatar component 2016-07-05 16:54:45 +00:00
Oswaldo Acauan
d1f2614d00 Fix merge conflicts 2016-07-05 16:50:14 +00:00
Oswaldo Acauan
4e85501768 Fix unread notification 2016-07-05 16:47:40 +00:00
Oswaldo Acauan
a4fcfd2275 Add tip for unread chat messages 2016-07-05 13:34:13 +00:00
Oleksandr Zhurbenko
4bd63fd79f Updated packages and fixed some of the warnings introduced by React 15.2.0 2016-07-04 17:06:18 -07:00
Gabriel Carvalho de Campes
d1cb48768a Adds colored avatars to the userlist 2016-07-04 20:44:29 +00:00
Oswaldo Acauan
3b1c0328c2 Add chat unread messages functionality 2016-07-04 18:53:47 +00:00
Oswaldo Acauan
55538202d6 Change chat message timestamp from string to int 2016-07-04 18:34:36 +00:00
Anton Georgiev
0ca61cd105 Merge pull request #3191 from Gcampes/userlist-update 
Show open chats and user actions
 2016-07-04 09:52:26 -04:00
Oswaldo Acauan
f6a250b716 Add multiple storages 2016-07-04 13:44:17 +00:00
Oleksandr Zhurbenko
93e4f3e66c Centering polling buttons 2016-06-30 15:26:42 -07:00
Oleksandr Zhurbenko
f26ab0ac52 Title and calculated styling for the polling UI 2016-06-30 15:21:46 -07:00
Oswaldo Acauan
852545665d Add chat scroll position history 2016-06-30 17:10:36 +00:00
Gabriel Carvalho de Campes
a62d520ef6 Mark open chat as active 2016-06-30 14:45:19 +00:00
Gabriel Carvalho de Campes
fedbbee910 Remove some old code 2016-06-30 13:02:34 +00:00
Gabriel Carvalho de Campes
b50fd3d080 Changes the way user actions are rendered 2016-06-30 13:01:02 +00:00
Oleksandr Zhurbenko
83fff53269 Replaced polling under the whiteboard 2016-06-29 15:00:06 -07:00
Gabriel Carvalho de Campes
50e5bdf62f Solve issues from github comments 2016-06-29 14:24:27 +00:00
Gabriel Carvalho de Campes
76e98d2ae5 Remove color-generator because it is not being used 2016-06-29 14:09:23 +00:00
Gabriel Carvalho de Campes
445849217b Merge remote-tracking branch 'upstream/master' into userlist-update 
* upstream/master:
  Changed 'let' to 'const' where it was possible and adjusted imports
  Fixed a bug with Polls deletion from all meetings
  Fixed all the 120+ linter warnings
  Fixed a bug with the deletion of the Poll

Conflicts:
	bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
 2016-06-28 19:55:31 +00:00
Gabriel Carvalho de Campes
a4d0f691dd polish code 2016-06-28 19:52:03 +00:00
Jaeeun Cho
9eacf32497 fixes html5 clinet logout and nav-bar 2016-06-28 15:30:43 -04:00
Jaeeun Cho
eded89d5f0 fixes html5 clinet logout and nav-bar 2016-06-28 14:50:44 -04:00
Oswaldo Acauan
a70ec42c6e Fix styles for big messages 2016-06-28 16:18:37 +00:00
Gabriel Carvalho de Campes
6e88731ebc Updates the userlist 2016-06-28 13:10:20 +00:00
Oleksandr Zhurbenko
390935e304 Changed 'let' to 'const' where it was possible and adjusted imports 2016-06-27 14:48:46 -07:00
Oswaldo Acauan
d2e8d3d954 Improve auto-scroll behaviour 2016-06-27 19:00:10 +00:00
Oleksandr Zhurbenko
3d0132685f Fixed a bug with Polls deletion from all meetings 
Which happened when we published a poll, cleared a collection, and then received a poll_stopped_message
 2016-06-27 11:30:37 -07:00
Oleksandr Zhurbenko
8b4747a89d Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
Oleksandr Zhurbenko
40cedc28bc Fixed a bug with the deletion of the Poll 
It was always undefined here
 2016-06-27 09:31:15 -07:00
Oleksandr Zhurbenko
2b4aced77d Fixed naming according to the BBB's style guide 2016-06-27 07:48:17 -07:00
Jaeeun Cho
3d36d3fed2 fixes html5 clinet logout and nav-bar 2016-06-24 19:09:32 -04:00
Oleksandr Zhurbenko
29e8524de0 Polishing 2016-06-24 14:30:37 -07:00
Jaeeun Cho
991034b5bf Merge remote-tracking branch 'upstream/master' into logOut 2016-06-24 10:48:52 -04:00
Jaeeun Cho
3325ac4974 fixes html5 clinet logout and nav-bar 2016-06-24 10:48:09 -04:00
Oleksandr Zhurbenko
1e694b2a01 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 2016-06-23 13:55:40 -07:00
Oleksandr Zhurbenko
6920d8b2a6 Added a check for unknown shape types 2016-06-22 15:58:28 -07:00
Oleksandr Zhurbenko
22ab079f5c Optimized polling strings and centered the strings 2016-06-22 15:20:08 -07:00
Oleksandr Zhurbenko
04e2e940c0 Fixed a but with inherited margin in Firefox 2016-06-22 15:17:31 -07:00
Oleksandr Zhurbenko
bca7b8c005 Added Polling shape functionality 2016-06-21 16:19:39 -07:00
perroned
c1e0605852 Simplfy watch video initiation 2016-06-21 17:38:28 +00:00
Anton Georgiev
4195905c2b change audio to default to SIP 2016-06-21 15:34:10 +00:00
perroned
0ab36e8ec3 Cleaning up 2016-06-20 15:59:48 +00:00
Jaeeun Cho
73c9898698 fixes html5 clinet logout and nav-bar 2016-06-17 18:15:11 -04:00
perroned
86035fce39 Adds verto manager window functions 2016-06-17 17:47:24 +00:00
Oswaldo Acauan
406c55f1c2 Fix renderCircle and add hideLabel prop 2016-06-17 16:42:17 +00:00
Oleksandr Zhurbenko
0d1ad108f0 Fixed polling for the HTML5 viewers 2016-06-15 14:04:25 -07:00
perroned
a95ed82293 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-06-15 20:07:42 +00:00
Oleksandr Zhurbenko
9bd1d6f15a Moved check for polling to AddShapeToCollection 
So that it worked for both get_whiteboard_shapes_reply and send_whiteboard_shape_message
 2016-06-15 11:09:05 -07:00
Oleksandr Zhurbenko
0ad772345a Removed unused properties 2016-06-14 13:02:37 -07:00
Oleksandr Zhurbenko
a0bfbe8433 Added Text shape functionality 2016-06-14 13:01:11 -07:00
Anton Georgiev
dddcc064cb Merge pull request #3171 from oswaldoacauan/feature-chat-2 
User List Sorting & Chat Lock
 2016-06-14 12:50:20 -04:00
perroned
e9fd499851 Readding verto sharing 2016-06-14 16:11:04 +00:00
Richard Alam
59fca31316 Merge pull request #3175 from antobinary/fix-meetings-querry 
Fix querrying for existing meetings for html5 client
 2016-06-14 10:13:39 -04:00
Anton Georgiev
7fb2184c02 fix querry for existing meetings 2016-06-13 21:39:31 +00:00
Oswaldo Acauan
62e2005eef Add /check endpoint for HTML5 client 2016-06-13 14:56:41 -03:00
Oswaldo Acauan
6414d6358a Remove debug messages 2016-06-13 14:15:15 -03:00
Oswaldo Acauan
6b8da33c29 Merge branch 'master' into feature-chat-2 
* master:
  - improve webstart searching time for native libraries
  Fix button className inheritance
 2016-06-13 14:05:05 -03:00
Oswaldo Acauan
5474591552 Change localStorage to sessionStorage 2016-06-13 14:00:57 -03:00
Oswaldo Acauan
76b8aca4bb Add lock behavior to HTML5 chat 2016-06-13 14:00:38 -03:00
Oleksandr Zhurbenko
2ff5afd056 Fixed issues with adding and updating Text shape objects to the db 2016-06-10 10:39:47 -07:00
Oleksandr Zhurbenko
7f845ed8d9 Added clippath, so that users can't see anything outside of the viewBox 2016-06-09 12:00:44 -07:00
Oleksandr Zhurbenko
12eff5d568 Added Rectangle shape functionality 2016-06-09 11:58:41 -07:00
perroned
c2702522ca Upgrades html5 client for new verto code 2016-06-08 20:09:43 +00:00
Oleksandr Zhurbenko
2a46f618f5 Added Triangle shape functionality 2016-06-08 10:13:25 -07:00
Oleksandr Zhurbenko
17dcbd7bfe Added Pencil shape functionality 2016-06-08 10:12:24 -07:00
Oleksandr Zhurbenko
2f359d80ae Rounded the Line shape endings 2016-06-07 11:33:31 -07:00
Oleksandr Zhurbenko
cdf00b6faf Fixed linter warnings and a bug with the thickness while zooming in 2016-06-07 11:30:44 -07:00
Oleksandr Zhurbenko
fbe6a4ca36 Added zoom and pan 2016-06-07 11:08:25 -07:00
Oswaldo Acauan
9803f55fda Fix user-list sorting on phone users case 2016-06-07 13:46:24 -03:00
Oswaldo Acauan
c11447cc62 Fix button className inheritance 2016-06-07 11:33:22 -03:00
Oswaldo Acauan
23a5045cec Add disable property for chat form 2016-06-07 11:19:19 -03:00
Oswaldo Acauan
cdb137091d Improve user-list sorting 2016-06-07 10:58:51 -03:00
Matthew Marangoni
6b18f8192b Added styles file 2016-06-06 14:18:00 -07:00
Matthew Marangoni
c19d130693 Merge remote-tracking branch 'upstream/master' into html5test 
Conflicts:
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-06-06 14:15:08 -07:00
Matthew Marangoni
67a7227c26 Change settings UI components and content structure 
Added proper settings buttons and icons, created containers to align content
with style guide, populated submenu's with content to match style guide,
numerous CSS changes for each submenu and its contents.
 2016-06-06 12:52:03 -07:00
Oleksandr Zhurbenko
23b00440bc Line shape functionality 2016-06-06 10:12:14 -07:00
Oswaldo Acauan
6318235f8f Add sorting to the user-list 2016-06-06 13:45:30 -03:00
Oleksandr Zhurbenko
cd500ea654 Added functionality for the Circle shape 2016-06-04 16:09:50 -07:00
Oleksandr Zhurbenko
1ec7a842c4 Commented out logs to improve the whiteboard's performance 2016-06-03 15:40:46 -07:00
Oleksandr Zhurbenko
af077961e3 Added helpers for the shape components 2016-06-03 15:39:28 -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
Oleksandr Zhurbenko
25b55ba9d7 Switched to CSS scaling for SVG 2016-06-02 15:09:28 -07:00
Richard Alam
424de0f2f9 Merge pull request #3161 from antobinary/captions 
recover caption funct; prepare akka-apps for captions on bbb-html5
 2016-06-02 17:02:03 -04:00
Oswaldo Acauan
c7225d9738 Add i18n to chat form 2016-06-02 17:32:42 -03:00
Oswaldo Acauan
b77b8ce971 Fix Welcome message not being parsed 2016-06-02 16:34:17 -03:00
Oswaldo Acauan
f204e6007a Sanitize chat messages client and server-side 2016-06-02 16:08:17 -03:00
Oswaldo Acauan
d642cb1c99 Add chat send message functionality 2016-06-02 15:40:27 -03:00
Oswaldo Acauan
8d74db562a Fix getters on auth service 2016-06-02 10:48:39 -03:00
Oswaldo Acauan
f39b7171af Move session/auth logic to separated services 2016-06-02 10:46:35 -03:00
Oswaldo Acauan
f4fbc658e0 Fetch chat messages from server instead of mock 2016-06-02 10:00:57 -03:00
Oleksandr Zhurbenko
6db05cf0f4 Added scaling on window resize for the slide 2016-06-01 16:37:51 -07:00
Oleksandr Zhurbenko
06e18808b3 Fixed a layout bug for the Firefox 2016-06-01 14:59:10 -07:00
Oleksandr Zhurbenko
7730d50948 Centered the slide 2016-06-01 14:57:19 -07:00
Anton Georgiev
9cf03a8ce8 move helpers; extract nodejsApp 2016-06-01 17:18:13 +00:00
Oswaldo Acauan
378c94ce7b Resolve merge conflicts 2016-06-01 13:45:01 -03:00
Oswaldo Acauan
1d8a36564d Add base components and style for Chat 2016-06-01 13:33:19 -03:00
perroned
844210faea Fixes audio permission, render tag 2016-06-01 15:56:12 +00:00
gcampes
b6366ff451 removes .js and .jsx from startup/routes in html5 2016-06-01 10:04:23 -03:00
gcampes
2d71964791 Revert changes to start.sh and remove useless file added on my last commit 2016-05-31 17:39:11 -03:00
gcampes
957dcb9a8f Finish first iteration of the html5 userlist and adds user avatar component 2016-05-31 17:25:42 -03:00
gcampes
ce32ae5b20 Merge branch 'html5-new-userlist' into html-userlist 2016-05-31 08:37:14 -03:00
gcampes
430435e660 Changes html5 userlist service 2016-05-31 08:29:38 -03:00
Oleksandr Zhurbenko
6046c6c5a9 Removed unnecessary wrappers and adjusted styling 2016-05-30 16:10:01 -07:00
Oleksandr Zhurbenko
949511f9b5 Linting, changed line endings from Windows to Unix 2016-05-30 15:07:02 -07:00
Oleksandr Zhurbenko
ba7cdca648 Added fade in for the slides and a default content 2016-05-30 11:12:02 -07:00
Oleksandr Zhurbenko
36cfffd2db Fixed multiple rerenderings while changing slides 
Media container is supposed to know only if a current presentation exists, not slide
 2016-05-30 10:33:35 -07:00
perroned
4977950081 Fixes crash when starting video view 2016-05-30 17:21:30 +00:00
Oleksandr Zhurbenko
179ce3c2bd Swapping whiteboard with default view if there is no current slide 2016-05-27 18:10:34 -07:00
perroned
c8fdf66099 Lints 2016-05-27 16:34:03 +00:00
perroned
393b49fdbe Cleans up duplicate code 2016-05-27 16:17:16 +00:00
Oleksandr Zhurbenko
84318b10f0 Adjusted imports, cleaned up 2016-05-26 17:13:53 -07:00
Oleksandr Zhurbenko
16c46d50af Adjusted the whiteboard files to the new structure 2016-05-26 17:03:30 -07:00
perroned
8fc4c98090 Fixes race condition while loading verto libs 2016-05-26 20:46:11 +00:00
perroned
2f9afaa8d6 Uses same name for voiceBridge where possible 2016-05-26 20:25:55 +00:00
perroned
ac60620ac9 Makes WebRTC call when data changes 2016-05-26 20:03:45 +00:00
perroned
b8ae3a5304 Fixes some imports 2016-05-26 20:01:49 +00:00
perroned
53fdb67652 Loads jquery json lib 2016-05-26 19:58:30 +00:00
perroned
c1adc40315 Fix library loading callback 2016-05-26 19:57:44 +00:00
Oleksandr Zhurbenko
50597726d9 Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure 2016-05-26 09:37:54 -07: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
Anton Georgiev
02f03205a4 minor edit to handle voice events 2016-05-25 16:32:23 -03:00
Anton Georgiev
61236078c7 bring callback out of if/else 2016-05-25 16:32:11 -03:00
gcampes
6b22b49922 Changes to the html5 userlist 2016-05-25 16:29:22 -03:00
Oleksandr Zhurbenko
eaeaf90289 Was able to add -webkit-tap-highlight-color property to svg elements 2016-05-25 12:24:01 -07:00
Oleksandr Zhurbenko
f1e3dd71b9 Made text Shape object consistent with the others 2016-05-25 09:45:04 -07:00
Oleksandr Zhurbenko
9d71e48333 Fixed all the bugs related to calls from shape-factory to all the shape components, except the 'text' shape 2016-05-24 15:50:22 -07:00
perroned
d57fc2ed44 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 2016-05-24 14:02:25 +00:00
Oswaldo Acauan
877e91a43e Rename to new structure 2016-05-23 10:09:47 -03:00
Anton Georgiev
b24c5b4631 Merge pull request #3145 from oswaldoacauan/feature-actionsbar 
HTML5 - New Button component, basic styles and file structure
 2016-05-20 17:29:44 -04: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
Oswaldo Acauan
216bfd2ac2 Fix nav-bar userlist toggle icon 2016-05-20 13:39:58 -03:00
Oswaldo Acauan
37b86d9176 Improve some basic styles 2016-05-20 13:35:15 -03:00
Oswaldo Acauan
29c09afee9 Add basic nav-bar styles 2016-05-20 13:29:55 -03:00
Oswaldo Acauan
2612fef112 Improve Button styles 2016-05-20 13:17:39 -03:00
Oswaldo Acauan
0e9b8f7eff Add basic styles for actions-bar 2016-05-20 13:17:21 -03:00
Oswaldo Acauan
0e6c6f1f99 Improve some styles on the media 2016-05-20 12:02:57 -03:00
Oswaldo Acauan
a69d7faab9 Add iconRight option to Button component 2016-05-20 11:49:28 -03:00
Oswaldo Acauan
dc7cdb337f Add examples to Button component 2016-05-20 11:13:06 -03:00
Oswaldo Acauan
99c2e94c80 Remove unnecessary extension on imports 2016-05-20 10:46:30 -03:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00
Oswaldo Acauan
7aac407e35 Remove unnecessary component background colors 2016-05-20 10:41:15 -03:00
Oswaldo Acauan
d81cb28f35 Add new component button and some basic styles 2016-05-20 10:37:19 -03:00
perroned
ef56169ebb Access sip function through window 2016-05-19 20:18:20 +00:00
perroned
2d0ea2a15d Load verto libs 2016-05-19 20:18:05 +00:00
perroned
e8229b1851 Some linting 2016-05-19 19:27:49 +00:00
perroned
3934ae3dce Adds some work for verto calling 2016-05-19 18:33:27 +00:00
gcampes
18e4f98f1d Adds html5 new userlist, WIP 2016-05-19 15:22:56 -03:00
perroned
428941f896 Hangs up from sip audio 2016-05-19 16:21:22 +00:00
perroned
8117f91ec9 Fixes some imports 2016-05-19 16:14:12 +00:00
perroned
97c94ecace Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
	bigbluebutton-html5/imports/api/phone/index.js
	bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
 2016-05-19 15:47:47 +00:00
perroned
955c27efcc Beginning to add exiting sip 2016-05-19 15:20:36 +00:00
perroned
a637c29710 Fixes some paths 2016-05-19 15:19:42 +00:00
perroned
d83c96bf5d Changes Meteor.config to an export 2016-05-18 20:19:50 +00:00
perroned
66a391c191 Updates server function to use new argument 2016-05-18 19:31:20 +00:00
perroned
4be18d2156 Updates client side data gathering for audio call 2016-05-18 19:29:28 +00:00
perroned
206e09f37a Updates poll to use new server call method 2016-05-18 19:27:47 +00:00
perroned
ef41eee5b2 Fixes server call method arguments 2016-05-18 19:26:51 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
Oleksandr Zhurbenko
7ff3a7c5d2 Adjusting the structure to the current BBB HTML5 convention 2016-05-17 16:43:19 -07:00
gcampes
e49b0399b5 Merge userlist merge conflicts 2016-05-17 11:17:17 -03:00
gcampes
947721250d Adds the new layout for the user-list 2016-05-17 10:52:27 -03:00
Richard Alam
6233105f69 Merge pull request #3150 from perroned/join-components-with-skeleton 
Adds deskshare video to html5 client
 2016-05-27 21:45:53 -04:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Anton Georgiev
eea6bc0829 adjust path of collections 2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40 Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
	bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
	bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
	bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
	bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
	bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
	bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd split emitter.on; move to api 2016-05-16 19:12:49 +00:00
perroned
5be138fd31 Fixes cursor structure 2016-05-16 13:13:03 -05:00