Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
No related branches found
No related tags found
Showing
- .docker/dockerfiles/develop/Dockerfile 1 addition, 5 deletions.docker/dockerfiles/develop/Dockerfile
- .docker/dockerfiles/latest/Dockerfile 1 addition, 4 deletions.docker/dockerfiles/latest/Dockerfile
- .meteor/versions 1 addition, 2 deletions.meteor/versions
- .travis/docker.sh 1 addition, 1 deletion.travis/docker.sh
- Dockerfile 0 additions, 36 deletionsDockerfile
- HISTORY.md 14 additions, 9 deletionsHISTORY.md
- client/startup/startup.coffee 3 additions, 0 deletionsclient/startup/startup.coffee
- docker-compose.yml 1 addition, 3 deletionsdocker-compose.yml
- i18n/en.i18n.json 2 additions, 0 deletionsi18n/en.i18n.json
- packages/rocketchat-authorization/README.md 7 additions, 8 deletionspackages/rocketchat-authorization/README.md
- packages/rocketchat-authorization/client/hasPermission.coffee 21 additions, 23 deletions...ages/rocketchat-authorization/client/hasPermission.coffee
- packages/rocketchat-authorization/client/hasRole.coffee 3 additions, 8 deletionspackages/rocketchat-authorization/client/hasRole.coffee
- packages/rocketchat-authorization/client/lib/ChatPermissions.coffee 1 addition, 1 deletion...ocketchat-authorization/client/lib/ChatPermissions.coffee
- packages/rocketchat-authorization/client/lib/models/Roles.coffee 14 additions, 0 deletions...s/rocketchat-authorization/client/lib/models/Roles.coffee
- packages/rocketchat-authorization/client/lib/models/Subscriptions.js 35 additions, 0 deletions...cketchat-authorization/client/lib/models/Subscriptions.js
- packages/rocketchat-authorization/client/lib/models/Users.js 24 additions, 0 deletionspackages/rocketchat-authorization/client/lib/models/Users.js
- packages/rocketchat-authorization/client/startup.coffee 2 additions, 0 deletionspackages/rocketchat-authorization/client/startup.coffee
- packages/rocketchat-authorization/client/views/permissions.coffee 9 additions, 13 deletions.../rocketchat-authorization/client/views/permissions.coffee
- packages/rocketchat-authorization/client/views/permissions.html 3 additions, 3 deletions...es/rocketchat-authorization/client/views/permissions.html
- packages/rocketchat-authorization/client/views/permissionsRole.coffee 2 additions, 2 deletions...ketchat-authorization/client/views/permissionsRole.coffee
Loading
Please register or sign in to comment