3 Commits

Author	SHA1	Message	Date
Anton Georgiev	b7d6427e63	rename deskshare to screenshare and adjust condition for viewing	2017-07-24 15:29:34 -04:00
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
Klaus Klein	c627deca36	Move api to api/1.1	2017-06-19 08:57:32 -03:00