Registrations currently disabled due to spam. Contact me externally if you need an account

Commit d9dc99d3 authored by Gabriel Engel's avatar Gabriel Engel Committed by GitHub
Browse files

Merge pull request #5230 from RocketChat/livechat-improve-triggers-page 

Improve livechat triggers page
parents ddfe65a7 ca646248

packages/rocketchat-authorization/client/requiresPermission.html

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<template name="requiresPermission">

	{{#if hasPermission this}}

		{{> Template.contentBlock}}

	{{else}}

		{{#if Template.elseBlock}}

			{{> Template.elseBlock}}

		{{else}}

			{{_ "Not_found_or_not_allowed"}}

		{{/if}}

	{{/if}}

</template>

packages/rocketchat-authorization/package.js

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Package.onUse(function(api) { 
	api.addFiles('client/startup.coffee', ['client']);

	api.addFiles('client/hasPermission.coffee', ['client']);

	api.addFiles('client/hasRole.coffee', ['client']);

	api.addFiles('client/requiresPermission.html', ['client']);



	api.addFiles('client/route.coffee', ['client']);

packages/rocketchat-i18n/i18n/en.i18n.json

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
  "Edit": "Edit",

  "Edit_Custom_Field": "Edit Custom Field",

  "Edit_Department": "Edit Department",

  "Edit_Trigger": "Edit Trigger",

  "edited": "edited",

  "Editing_room": "Editing room",

  "Editing_user": "Editing user",
@@ -908,6 +909,7 @@ 
  "New_role": "New role",

  "New_Room_Notification": "New Room Notification",

  "New_videocall_request": "New videocall request",

  "New_Trigger": "New Trigger",

  "No_available_agents_to_transfer": "No available agents to transfer",

  "No_channel_with_name_%s_was_found": "No channel with name <strong>\"%s\"</strong> was found!",

  "No_channels_yet": "You aren't part of any channel yet.",

packages/rocketchat-i18n/i18n/pt.i18n.json

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ 
  "Edit": "Editar",

  "Edit_Custom_Field": "Editar Campo Personalizado",

  "Edit_Department": "Editar Departamento",

  "Edit_Trigger": "Editar Gatilho",

  "edited": "editado",

  "Editing_room": "Edição de sala",

  "Editing_user": "Edição de usuário",
@@ -793,6 +794,7 @@ 
  "New_role": "Novo papel",

  "New_Room_Notification": "Notificação de nova sala",

  "New_videocall_request": "Nova requisição de chamada de vídeo",

  "New_Trigger": "Novo Gatilho",

  "No_available_agents_to_transfer": "Nenhum agente disponível para transferir",

  "No_channel_with_name_%s_was_found": "Nenhum canal com nome <strong>\"%s\"</strong> foi encontrado!",

  "No_channels_yet": "Você não faz parte de nenhum canal ainda.",

packages/rocketchat-lib/server/models/_BaseDb.js

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class ModelsBaseDb { 
		try {

			return this.ensureIndex(...arguments);

		} catch (e) {

			console.log(e);

			console.error('Error creating index:', this.name, '->', ...arguments, e);

		}

	}
@@ -137,7 +137,7 @@ class ModelsBaseDb { 
		try {

			return this.dropIndex(...arguments);

		} catch (e) {

			console.log(e);

			console.error('Error dropping index:', this.name, '->', ...arguments, e);

		}

	}