Commit Graph

12795 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07:00
Oleksandr Zhurbenko
a3fa660bc5 Removed unused code 2016-07-22 11:47:54 -07: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
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
Oleksandr Zhurbenko
3ecf387297 Updated packages to get rid of warnings in CssTransitionGroup 2016-07-15 16:16:49 -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
Anton Georgiev
02c977c725 Merge pull request #3212 from oswaldoacauan/feature-chat
HTML5 - Improvements to Chat. Closes #3207
2016-07-12 15:10:11 -04: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
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
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
Anton Georgiev
52f0c7e174 Merge pull request #3209 from oswaldoacauan/patch-1
Hide webcam component
2016-07-11 09:14:46 -04:00
Oswaldo Acauan
0b8bca049c Hide webcam component 2016-07-11 10:13:55 -03:00
Oswaldo Acauan
850c649a99 Merge branch 'master' into feature-chat
* 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
  Centering polling buttons
  Title and calculated styling for the polling UI
  Replaced polling under the whiteboard
2016-07-11 12:36:57 +00: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
Anton Georgiev
1d451f1e09 Merge pull request #3203 from Gcampes/router-changes
Changes to router and subscriptions
2016-07-08 08:29:43 -04: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
Fred Dixon
ef0dc056a4 Merge pull request #3205 from capilkey/upgrade-sipjs
Upgrade sip.js to 0.7.5
2016-07-07 17:17:11 -04:00
Chad Pilkey
5dd6d86b36 upgrade sip.js to 0.7.5 2016-07-07 21:06:11 +00: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