diff --git a/object/application.go b/object/application.go
index 2e6c4bab..440e6ba7 100644
--- a/object/application.go
+++ b/object/application.go
@@ -67,6 +67,7 @@ type Application struct {
DisplayName string `xorm:"varchar(100)" json:"displayName"`
Logo string `xorm:"varchar(200)" json:"logo"`
+ Order int `json:"order"`
HomepageUrl string `xorm:"varchar(100)" json:"homepageUrl"`
Description string `xorm:"varchar(100)" json:"description"`
Organization string `xorm:"varchar(100)" json:"organization"`
diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js
index ca4b9010..d6c52a0a 100644
--- a/web/src/ApplicationEditPage.js
+++ b/web/src/ApplicationEditPage.js
@@ -468,6 +468,16 @@ class ApplicationEditPage extends React.Component {
+
+
+ {Setting.getLabel(i18next.t("application:Order"), i18next.t("application:Order - Tooltip"))} :
+
+
+ {
+ this.updateApplicationField("order", value);
+ }} />
+
+
{Setting.getLabel(i18next.t("application:Token expire"), i18next.t("application:Token expire - Tooltip"))} :
diff --git a/web/src/basic/AppListPage.js b/web/src/basic/AppListPage.js
index da3e8257..f657ec40 100644
--- a/web/src/basic/AppListPage.js
+++ b/web/src/basic/AppListPage.js
@@ -19,13 +19,21 @@ import GridCards from "./GridCards";
const AppListPage = (props) => {
const [applications, setApplications] = React.useState(null);
+ const sort = (applications) => {
+ applications.sort((a, b) => {
+ return a.order - b.order;
+ });
+ };
+
React.useEffect(() => {
if (props.account === null) {
return;
}
ApplicationBackend.getApplicationsByOrganization("admin", props.account.owner)
.then((res) => {
- setApplications(res.data || []);
+ const applications = res.data || [];
+ sort(applications);
+ setApplications(applications);
});
}, [props.account]);
diff --git a/web/src/locales/ar/data.json b/web/src/locales/ar/data.json
index 15a51d12..a5847745 100644
--- a/web/src/locales/ar/data.json
+++ b/web/src/locales/ar/data.json
@@ -92,6 +92,8 @@
"No verification": "لا توجد مصادقة",
"Normal": "عادي",
"Only signup": "التسجيل فقط",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "وضع اختيار المنظمة",
"Org choice mode - Tooltip": "وضع اختيار المنظمة - تلميح",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "يرجى تشغيل \\\"جلسة الدخول\\\" أولاً قبل تشغيل \\\"الدخول التلقائي\\\"",
diff --git a/web/src/locales/az/data.json b/web/src/locales/az/data.json
index 3c85b47e..a0d9984f 100644
--- a/web/src/locales/az/data.json
+++ b/web/src/locales/az/data.json
@@ -92,6 +92,8 @@
"No verification": "Doğrulama yox",
"Normal": "Normal",
"Only signup": "Yalnız qeydiyyat",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Təşkilat seçim rejimi",
"Org choice mode - Tooltip": "Təşkilat seçim rejimi - Tooltip",
"Please enable \"Signin session\" first before enabling \"Auto signin\"": "\"Avtomatik giriş\"i aktiv etməzdən əvvəl əvvəlcə \"Giriş sessiyası\"nı aktiv edin",
diff --git a/web/src/locales/cs/data.json b/web/src/locales/cs/data.json
index 0788ff93..c5b938f2 100644
--- a/web/src/locales/cs/data.json
+++ b/web/src/locales/cs/data.json
@@ -92,6 +92,8 @@
"No verification": "Žádná verifikace",
"Normal": "Normální",
"Only signup": "Pouze registrace",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Režim výběru organizace",
"Org choice mode - Tooltip": "Režim výběru organizace - popisek",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Nejprve povolte \\\"Přihlašovací relaci\\\" před povolením \\\"Automatického přihlášení\\\"",
diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json
index 2af48e45..d5307d03 100644
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@@ -92,6 +92,8 @@
"No verification": "Keine Verifizierung",
"Normal": "Normal",
"Only signup": "Nur Registrierung",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Organisationsauswahlmodus",
"Org choice mode - Tooltip": "Organisationsauswahlmodus – Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Bitte aktivieren Sie zuerst \\\"Anmeldesitzung\\\", bevor Sie \\\"Automatische Anmeldung\\\" aktivieren.",
diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json
index 8c328f63..5fefa1af 100644
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@@ -92,6 +92,8 @@
"No verification": "No verification",
"Normal": "Normal",
"Only signup": "Only signup",
+ "Order": "Order",
+ "Order - Tooltip": "The smaller the value, the higher it ranks in the Apps page",
"Org choice mode": "Org choice mode",
"Org choice mode - Tooltip": "Org choice mode - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"",
diff --git a/web/src/locales/es/data.json b/web/src/locales/es/data.json
index 8d5e53a3..7a501b45 100644
--- a/web/src/locales/es/data.json
+++ b/web/src/locales/es/data.json
@@ -92,6 +92,8 @@
"No verification": "Sin verificación",
"Normal": "Normal",
"Only signup": "Solo registro",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Modo de selección de organización",
"Org choice mode - Tooltip": "Modo de selección de organización - Información adicional",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Por favor, habilita \\\"Sesión de inicio de sesión\\\" primero antes de habilitar \\\"Inicio de sesión automático\\\"",
diff --git a/web/src/locales/fa/data.json b/web/src/locales/fa/data.json
index 0f08f55a..459701c8 100644
--- a/web/src/locales/fa/data.json
+++ b/web/src/locales/fa/data.json
@@ -92,6 +92,8 @@
"No verification": "بدون تأیید",
"Normal": "عادی",
"Only signup": "فقط ثبتنام",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "حالت انتخاب سازمان",
"Org choice mode - Tooltip": "حالت انتخاب سازمان - راهنمای ابزار",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "لطفاً قبل فعالسازی «ورود خودکار»، ابتدا «جلسه ورود» را فعال کنید",
diff --git a/web/src/locales/fi/data.json b/web/src/locales/fi/data.json
index 90c845bd..a9720b85 100644
--- a/web/src/locales/fi/data.json
+++ b/web/src/locales/fi/data.json
@@ -92,6 +92,8 @@
"No verification": "Ei vahvistusta",
"Normal": "Normaali",
"Only signup": "Vain rekisteröityminen",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Organisaation valintatila",
"Org choice mode - Tooltip": "Organisaation valintatila - työkalupala",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Ota \\\"Kirjautumisession\\\" käyttöön ennen \\\"Automaattisen kirjautumisen\\\" ottamista käyttöön",
diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json
index e921be02..f88e7dd0 100644
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@@ -92,6 +92,8 @@
"No verification": "Aucune vérification",
"Normal": "Normal",
"Only signup": "Inscription uniquement",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Mode de choix d'organisation",
"Org choice mode - Tooltip": "Mode de choix d'organisation - Infobulle",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Veuillez activer \\\"Session de connexion\\\" avant d'activer \\\"Connexion automatique\\\"",
diff --git a/web/src/locales/he/data.json b/web/src/locales/he/data.json
index fd03dea3..82b80b72 100644
--- a/web/src/locales/he/data.json
+++ b/web/src/locales/he/data.json
@@ -92,6 +92,8 @@
"No verification": "ללא אימות",
"Normal": "רגיל",
"Only signup": "הרשמה בלבד",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "מצב בחירת ארגון",
"Org choice mode - Tooltip": "מצב בחירת ארגון - תיאור",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "אנא הפעל \\\"פתיחת جلسة כניסה\\\" תחילה לפני הפעלת \\\"כניסה אוטומטית\\\"",
diff --git a/web/src/locales/id/data.json b/web/src/locales/id/data.json
index 739e14be..54f8fcf8 100644
--- a/web/src/locales/id/data.json
+++ b/web/src/locales/id/data.json
@@ -92,6 +92,8 @@
"No verification": "Tidak ada verifikasi",
"Normal": "Normal",
"Only signup": "Hanya mendaftar",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Mode pilihan organisasi",
"Org choice mode - Tooltip": "Mode pilihan organisasi - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Harap aktifkan \\\"Sesi masuk\\\" terlebih dahulu sebelum mengaktifkan \\\"Masuk otomatis\\\"",
diff --git a/web/src/locales/it/data.json b/web/src/locales/it/data.json
index 0885debd..02f31ed4 100644
--- a/web/src/locales/it/data.json
+++ b/web/src/locales/it/data.json
@@ -92,6 +92,8 @@
"No verification": "Nessuna verifica",
"Normal": "Normale",
"Only signup": "Solo registrazione",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Modalità scelta organizzazione",
"Org choice mode - Tooltip": "Modalità scelta organizzazione - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Abilita prima \\\"Sessione di accesso\\\" prima di abilitare \\\"Accesso automatico\\\"",
diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json
index f094b7ef..fad3e103 100644
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@@ -92,6 +92,8 @@
"No verification": "検証なし",
"Normal": "通常",
"Only signup": "サインアップのみ",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "組織選択モード",
"Org choice mode - Tooltip": "組織選択モード - ツールチップ",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "\\\"自動サインイン\\\"を有効にする前に、まず\\\"サインインセッション\\\"を有効にしてください",
diff --git a/web/src/locales/kk/data.json b/web/src/locales/kk/data.json
index 808c194f..362a031a 100644
--- a/web/src/locales/kk/data.json
+++ b/web/src/locales/kk/data.json
@@ -92,6 +92,8 @@
"No verification": "Тексерусіз",
"Normal": "Қалыпты",
"Only signup": "Тек тіркелу",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Ұйым таңдау режимі",
"Org choice mode - Tooltip": "Ұйым таңдау режимі - Қысқаша түсінік",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Автоматты кіруді қосу алдында алдымен \\\"Кіру сессиясын\\\" қосыңыз",
diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json
index 9e3bcf6b..43f819af 100644
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@@ -92,6 +92,8 @@
"No verification": "검증 없음",
"Normal": "일반",
"Only signup": "가입만",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "조직 선택 모드",
"Org choice mode - Tooltip": "조직 선택 모드 - 툴팁",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "\\\"자동 로그인\\\"을 활성화하기 전에 \\\"로그인 세션\\\"을 먼저 활성화하세요.",
diff --git a/web/src/locales/ms/data.json b/web/src/locales/ms/data.json
index be6045a7..6799c935 100644
--- a/web/src/locales/ms/data.json
+++ b/web/src/locales/ms/data.json
@@ -92,6 +92,8 @@
"No verification": "Tiada pengesahan",
"Normal": "Biasa",
"Only signup": "Hanya pendaftaran",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Mod pilihan organisasi",
"Org choice mode - Tooltip": "Mod pilihan organisasi - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Sila dayakan \\\"Sesi log masuk\\\" terlebih dahulu sebelum mendayakan \\\"Log masuk automatik\\\"",
diff --git a/web/src/locales/nl/data.json b/web/src/locales/nl/data.json
index 81cf9fb7..0ed681ae 100644
--- a/web/src/locales/nl/data.json
+++ b/web/src/locales/nl/data.json
@@ -92,6 +92,8 @@
"No verification": "Geen verificatie",
"Normal": "Normaal",
"Only signup": "Alleen registratie",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Organisatiekeuzemodus",
"Org choice mode - Tooltip": "Organisatiekeuzemodus - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Schakel eerst \\\"Aanmeldsessie\\\" in voordat je \\\"Automatische aanmelding\\\" inschakelt",
diff --git a/web/src/locales/pl/data.json b/web/src/locales/pl/data.json
index e7573b0a..c09fc091 100644
--- a/web/src/locales/pl/data.json
+++ b/web/src/locales/pl/data.json
@@ -92,6 +92,8 @@
"No verification": "Brak weryfikacji",
"Normal": "Normalny",
"Only signup": "Tylko rejestracja",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Tryb wyboru organizacji",
"Org choice mode - Tooltip": "Tryb wyboru organizacji - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Najpierw włącz \\\"sesję logowania\\\", zanim włączysz \\\"automatyczne logowanie\\\"",
diff --git a/web/src/locales/pt/data.json b/web/src/locales/pt/data.json
index e86939b0..9beef856 100644
--- a/web/src/locales/pt/data.json
+++ b/web/src/locales/pt/data.json
@@ -92,6 +92,8 @@
"No verification": "Sem verificação",
"Normal": "Normal",
"Only signup": "Apenas cadastro",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Modo de escolha da organização",
"Org choice mode - Tooltip": "Dica: modo de escolha da organização",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Por favor, habilite a \\\"Sessão de login\\\" primeiro antes de habilitar o \\\"Login automático\\\"",
diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json
index 5129c8df..cf07ba51 100644
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@@ -92,6 +92,8 @@
"No verification": "Без проверки",
"Normal": "Обычный",
"Only signup": "Только регистрация",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Режим выбора организации",
"Org choice mode - Tooltip": "Подсказка: режим выбора организации",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Пожалуйста, сначала включите «Сессия входа» перед включением «Автоматического входа»",
diff --git a/web/src/locales/sk/data.json b/web/src/locales/sk/data.json
index 5a3316af..f5063af5 100644
--- a/web/src/locales/sk/data.json
+++ b/web/src/locales/sk/data.json
@@ -92,6 +92,8 @@
"No verification": "Bez overenia",
"Normal": "Normálny",
"Only signup": "Len registrácia",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Režim výberu organizácie",
"Org choice mode - Tooltip": "Režim výberu organizácie - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Najprv povoľte \\\"Reláciu prihlásenia\\\" pred povolením \\\"Automatického prihlásenia\\\"",
diff --git a/web/src/locales/sv/data.json b/web/src/locales/sv/data.json
index ac7b1bf9..6ab2c99a 100644
--- a/web/src/locales/sv/data.json
+++ b/web/src/locales/sv/data.json
@@ -92,6 +92,8 @@
"No verification": "Tiada pengesahan",
"Normal": "Biasa",
"Only signup": "Hanya pendaftaran",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Mod pilihan organisasi",
"Org choice mode - Tooltip": "Mod pilihan organisasi - Tooltip",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Sila dayakan \\\"Sesi log masuk\\\" terlebih dahulu sebelum mendayakan \\\"Log masuk automatik\\\"",
diff --git a/web/src/locales/tr/data.json b/web/src/locales/tr/data.json
index 8579dec8..0d21cab5 100644
--- a/web/src/locales/tr/data.json
+++ b/web/src/locales/tr/data.json
@@ -92,6 +92,8 @@
"No verification": "Doğrulama yok",
"Normal": "Normal",
"Only signup": "Yalnızca kayıt",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Organizasyon seçim modu",
"Org choice mode - Tooltip": "Organizasyon seçim modu - Araç ipucu",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Lütfen \\\"Oturum açma oturumu\\\"nu etkinleştirmeden önce \\\"Otomatik oturum açma\\\"yı etkinleştirin",
diff --git a/web/src/locales/uk/data.json b/web/src/locales/uk/data.json
index 2b9780a1..a1bc14e0 100644
--- a/web/src/locales/uk/data.json
+++ b/web/src/locales/uk/data.json
@@ -92,6 +92,8 @@
"No verification": "Без підтвердження",
"Normal": "нормальний",
"Only signup": "Тільки реєстрація",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Режим вибору організації",
"Org choice mode - Tooltip": "Режим вибору організації – підказка",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Спочатку увімкніть \\\"Сесію входу\\\", перш ніж увімкнути \\\"Автоматичний вхід\\\"",
diff --git a/web/src/locales/vi/data.json b/web/src/locales/vi/data.json
index abf8334d..34f7f162 100644
--- a/web/src/locales/vi/data.json
+++ b/web/src/locales/vi/data.json
@@ -92,6 +92,8 @@
"No verification": "Không xác minh",
"Normal": "Bình thường",
"Only signup": "Chỉ đăng ký",
+ "Order": "Order",
+ "Order - Tooltip": "Order - Tooltip",
"Org choice mode": "Chế độ chọn tổ chức",
"Org choice mode - Tooltip": "Gợi ý chế độ chọn tổ chức",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Vui lòng kích hoạt \\\"Phiên đăng nhập\\\" trước khi kích hoạt \\\"Đăng nhập tự động\\\"",
diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json
index b01a2ed5..b88d363e 100644
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@@ -92,6 +92,8 @@
"No verification": "不校验",
"Normal": "标准",
"Only signup": "仅注册",
+ "Order": "Order",
+ "Order - Tooltip": "数值越小，在应用列表页面中排序越靠前",
"Org choice mode": "组织选择模式",
"Org choice mode - Tooltip": "采用什么方式选择要登录的组织",
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "开启 \\\"保持登录会话\\\" 后才能开启 \\\"自动登录\\\"",