-
- Downloads
Merge branch 'develop' into livechat-popout
Conflicts: packages/rocketchat-livechat/app/client/views/room.coffee
Showing
- i18n/en.i18n.json 10 additions, 4 deletionsi18n/en.i18n.json
- packages/rocketchat-integrations/client/stylesheets/integrations.less 6 additions, 0 deletions...ketchat-integrations/client/stylesheets/integrations.less
- packages/rocketchat-integrations/client/views/integrationsIncoming.coffee 40 additions, 1 deletion...hat-integrations/client/views/integrationsIncoming.coffee
- packages/rocketchat-integrations/client/views/integrationsIncoming.html 19 additions, 1 deletion...tchat-integrations/client/views/integrationsIncoming.html
- packages/rocketchat-integrations/server/api/api.coffee 2 additions, 0 deletionspackages/rocketchat-integrations/server/api/api.coffee
- packages/rocketchat-integrations/server/methods/updateIntegration.coffee 2 additions, 0 deletions...chat-integrations/server/methods/updateIntegration.coffee
- packages/rocketchat-lib/server/functions/sendMessage.coffee 1 addition, 1 deletionpackages/rocketchat-lib/server/functions/sendMessage.coffee
- packages/rocketchat-lib/server/methods/addOAuthService.coffee 10 additions, 10 deletions...ages/rocketchat-lib/server/methods/addOAuthService.coffee
- packages/rocketchat-livechat/app/.meteor/packages 1 addition, 0 deletionspackages/rocketchat-livechat/app/.meteor/packages
- packages/rocketchat-livechat/app/.meteor/versions 5 additions, 0 deletionspackages/rocketchat-livechat/app/.meteor/versions
- packages/rocketchat-livechat/app/client/stylesheets/main.less 28 additions, 0 deletions...ages/rocketchat-livechat/app/client/stylesheets/main.less
- packages/rocketchat-livechat/app/client/views/messages.html 23 additions, 0 deletionspackages/rocketchat-livechat/app/client/views/messages.html
- packages/rocketchat-livechat/app/client/views/messages.js 98 additions, 0 deletionspackages/rocketchat-livechat/app/client/views/messages.js
- packages/rocketchat-livechat/app/client/views/register.coffee 50 additions, 0 deletions...ages/rocketchat-livechat/app/client/views/register.coffee
- packages/rocketchat-livechat/app/client/views/register.html 15 additions, 0 deletionspackages/rocketchat-livechat/app/client/views/register.html
- packages/rocketchat-livechat/app/client/views/room.html 5 additions, 21 deletionspackages/rocketchat-livechat/app/client/views/room.html
- packages/rocketchat-livechat/app/client/views/room.js 1 addition, 91 deletionspackages/rocketchat-livechat/app/client/views/room.js
- packages/rocketchat-livechat/app/i18n/en.i18n.json 7 additions, 0 deletionspackages/rocketchat-livechat/app/i18n/en.i18n.json
- packages/rocketchat-livechat/client/lib/LivechatDepartment.js 1 addition, 0 deletions...ages/rocketchat-livechat/client/lib/LivechatDepartment.js
- packages/rocketchat-livechat/client/route.js 21 additions, 0 deletionspackages/rocketchat-livechat/client/route.js
Loading
Please register or sign in to comment