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

11244 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Gabriel Carvalho de Campes
eb3705321f polish breakout room code html5 2016-11-14 14:12:54 -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
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
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
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
Oswaldo Acauan
8874c15e9f Rename meteor method on the client 2016-10-21 18:47:33 +00:00
Gabriel Carvalho de Campes
a7335633d4 Refactor Poll API 2016-10-21 11:21:09 -02:00
Oleksandr Zhurbenko
eeb0d95aab Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-10-18 13:43:48 -07:00
Anton Georgiev
5b2b0ed2db Merge pull request #3415 from JaeeunCho/actions_dropdown 
HTML5 - actions_dropdown component
 2016-10-18 10:55:53 -04:00
JaeeunCho
6d1823f2c7 HTML5 - fixed linebreak with lint 2016-10-17 14:29:00 -07:00
Lajellu
373dd9535b HTML5 - fixes fullscreen toggle to un-fullscreen 2016-10-17 14:14:12 -07:00
Anton Georgiev
e47c63f84f Merge pull request #3407 from JaeeunCho/userlist_dot 
HTML5 - Userlist Switcher
 2016-10-13 10:54:37 -04:00
Anton Georgiev
11f0c2da03 Merge pull request #3401 from KDSBrowne/Localization-update 
Localization update #1
 2016-10-13 10:44:13 -04:00
Matthew Marangoni
28af2439d1 Renamed a few props to be more consistent with component names and for readability 2016-10-12 13:09:47 -07:00
Matthew Marangoni
5c386ceba3 Reworked modal to dynamically change content 2016-10-12 12:55:02 -07:00
Matthew Marangoni
77d76a3adc added join audio files 2016-10-11 12:10:06 -07:00
Matthew Marangoni
918ae83fc8 Added initial Join Audio modal 2016-10-11 12:04:50 -07:00
JaeeunCho
d214eff554 added css for red dot and fixed code 2016-10-11 10:36:28 -07:00
JaeeunCho
fd38b2eb24 Merge remote-tracking branch 'upstream/master' into userlist_dot 2016-10-11 10:24:27 -07:00
Lajellu
1f114eb908 Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked 2016-10-06 13:44:03 -07:00
Lajellu
63c9f94b54 HTML5 - changes status names, and user list sorting logic to match flash client 2016-10-06 13:42:37 -07:00
perroned
4d8af68fc5 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-10-05 14:37:14 +00:00
Oleksandr Zhurbenko
8fcd97d278 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-10-04 13:56:13 -07:00
JaeeunCho
04e9d1818c HTML 5 - added to display the state of unreaded messages right next to the user icon 2016-10-04 12:23:43 -07:00
KDSBrowne
b811f01ad1 Fixed lint issues 2016-10-03 08:10:20 -07:00
KDSBrowne
d2cc6e1b18 Localization update 2016-10-02 08:46:15 -07:00
Anton Georgiev
27c1896629 Merge branch 'EmojiReworked' of github.com:lajellu/bigbluebutton into merge-pr 2016-09-28 23:47:28 +00:00
JaeeunCho
28d659ef10 HTML5 - Dropdown List : fixed a bug which is not opened the list at the first time 2016-09-27 12:27:12 -07:00
JaeeunCho
3962349517 HTML5 - Settings : changed to label 2016-09-26 14:55:33 -07:00
Lajellu
7d724022e4 HTML5 - changes folder name emojiMenu to emoji-menu for uniform style in project 2016-09-26 14:06:41 -07:00
Lajellu
c68ad3240d HTML5 - adds Emoji showing up on user list 2016-09-26 13:29:44 -07:00
JaeeunCho
b0947c85c1 HTML5 - Settings : added description messages and changed to label 2016-09-22 13:51:00 -07:00
JaeeunCho
0e1728ce50 Merge remote-tracking branch 'upstream/master' into settings_msg 2016-09-22 13:43:23 -07:00
Lajellu
3a0b4e3fef Merge remote-tracking branch 'upstream/master' into EmojiReworked 2016-09-22 12:12:38 -07:00
JaeeunCho
fefef4bc62 HTML5 - Settings dropdown 2016-09-21 12:49:31 -07:00
perroned
26ab092182 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/prod/lib/getScreenId.js
 2016-09-21 19:44:42 +00:00
JaeeunCho
f64d4b5221 HTML5 - Actions button : change lab to label and location 2016-09-21 12:22:48 -07:00
Oswaldo Acauan
957d8ad125 Remove unused parameter on clearModal 2016-09-21 19:18:13 +00:00
JaeeunCho
cd38051d5e HTML5 - Actions button : change lab to label and location 2016-09-21 12:15:32 -07:00
Oswaldo Acauan
1f5b414883 Fix modal opening every route transition 2016-09-21 19:13:59 +00:00
JaeeunCho
1d63808b34 HTML5 - Actions button : add messages 2016-09-21 11:51:46 -07:00
JaeeunCho
ce9f1c3dce HTML5 - Actions button : add messages 2016-09-21 11:29:31 -07:00
JaeeunCho
71de52b3df Merge remote-tracking branch 'upstream/master' into actions 2016-09-21 11:05:08 -07:00
Lajellu
88b05d2cb9 HTML5 - adds Emoji considering dropdown rewrite by Oswaldo 2016-09-21 11:03:18 -07:00
Oswaldo Acauan
a4538b2bcd Add initial translation boilerplate to the Action component 2016-09-19 20:35:58 +00:00
Gabriel Carvalho de Campes
a854fe1126 fix issues from github 2016-09-15 09:27:24 -03:00
perroned
6371d476f9 embedding video into html5 2016-09-14 20:25:31 +00:00
perroned
7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-html5/imports/startup/server/EventQueue.js
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-09-14 19:30:07 +00:00
Gabriel Carvalho de Campes
0cc29d13b1 Polish code 2016-09-14 14:48:50 -03:00
Gabriel Carvalho de Campes
832fff2f4a Solves issue with dropdown above white surfaces 2016-09-13 16:47:53 -03:00
JaeeunCho
cbf8e88e68 HTML5 Actions button 2016-09-13 12:46:12 -07:00
Gabriel Carvalho de Campes
60e42db887 Changes methods in user list item 2016-09-13 11:52:03 -03:00
Gabriel Carvalho de Campes
d2adb5ace3 Fix styling issues on user actions 2016-09-13 10:49:56 -03:00
Gabriel Carvalho de Campes
3786b6ea73 Removes old user actions folder 2016-09-13 08:58:55 -03:00
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
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
Oleksandr Zhurbenko
51eb78c38f Submenu for closed captions, initial commit 2016-08-29 19:13:53 -07: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
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
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
Matthew Marangoni
526923c59e renamed all settings modal files to match conventions 2016-08-24 16:00:38 -07: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
Jaeeun Cho
8eddccc66c HTML5 dropdown for settings menu 2016-08-24 07:17:30 -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
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
perroned
820ee786f0 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-22 09:21:54 -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
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
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
dedaa4e7aa Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-19 13:50:14 -07:00
perroned
63953b1384 Hooking up viewing from html5 2016-08-19 14:07:47 +00: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
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
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
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
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
Oleksandr Zhurbenko
ed51c99803 Adjusted view to the new CC data format 2016-07-26 16:05:22 -07:00
Lajellu
1ead9ced59 adds presentation controls 2016-07-26 13:56:43 -07:00
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07: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
Oswaldo Acauan
34fedc8e46 Fix user-list toggle 2016-07-21 14:24:50 +00:00
Lajellu
f1d79376ee Fixes Cursor propTypes 2016-07-18 08:30:04 -07:00
Lajellu
1acdc0a13b Adds cursor xy tracking 2016-07-15 13:50:03 -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
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
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
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
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
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
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
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
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
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
Oswaldo Acauan
d2e8d3d954 Improve auto-scroll behaviour 2016-06-27 19:00:10 +00:00
Oleksandr Zhurbenko
8b4747a89d Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -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
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
a0bfbe8433 Added Text shape functionality 2016-06-14 13:01:11 -07: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
76b8aca4bb Add lock behavior to HTML5 chat 2016-06-13 14:00:38 -03: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
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
Oswaldo Acauan
c7225d9738 Add i18n to chat form 2016-06-02 17:32:42 -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
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
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
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
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
gcampes
6b22b49922 Changes to the html5 userlist 2016-05-25 16:29:22 -03: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
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
gcampes
18e4f98f1d Adds html5 new userlist, WIP 2016-05-19 15:22:56 -03:00
perroned
206e09f37a Updates poll to use new server call method 2016-05-18 19:27:47 +00: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
perroned
4adad8bb32 Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
perroned
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
perroned
642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-13 14:54:19 -05:00
perroned
6adaff0c44 Cleans lint 2016-05-13 11:31:06 -05:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00
Anton Georgiev
8a6fc308da avoid race cond when subscribing for data 2016-05-13 14:34:29 +00:00
perroned
d966aee2d7 Fixing paths for structure 2016-05-12 14:50:02 -05:00
perroned
3e0c3d1ee1 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 14:30:46 -05:00
Anton Georgiev
ecd3b3de17 log in user properly 2016-05-12 19:22:51 +00:00
perroned
dc3dd43f1a Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/polls/polls.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 13:58:06 -05:00
Anton Georgiev
783f150442 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/startup/client/routes.js
 2016-05-12 18:08:44 +00:00
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
perroned
3971bdb548 Lints 2016-05-12 11:10:43 -05:00
perroned
dff3dd2436 Moves serverCall to imports service api 2016-05-12 11:10:20 -05:00
perroned
f1f24acda8 Adds some services 2016-05-12 10:43:09 -05:00
perroned
666c96dab9 Adds server call wrapper to service 2016-05-12 10:41:51 -05:00
perroned
38d2bff789 Loads sip li. Adds audio tag 2016-05-11 15:43:07 -05: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
84acf39fd3 Begins adding phone service 2016-05-10 10:54:55 -05:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00:00
Anton Georgiev
dcce6d3122 set baseUrl to html5client/ 2016-05-09 19:19:52 +00:00
perroned
67115c0169 Begins adding deskshare functionality 2016-05-06 15:15:47 -05:00
Anton Georgiev
76d599eb32 join route handled via localStorage 2016-05-06 19:12:28 +00:00
perroned
4a7938e1c0 Adds settings and styling 2016-05-06 12:46:14 -05:00
Anton Georgiev
b95c380b56 working on join route 2016-05-06 15:34:00 +00:00
Maxim Khlobystov
67bb61c975 Code style cleanup. 2016-05-05 18:30:57 -04:00
perroned
1f3fcf611f Fixes button import path 2016-05-05 16:15:32 -05:00
perroned
d602a66d7f Begins adding modals 2016-05-05 16:14:39 -05:00
perroned
f8893d61da Cleans polling 2016-05-05 14:50:11 -05:00
perroned
e9b5e11ac2 Begins adding polling component 2016-05-05 13:50:18 -05:00
Oswaldo Acauan
2d57d7cbed Rename Actionsbar and Navbar to ActionsBar and NavBar 2016-05-04 11:48:53 -03:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
Oswaldo Acauan
01860a8804 Add basic styles for new design 2016-05-02 19:42:54 -03:00