Klaus Klein ca09b69555 Merge branch 'Acl' into Refactor2x ... * Acl: Add check to undefined role Lint to eslint Missing merge file Fix lint problems Change Acl lookup Change ACL to be more extensible Fix a few review comments Acl refactor working Mostly working, still problems with user subs Code refactored		2017-06-19 11:28:17 -03:00
..
about	Fix merge conflicts	2017-06-05 13:52:46 +00:00
actions-bar	Move api to api/1.1	2017-06-19 08:57:32 -03:00
app	Move api to api/1.1	2017-06-19 08:57:32 -03:00
audio	Move api to api/1.1	2017-06-19 08:57:32 -03:00
breakout-join-confirmation	Linter auto fix	2017-06-02 19:25:02 +00:00
button	Fix merge conflicts	2017-06-05 13:52:46 +00:00
chat	Move api to api/1.1	2017-06-19 08:57:32 -03:00
checkbox	Fix merge conflicts	2017-06-05 13:52:46 +00:00
closed-captions	Move api to api/1.1	2017-06-19 08:57:32 -03:00
deskshare	Move api to api/1.1	2017-06-19 08:57:32 -03:00
dropdown	Fix merge conflicts	2017-06-05 13:52:46 +00:00
error-screen	Fix merge conflicts	2017-06-05 13:52:46 +00:00
icon	Fix merge conflicts	2017-06-05 13:52:46 +00:00
loading-screen	Linter auto fix	2017-06-02 19:25:02 +00:00
logout-confirmation	Linter auto fix	2017-06-02 19:25:02 +00:00
media	Move api to api/1.1	2017-06-19 08:57:32 -03:00
modal	Fix merge conflicts	2017-06-05 13:52:46 +00:00
nav-bar	Move api to api/1.1	2017-06-19 08:57:32 -03:00
notifications-bar	Fix merge conflicts	2017-06-05 13:52:46 +00:00
polling	Move api to api/1.1	2017-06-19 08:57:32 -03:00
presentation	Move api to api/1.1	2017-06-19 08:57:32 -03:00
settings	Move api to api/1.1	2017-06-19 08:57:32 -03:00
switch	resolve lint warnings on modified files	2017-04-19 16:52:50 -04:00
user-avatar	Fix merge conflicts	2017-06-05 13:52:46 +00:00
user-list	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
video-dock	Fix merge conflicts	2017-06-05 13:52:46 +00:00
whiteboard	Move api to api/1.1	2017-06-19 08:57:32 -03:00