|
|
e7e6b5c48a
|
Merge branch 'develop' into feature/security-active-sessions
|
2024-07-11 12:30:51 +04:00 |
|
|
|
99e265ebee
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/middleware.ts
# packages/login/src/utils/index.ts
# packages/shared/components/table/TableHeader.tsx
# packages/shared/routes/Route.private.tsx
|
2024-07-11 12:27:31 +04:00 |
|
|
|
06ee26f1cf
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# packages/shared/components/table/Table.types.ts
|
2024-07-10 22:12:03 +05:00 |
|
|
|
d7bd794854
|
Fix Bug 69074
|
2024-07-10 13:56:21 +03:00 |
|
|
|
b1b7c75941
|
Fix UselessTranslationKeysTest issues
|
2024-07-10 13:16:14 +04:00 |
|
|
|
0d7a02a7fc
|
Fix Bug 69003 - Hide history display for rooms based on third-party storage.
|
2024-07-08 13:00:54 +03:00 |
|
|
|
dd435561a5
|
setup default config for oauth origin parameter
|
2024-07-04 18:51:04 +03:00 |
|
|
|
ec50a38834
|
Fix Bug 68956: Wrong documents icon on tablet/mobile
|
2024-07-03 13:20:59 +02:00 |
|
|
|
c69e321daa
|
Fix bug 68262 - Add hint text above the new password input.
|
2024-07-02 16:01:27 +03:00 |
|
|
|
5f712f87f3
|
Add oauth origin for client config
|
2024-06-28 18:44:39 +03:00 |
|
|
|
7b81e7c384
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
# yarn.lock
|
2024-06-25 21:24:23 +05:00 |
|
|
|
0fb2b762c0
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-24 14:01:36 +03:00 |
|
|
|
35ef0b8832
|
images: notifications: new icon
|
2024-06-22 15:08:03 +03:00 |
|
|
|
8c976678d2
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-21 11:38:29 +04:00 |
|
|
|
51bb9ccbfe
|
Translations: Fix EmptyValueKeysTest issues
|
2024-06-20 16:51:42 +04:00 |
|
|
|
056cad63a4
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-20 15:41:14 +03:00 |
|
|
|
b5ae010c29
|
Translations: Fix WrongTranslationVariablesTest issues
|
2024-06-20 16:27:14 +04:00 |
|
|
|
13cc8c1ad5
|
Translations: Fix UselessTranslationKeysTest
|
2024-06-20 15:29:24 +04:00 |
|
|
|
8283ed16e6
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-20 12:46:42 +04:00 |
|
|
|
f713c56f50
|
added empty screen
|
2024-06-19 20:02:37 +05:00 |
|
|
|
f16ba9f57e
|
Public:Scripts:Config: add oauth2 publicClient flag
|
2024-06-19 15:19:18 +03:00 |
|
|
|
252eb14be5
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-19 15:16:18 +03:00 |
|
|
|
405879c64d
|
fixed translates
|
2024-06-19 16:40:41 +05:00 |
|
Akmal Isomadinov
|
99cd9ad8cc
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-19 15:59:19 +05:00 |
|
Akmal Isomadinov
|
4d48d3563e
|
Public:Locales Fixed translation
|
2024-06-19 14:47:38 +05:00 |
|
Akmal Isomadinov
|
a9f38e7586
|
Client:Home:InfoPanel Added anonymous
|
2024-06-19 14:45:57 +05:00 |
|
|
|
4484cc42c5
|
fix bad merge
|
2024-06-19 12:42:05 +05:00 |
|
|
|
c10aec0122
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/HOCs/withPeopleContent.js
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/helpers/people-helpers.js
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/store/SelectionPeopleStore.js
# packages/shared/enums/index.ts
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2024-06-19 11:46:30 +05:00 |
|
|
|
8a001cf415
|
Added new images for notifications
|
2024-06-18 18:25:18 +03:00 |
|
|
|
6145817cb8
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-18 13:12:53 +03:00 |
|
Akmal Isomadinov
|
1b99bc534f
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-18 14:44:51 +05:00 |
|
|
|
a74bcac2f1
|
edited variables sr-cyrl
|
2024-06-18 11:28:09 +03:00 |
|
Akmal Isomadinov
|
181f412e8c
|
Doceditor: Fixed share PDF form
|
2024-06-18 12:02:21 +05:00 |
|
Akmal Isomadinov
|
67f9c3097e
|
Public:Locales Fixed context menu
|
2024-06-17 16:43:04 +05:00 |
|
|
|
a639635c98
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/login/src/components/LoginForm/index.tsx
# packages/shared/store/SettingsStore.ts
# public/locales/en/Common.json
|
2024-06-17 15:17:07 +04:00 |
|
|
|
834513ecd3
|
Client: Added common flag for "sr-Cyrl-RS"
|
2024-06-17 14:55:55 +04:00 |
|
Akmal Isomadinov
|
90f103b5cf
|
Public:Locales Fixed description form room
|
2024-06-17 14:28:22 +05:00 |
|
|
|
918cd0db9c
|
Merge branch 'develop' into feature/embedding-settings
# Conflicts:
# packages/client/src/components/panels/EditLinkPanel/index.js
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
|
2024-06-14 15:48:00 +03:00 |
|
|
|
f60ef3547d
|
Renaming.
|
2024-06-14 13:19:28 +03:00 |
|
|
|
1fcd54c654
|
Fixed translation.
|
2024-06-14 12:35:42 +03:00 |
|
|
|
b7fbb88185
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-14 12:32:13 +03:00 |
|
|
|
6101c7ad60
|
Fixed after merge.
|
2024-06-14 11:03:07 +03:00 |
|
|
|
5593c4b655
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 11:27:02 +04:00 |
|
|
|
a72616801b
|
gs
# Conflicts:
# i18next/client.babel
# packages/client/public/locales/sr-Latn-RS/SMTPSettings.json
# packages/login/public/locales/en/Login.json
# public/locales/ar-SA/Common.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-06-13 19:24:05 +04:00 |
|
|
|
0730775b36
|
Merge branch 'feature/sr-cyrl' into develop
# Conflicts:
# packages/client/public/locales/en/PrivacyPage.json
# packages/client/public/locales/sr-Latn-RS/ChangeUserStatusDialog.json
# packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
# packages/client/public/locales/sr-Latn-RS/Files.json
# packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
# packages/client/public/locales/sr-Latn-RS/Notifications.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PrivacyPage.json
# packages/client/public/locales/sr-Latn-RS/Settings.json
# packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
# packages/client/public/locales/sr-Latn-RS/Webhooks.json
# public/locales/sr-Latn-RS/Common.json
|
2024-06-13 14:23:08 +04:00 |
|
|
|
c88c4b84bf
|
Fixed after merge.
|
2024-06-13 12:11:08 +03:00 |
|
|
|
3fb8f58206
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# public/locales/ar-SA/Common.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-06-13 11:28:33 +03:00 |
|
|
|
cb0fd44eb3
|
Merge branch 'develop' into bugfix/standalone
|
2024-06-11 20:32:48 +04:00 |
|
|
|
c8a04cce7b
|
Added new translation.
|
2024-06-11 18:34:47 +03:00 |
|
Akmal Isomadinov
|
fb940c9add
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-11 20:15:15 +05:00 |
|
