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

Jump to bottom

[IMPROVE] Use REST for DDP calls by default #17934

Merged
merged 2 commits into from Jun 17, 2020
Merged

[IMPROVE] Use REST for DDP calls by default #17934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
233593f
Use REST for DDP calls by default
sampaiodiego Jun 17, 2020
9586868
Merge branch 'develop' into improve/use-rest-by-default
sampaiodiego Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/api/server/settings.js
View file
Open in desktop
Expand Up @@ -12,10 +12,9 @@ settings.addGroup('General', function() {
this.add('API_Enable_CORS', false, { type: 'boolean', public: false });
this.add('API_CORS_Origin', '*', { type: 'string', public: false, enableQuery: { _id: 'API_Enable_CORS', value: true } });

this.add('API_Use_REST_For_DDP_Calls', false, {
this.add('API_Use_REST_For_DDP_Calls', true, {
type: 'boolean',
public: true,
alert: 'API_Use_REST_For_DDP_Calls_Alert',
});
});
});
3 changes: 1 addition & 2 deletions packages/rocketchat-i18n/i18n/cs.i18n.json
View file
Open in desktop
Expand Up @@ -368,7 +368,6 @@
"API_Upper_Count_Limit": "Maximální počet",
"API_Upper_Count_Limit_Description": "Kolik nejvíce záznamů smí REST API vrátit (pokud není limitovaná)",
"API_Use_REST_For_DDP_Calls": "Použít místo websocketů REST",
"API_Use_REST_For_DDP_Calls_Alert": "Experimentální a dočasné nastavení. Donutí webové a mobilní aplikace použít REST rozhraní místo websocketů.",
"API_Wordpress_URL": "WordPress URL",
"Apiai_Key": "Api.ai Klíč",
"Apiai_Language": "Api.ai Jazyk",
Expand Down Expand Up @@ -3842,4 +3841,4 @@
"Your_server_link": "Odkaz na Váš server",
"Your_temporary_password_is_password": "Vaše dočasné heslo je <strong>[password]</strong>.",
"Your_workspace_is_ready": "Váš prostředí je připraveno k použití 🎉"
}
}
1 change: 0 additions & 1 deletion packages/rocketchat-i18n/i18n/da.i18n.json
View file
Open in desktop
Expand Up @@ -366,7 +366,6 @@
"API_Upper_Count_Limit": "Maks. antal resultater",
"API_Upper_Count_Limit_Description": "Hvad er det maksimale antal poster, som REST API skal returnere (når det ikke er ubegrænset)?",
"API_Use_REST_For_DDP_Calls": "Brug REST i stedet for websocket til Meteor-kald",
"API_Use_REST_For_DDP_Calls_Alert": "Dette er en eksperimentel og midlertidig funktion. Det tvinger webklient og mobilapp til at bruge REST-anmodninger i stedet for at bruge websockets til Meteor-metode-kald.",
"API_User_Limit": "Brugergrænse for at føje alle brugere til en kanal",
"API_Wordpress_URL": "WordPress-url",
"Apiai_Key": "Api.ai-nøgle",
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Expand Up @@ -368,7 +368,6 @@
"API_Upper_Count_Limit": "Max Record Amount",
"API_Upper_Count_Limit_Description": "What is the maximum number of records the REST API should return (when not unlimited)?",
"API_Use_REST_For_DDP_Calls": "Use REST instead of websocket for Meteor calls",
"API_Use_REST_For_DDP_Calls_Alert": "This is an experimental and temporary feature. It forces web client and mobile app to use REST requests instead of using websockets for Meteor method calls.",
"API_User_Limit": "User Limit for Adding All Users to Channel",
"API_Wordpress_URL": "WordPress URL",
"Apiai_Key": "Api.ai Key",
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-i18n/i18n/es.i18n.json
View file
Open in desktop
Expand Up @@ -358,7 +358,6 @@
"API_Upper_Count_Limit": "Cantidad máxima de registro",
"API_Upper_Count_Limit_Description": "¿Cuál es el número máximo de registros que debe devolver la API REST (cuando no es ilimitado)?",
"API_Use_REST_For_DDP_Calls": "Usar REST en lugar de WebSocket para las llamadas de Meteor",
"API_Use_REST_For_DDP_Calls_Alert": "Esta es una característica experimental y temporal. Obliga al cliente web y a la aplicación móvil a usar peticiones REST en lugar de usar WebSockets para las llamadas de Meteor.",
"API_User_Limit": "Límite de usuarios para añadir todos los usuarios al canal",
"API_Wordpress_URL": "URL de Wordpress",
"Apiai_Key": "Clave Api.ai",
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-i18n/i18n/ja.i18n.json
View file
Open in desktop
Expand Up @@ -367,7 +367,6 @@
"API_Upper_Count_Limit": "最大レコード量",
"API_Upper_Count_Limit_Description": "REST APIが返すレコードの最大数は何ですか (無制限でない場合) 。",
"API_Use_REST_For_DDP_Calls": "Meteor呼び出しにWebSocketではなくRESTを使用する",
"API_Use_REST_For_DDP_Calls_Alert": "これは実験的で一時的な機能です。 Meteorメソッド呼び出しにWebSocketを使用する代わりに、WebクライアントとモバイルアプリにRESTリクエストを使用するように強制します。",
"API_User_Limit": "Channelに全ユーザーを追加するためのユーザー制限",
"API_Wordpress_URL": "WordPress URL",
"Apiai_Key": "Api.aiキー",
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-i18n/i18n/ka-GE.i18n.json
View file
Open in desktop
Expand Up @@ -362,7 +362,6 @@
"API_Upper_Count_Limit": "ჩანაწერების მაქსიმალური რაოდენობა",
"API_Upper_Count_Limit_Description": "რა არის ჩანაწერების მაქსიმალური რაოდენობა, რომელიც REST API-ის საშუალებით გაიცემა (როცა არ არის ლიმიტი)?",
"API_Use_REST_For_DDP_Calls": "Meteor calls-სთვის გამოიყენეთ REST ვებ სოკეტის ნაცვლად",
"API_Use_REST_For_DDP_Calls_Alert": "ეს არის ექსპერიმენტული და დროებითი ოფცია. ეს აიძულებს ვებ – კლიენტს და მობილური აპლიკაციას გამოიყენოს REST მოთხოვნები ვებ სოკეტის ნაცვლად Meteor method calls-ებისთვის",
"API_User_Limit": "მომხმარებლების რაოდენობის ლიმიტი არხზე დამატებისას",
"API_Wordpress_URL": "Word Press-ის URL",
"Apiai_Key": "Api.ai გასაღები",
Expand Down
3 changes: 1 addition & 2 deletions packages/rocketchat-i18n/i18n/pl.i18n.json
View file
Open in desktop
Expand Up @@ -362,7 +362,6 @@
"API_Upper_Count_Limit": "Maksymalna ilość rekordów",
"API_Upper_Count_Limit_Description": "Jaka jest maksymalna liczba rekordów, które powinien zwrócić interfejs REST API (jeśli nie są nieograniczone)?",
"API_Use_REST_For_DDP_Calls": "Użyj REST zamiast websocketów dla wywołań metod Meteor",
"API_Use_REST_For_DDP_Calls_Alert": "To jest eksperymentalna i tymczasowa funkcja. Wymusza dla klienta web i aplikacji mobilnej wykorzystywanie requestów REST zamiast websocketów przy wywołaniach metod Meteor",
"API_User_Limit": "Limit użytkownika dotyczący dodawania wszystkich użytkowników do kanału",
"API_Wordpress_URL": "WordPress URL",
"Apiai_Key": "Klucz Api.ai",
Expand Down Expand Up @@ -3828,4 +3827,4 @@
"Your_server_link": "Twój link do serwera",
"Your_temporary_password_is_password": "Twoje tymczasowe hasło to <strong>[hasło]</strong>.",
"Your_workspace_is_ready": "Twój obszar roboczy jest gotowy do użycia 🎉"
}
}
1 change: 0 additions & 1 deletion packages/rocketchat-i18n/i18n/zh-TW.i18n.json
View file
Open in desktop
Expand Up @@ -361,7 +361,6 @@
"API_Upper_Count_Limit": "最大記錄數量",
"API_Upper_Count_Limit_Description": "REST API應該返回的最大記錄數是多少（何時不是無限的）？",
"API_Use_REST_For_DDP_Calls": "使用 REST 代替 websocket 進行 Meteor 呼叫",
"API_Use_REST_For_DDP_Calls_Alert": "這是一項實驗性和臨時性功能。它強制網頁客戶端和手機應用程式使用 REST 請求，而不是將 Websocket 用於 Meteor 方式呼叫。",
"API_User_Limit": "添加所有使用者到Channel的數量上限",
"API_Wordpress_URL": "WordPress網址",
"Apiai_Key": "Api.ai Key",
Expand Down