Commit Graph

463 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
Oswaldo Acauan
34fedc8e46 Fix user-list toggle 2016-07-21 14:24:50 +00:00
Anton Georgiev
6a984c2b68 adding captions support in html5 (part1) 2016-07-14 12:03:30 -07:00
Oswaldo Acauan
306ef94237 Fix conflicts 2016-07-12 14:02:48 +00:00
Oswaldo Acauan
9b53090c81 Change Auth service to be a singleton class 2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b Merge after git conflict/lost object 2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
bcfa3d41ec Linting 2016-07-08 16:13:26 -07: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
Oswaldo Acauan
03aa1aada3 Fix some chat styles 2016-07-07 18:16:08 +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
Gabriel Carvalho de Campes
7f8f4417e4 try to fix the reload issue 2016-07-05 18:59:18 +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
Oleksandr Zhurbenko
f26ab0ac52 Title and calculated styling for the polling UI 2016-06-30 15:21:46 -07:00
Oleksandr Zhurbenko
83fff53269 Replaced polling under the whiteboard 2016-06-29 15:00:06 -07:00
Jaeeun Cho
eded89d5f0 fixes html5 clinet logout and nav-bar 2016-06-28 14:50:44 -04:00
Jaeeun Cho
3d36d3fed2 fixes html5 clinet logout and nav-bar 2016-06-24 19:09:32 -04:00
Jaeeun Cho
73c9898698 fixes html5 clinet logout and nav-bar 2016-06-17 18:15:11 -04: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
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
Oleksandr Zhurbenko
06e18808b3 Fixed a layout bug for the Firefox 2016-06-01 14:59:10 -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
gcampes
ce32ae5b20 Merge branch 'html5-new-userlist' into html-userlist 2016-05-31 08:37:14 -03:00
Oswaldo Acauan
0e6c6f1f99 Improve some styles on the media 2016-05-20 12:02:57 -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
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
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
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00: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
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