Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] Livechat REST endpoints #11900

Merged
merged 23 commits into from
Sep 20, 2018
Merged

[NEW] Livechat REST endpoints #11900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
10f8e90
New Livechat endpoint added to get Livechat initial data.
renatobecker Aug 15, 2018
684e744
New Livechat API endpoints added.
renatobecker Aug 16, 2018
9d16f4b
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Aug 17, 2018
80b26d4
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Aug 27, 2018
9e66c26
New endpoints added.
renatobecker Aug 28, 2018
8f8976e
New Livechat REST endpoints added.
renatobecker Aug 29, 2018
c64b40c
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Aug 29, 2018
82d67eb
Fix import statements.
renatobecker Aug 29, 2018
bef9c41
Improvements on new Livechat endpoints.
renatobecker Sep 5, 2018
7e011e7
Improvements on Livechat Agent endpoint.
renatobecker Sep 5, 2018
2b3b6ce
Improvements on Livechat REST API.
renatobecker Sep 11, 2018
3d14636
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Sep 11, 2018
af6bfcd
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Sep 11, 2018
9a506f9
Unified signature of Livechat endpoints.
renatobecker Sep 14, 2018
8d10759
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Sep 14, 2018
f4ac1ea
Merge branch 'new-livechat-rest-endpoints' of github.com:RocketChat/R…
renatobecker Sep 14, 2018
46ce71f
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Sep 19, 2018
41994f1
Fix Livechat API stuff.
renatobecker Sep 19, 2018
675dbf9
Revert "Fix Livechat API stuff."
renatobecker Sep 19, 2018
df6eba3
Revert "Revert "Fix Livechat API stuff.""
renatobecker Sep 19, 2018
2f3a7f8
Merge branch 'develop' into new-livechat-rest-endpoints
renatobecker Sep 19, 2018
574d353
Fix lint errors.
renatobecker Sep 19, 2018
9db82b1
Add jitsiTimeout back
sampaiodiego Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,8 @@
"Error_404": "Error:404",
"Error_changing_password": "Error changing password",
"Error_loading_pages": "Error loading pages",
"Error_sending_livechat_transcript": "Error sending Livechat transcript",
"Error_sending_livechat_offline_message": "Error sending Livechat offline message",
"Esc_to": "Esc to",
"Event_Trigger": "Event Trigger",
"Event_Trigger_Description": "Select which type of event will trigger this Outgoing WebHook Integration",
Expand Down Expand Up @@ -1629,6 +1631,7 @@
"Livechat_managers": "Livechat managers",
"Livechat_offline": "Livechat offline",
"Livechat_online": "Livechat online",
"Livechat_offline_message_sent": "Livechat offline message sent",
"Livechat_open_inquiery_show_connecting": "Show Connecting Message Instead of Input When Guest is Not Yet Connected to an Agent",
"Livechat_Queue": "Livechat Queue",
"Livechat_registration_form": "Registration Form",
Expand All @@ -1637,6 +1640,7 @@
"Livechat_Take_Confirm": "Do you want to take this client?",
"Livechat_title": "Livechat Title",
"Livechat_title_color": "Livechat Title Background Color",
"Livechat_transcript_sent": "Livechat transcript sent",
"Livechat_Users": "Livechat Users",
"Livestream_close": "Close Livestream",
"Livestream_enable_audio_only": "Enable only audio mode",
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-i18n/i18n/pt-BR.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,8 @@
"Error_404": "Erro 404",
"Error_changing_password": "Erro ao alterar senha",
"Error_loading_pages": "Erro ao carregar páginas",
"Error_sending_livechat_transcript": "Erro ao enviar transcript do Livechat",
"Error_sending_livechat_offline_message": "Erro ao enviar mensagem offline do Livechat",
"Esc_to": "Esc para",
"Event_Trigger": "Disparador de eventos",
"Event_Trigger_Description": "Selecione qual tipo de evento irá desencadear essa Integração de WebHook de Saída",
Expand Down Expand Up @@ -1605,6 +1607,7 @@
"Livechat_Inquiry_Already_Taken": "Inquérito Livechat já realizado",
"Livechat_managers": "Gerentes do Livechat",
"Livechat_offline": "Livechat offline",
"Livechat_offline_message_sent": "Mensagem offline de Livechat enviada",
"Livechat_online": "Livechat on-line",
"Livechat_open_inquiery_show_connecting": "Mostrar conexão de mensagem em vez de entrada quando o visitante ainda não está conectado a um agente",
"Livechat_Queue": "Roleta Livechat",
Expand All @@ -1614,6 +1617,7 @@
"Livechat_Take_Confirm": "Você quer levar esse cliente?",
"Livechat_title": "Título Livechat",
"Livechat_title_color": "Cor de fundo do título do Livechat",
"Livechat_transcript_sent": "Transcrição de Livechat enviada",
"Livechat_Users": "Usuários Livechat",
"Livestream_close": "Fechar Livestream",
"Livestream_enable_audio_only": "Ativar apenas o modo de áudio",
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-katex/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/rocketchat-livechat/.app/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"Type_your_email": "Type your email",
"Type_your_message": "Type your message",
"Type_your_name": "Type your name",
"Upload_file_question": "Upload file?",
"User_joined": "User joined",
"User_left": "User left",
"We_are_not_online_right_now_please_leave_a_message": "We are not online right now. Please, leave a message.",
Expand Down
Loading