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 |
|
|
|
8a001cf415
|
Added new images for notifications
|
2024-06-18 18:25:18 +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 |
|
|
|
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 |
|
|
|
bfddeae2e2
|
Fixed after merge.
|
2024-06-11 17:17:09 +03:00 |
|
|
|
55c9942146
|
Renaming portalName value.
|
2024-06-11 13:28:32 +03:00 |
|
|
|
a3c74828b8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js
|
2024-06-10 23:42:36 +04:00 |
|
|
|
0758c55720
|
Added FromPortal key.
|
2024-06-10 20:46:43 +03:00 |
|
|
|
440553c265
|
Added SelectFromPortal key.
|
2024-06-10 20:45:45 +03:00 |
|
|
|
d27122e99b
|
Added PortalOwner key.
|
2024-06-10 20:42:04 +03:00 |
|
|
|
9cc09bb00f
|
Added PortalAdmin key.
|
2024-06-10 20:40:58 +03:00 |
|
|
|
c544c8622a
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js
# packages/login/public/locales/en/Login.json
|
2024-06-10 16:56:09 +04:00 |
|
Akmal Isomadinov
|
58dbc2f406
|
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-10 17:40:22 +05:00 |
|
Akmal Isomadinov
|
71cd1ec9ea
|
Public:locales transfers moved to a common
|
2024-06-10 15:42:14 +05:00 |
|
|
|
a566a23b0b
|
Fixed translations.
|
2024-06-10 12:57:55 +03:00 |
|
|
|
5260b39b40
|
Changed Common translation.
|
2024-06-10 12:51:40 +03:00 |
|
Akmal Isomadinov
|
ad43e12216
|
Web:Public:Locales: Added translations
|
2024-06-10 11:21:11 +05:00 |
|
|
|
1eb54ab218
|
Fixed translations.
|
2024-06-08 22:01:35 +03:00 |
|
|
|
c8df2d9703
|
Merge branch 'develop' into feature/branding-correction
# Conflicts:
# packages/client/public/locales/ar-SA/CreateEditRoomDialog.json
# packages/client/public/locales/az/CreateEditRoomDialog.json
# packages/client/public/locales/bg/CreateEditRoomDialog.json
# packages/client/public/locales/cs/CreateEditRoomDialog.json
# packages/client/public/locales/de/CreateEditRoomDialog.json
# packages/client/public/locales/el-GR/CreateEditRoomDialog.json
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/es/CreateEditRoomDialog.json
# packages/client/public/locales/fi/CreateEditRoomDialog.json
# packages/client/public/locales/fr/CreateEditRoomDialog.json
# packages/client/public/locales/hy-AM/CreateEditRoomDialog.json
# packages/client/public/locales/it/CreateEditRoomDialog.json
# packages/client/public/locales/ja-JP/CreateEditRoomDialog.json
# packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
# packages/client/public/locales/lo-LA/CreateEditRoomDialog.json
# packages/client/public/locales/lv/CreateEditRoomDialog.json
# packages/client/public/locales/nl/CreateEditRoomDialog.json
# packages/client/public/locales/pl/CreateEditRoomDialog.json
# packages/client/public/locales/pt-BR/CreateEditRoomDialog.json
# packages/client/public/locales/pt/CreateEditRoomDialog.json
# packages/client/public/locales/ro/CreateEditRoomDialog.json
# packages/client/public/locales/ru/CreateEditRoomDialog.json
# packages/client/public/locales/si/CreateEditRoomDialog.json
# packages/client/public/locales/sk/CreateEditRoomDialog.json
# packages/client/public/locales/sl/CreateEditRoomDialog.json
# packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
# packages/client/public/locales/tr/CreateEditRoomDialog.json
# packages/client/public/locales/uk-UA/CreateEditRoomDialog.json
# packages/client/public/locales/vi/CreateEditRoomDialog.json
# packages/client/public/locales/zh-CN/CreateEditRoomDialog.json
|
2024-06-07 15:49:36 +03:00 |
|
|
|
03d313606f
|
Deleted zh-CN translations.
|
2024-06-07 15:26:45 +03:00 |
|
|
|
5d741e793b
|
LDAP: Fix last status of operation completed
|
2024-06-07 15:48:54 +04:00 |
|
|
|
91d034a385
|
Merge branch 'develop' into feature/ldap-settings
|
2024-06-07 12:05:06 +04:00 |
|
|
|
b10b85e8ab
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
|
2024-06-06 23:14:40 +04:00 |
|
|
|
e3575a111b
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-06 22:52:10 +04:00 |
|
Akmal Isomadinov
|
2a52259060
|
Merge branch 'develop' into feature/form-room
|
2024-06-06 17:16:16 +05:00 |
|
|
|
aa588ddf7f
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-06 11:56:58 +04:00 |
|
|
|
ed70df3c23
|
Merge branch 'develop' into feature/ldap-settings
|
2024-06-06 11:52:47 +04:00 |
|
|
|
31e2dc32fd
|
Merge branch 'develop' into feature/create-room-selector
|
2024-06-05 16:20:51 +03:00 |
|
|
|
43a2d37596
|
Web: Files: fixed palm cursor
|
2024-06-05 13:22:21 +03:00 |
|
|
|
ce9da8e898
|
Client: move translation key to 'Common'
|
2024-06-05 11:13:23 +03:00 |
|
|
|
a81baf7e74
|
added sr-cyrl
|
2024-06-04 15:29:57 +03:00 |
|
|
|
c58d44e55e
|
Move some translation keys to Common.json
|
2024-06-03 19:22:44 +03:00 |
|
Akmal Isomadinov
|
70c3a24e4f
|
Doceditor: Added CompletedForm page
|
2024-05-31 21:34:29 +05:00 |
|
|
|
2779f4c0b8
|
Web: Files: added document embedding
|
2024-05-30 18:35:14 +03:00 |
|
|
|
7f8b7ddc4f
|
Fixed translations.
|
2024-05-30 17:42:40 +03:00 |
|
|
|
3e942791be
|
Added interpolation for 'SpaceUsersOnly' key.
|
2024-05-30 17:40:29 +03:00 |
|
|
|
f238741429
|
Fixed translation.
|
2024-05-30 17:37:21 +03:00 |
|
|
|
4d3e61b703
|
Added interpolation for 'SelectFromDocspace' key.
|
2024-05-30 16:40:55 +03:00 |
|
|
|
7fd2cad5ee
|
Added interpolation for 'FromDocspace' key.
|
2024-05-30 16:39:22 +03:00 |
|
|
|
364c25a813
|
Added interpolation for 'BetaBadgeDescription' key.
|
2024-05-30 16:36:00 +03:00 |
|
Akmal Isomadinov
|
6a9410379d
|
Client:Dialogs:CreatedPDFFormDialog Added actions and update icons
|
2024-05-30 18:14:00 +05:00 |
|
Akmal Isomadinov
|
fb77fa76da
|
Client:EmptyView Added folder empty screen
|
2024-05-30 17:01:20 +05:00 |
|
|
|
1809b8cd92
|
Added interpolation for 'TurnOffDiskSpaceLimit key.
|
2024-05-30 14:57:14 +03:00 |
|
|
|
3313d4f020
|
Added interpolation for 'SetDiskSpaceQuota' key.
|
2024-05-30 14:54:02 +03:00 |
|
|
|
c02cc44108
|
Added interpolation for 'PortalRestriction' key.
|
2024-05-30 14:48:46 +03:00 |
|
|
|
ab7d326315
|
Added interpolation for 'InvitationToPortal' key.
|
2024-05-30 14:39:57 +03:00 |
|
|
|
706d28344b
|
Added interpolation for 'ErrorDeactivatedText' key.
|
2024-05-30 14:30:22 +03:00 |
|
|
|
53529ce19a
|
Added interpolation for 'EmptyDescription' key.
|
2024-05-30 14:04:56 +03:00 |
|
|
|
8c7bd1a241
|
Added interpolation for 'DocspaceOwner' key.
|
2024-05-30 13:27:15 +03:00 |
|
|
|
c0ee32f303
|
Added interpolation for 'DocspaceAdmin' key.
|
2024-05-30 13:13:43 +03:00 |
|
Akmal Isomadinov
|
def84f02a4
|
Client:Public:Image:EmptyView Fixed empty images
|
2024-05-29 22:56:08 +05:00 |
|
Akmal Isomadinov
|
4725272d39
|
Merge branch 'feature/form-room-new-icons' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.tsx
# packages/shared/components/empty-view/EmptyView.styled.ts
# public/images/emptyview/upload.device.pdf.form.svg
# public/images/emptyview/upload.pdf.form.svg
|
2024-05-29 21:14:25 +05:00 |
|
|
|
7d8cb75c93
|
Web: Files: EmbeddingPanel: fixed icon, added bar
|
2024-05-29 17:56:28 +03:00 |
|
|
|
0ca78803ab
|
added sr-Cyrl
|
2024-05-29 15:18:22 +03:00 |
|
|
|
99f1b8375e
|
i18next: apply sorting of keys
|
2024-05-29 13:39:15 +04:00 |
|
|
|
12d8e073c2
|
Translations: Moved Authentication key to Common
|
2024-05-29 12:49:21 +04:00 |
|
Akmal Isomadinov
|
af4a9196e6
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/store/ContextOptionsStore.js
|
2024-05-28 17:39:01 +05:00 |
|
|
|
ba710cf5b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-28 13:43:20 +04:00 |
|
|
|
4b81764d18
|
Merge branch 'develop' into feature/selector-input
|
2024-05-28 11:39:09 +04:00 |
|
Akmal Isomadinov
|
10231dee4c
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/pages/Home/Section/Header/index.js
|
2024-05-28 11:07:30 +05:00 |
|
|
|
dc0cfee0b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 21:19:46 +04:00 |
|
Akmal Isomadinov
|
28dae97d48
|
Client:Components:EmptyContainer: Added share option
|
2024-05-27 21:59:35 +05:00 |
|
|
|
db22ee0060
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 17:32:14 +03:00 |
|
Akmal Isomadinov
|
5b32ed6d88
|
Client: Fix translation
|
2024-05-27 18:36:45 +05:00 |
|
|
|
1bf71d5ee2
|
Merge branch 'develop' into feature/new-room-icons
|
2024-05-27 17:12:43 +04:00 |
|
|
|
410f69e130
|
Merge branch 'develop' into feature/editor-in-same-tab
|
2024-05-27 16:31:42 +04:00 |
|
|
|
da064a698f
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 16:23:36 +04:00 |
|
namushka
|
6cec1d0111
|
Merge branch 'develop' into feature/new-room-icons
|
2024-05-27 12:04:49 +03:00 |
|
|
|
4177c53d5c
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 10:57:57 +03:00 |
|
|
|
8ed897cde2
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 10:21:52 +03:00 |
|
Akmal Isomadinov
|
ad48bac511
|
Client:Components:MainButton Added new actions
|
2024-05-24 20:12:47 +05:00 |
|
namushka
|
9af68dbd94
|
updated icons for RoomIcon component
|
2024-05-24 14:02:49 +03:00 |
|
Akmal Isomadinov
|
0c15e805ae
|
Merge branch 'develop' into feature/form-room-new-icons
|
2024-05-24 15:14:37 +05:00 |
|
|
|
ee24512bdd
|
Merge branch 'develop' into feature/editor-in-same-tab
|
2024-05-24 12:33:20 +03:00 |
|
|
|
d1061bb3ae
|
renaming resource keys
|
2024-05-23 18:14:33 +03:00 |
|
|
|
d90ad9d951
|
Merge pull request #425 from ONLYOFFICE/feature/resources-correction
Feature/resource correction
|
2024-05-23 18:13:30 +04:00 |
|
|
|
c440260f71
|
resource correction
|
2024-05-22 22:54:57 +03:00 |
|
Akmal Isomadinov
|
debee1490b
|
Public:images:EmptyView Fixed color
|
2024-05-22 20:43:01 +05:00 |
|
|
|
e77b80f227
|
Add images for selector input item
|
2024-05-22 17:03:58 +03:00 |
|
Akmal Isomadinov
|
e754d7c069
|
Public:Image:EmptyView Added new icons
|
2024-05-22 17:34:32 +05:00 |
|
|
|
db58a3fee9
|
Web: delete openOnNewPage from config
|
2024-05-21 13:09:17 +03:00 |
|
