|
|
fe61936b4f
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-15 19:50:28 +04:00 |
|
|
|
881b7bad4b
|
Translations: fix UselessTranslationKeysTest issues
|
2024-05-15 19:37:37 +04:00 |
|
|
|
f0d689c3c5
|
Merge branch 'develop' into bugfix/67405
|
2024-05-15 19:21:59 +04:00 |
|
|
|
97cf31e51e
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-13 19:11:03 +04:00 |
|
|
|
467f53220f
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-13 19:10:03 +04:00 |
|
|
|
981afb7fa2
|
updated si
|
2024-05-13 16:18:53 +03:00 |
|
|
|
a19a7da00a
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-13 11:30:00 +04:00 |
|
|
|
df9ced222f
|
Merge branch 'develop' into bugfix/form-room
|
2024-05-07 20:26:54 +04:00 |
|
|
|
374f2cf8a7
|
Merge branch 'develop' into feature/sdk-presets
|
2024-05-07 20:01:50 +04:00 |
|
|
|
54d95ec9da
|
Merge pull request #389 from ONLYOFFICE/feature/storage-space-limitation
feature/storage-space-limitation
|
2024-05-07 19:45:07 +04:00 |
|
Akmal Isomadinov
|
8b5af26b3b
|
Merge branch 'develop' into bugfix/form-room
|
2024-05-07 16:44:40 +05:00 |
|
Vladimir Khvan
|
6c7e8caa8d
|
Merge branch 'develop' into feature/sdk-presets
|
2024-05-07 15:30:30 +05:00 |
|
|
|
6aa6b0cfd4
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-06 20:08:13 +04:00 |
|
|
|
e1b3dff05c
|
Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
# packages/login/src/components/Login/index.tsx
|
2024-05-06 20:06:08 +04:00 |
|
|
|
5981d065f9
|
Merge branch 'hotfix/v2.5.1' into feature/langs-updates_0524
# Conflicts:
# packages/client/public/locales/si/Files.json
|
2024-05-06 19:23:23 +04:00 |
|
|
|
6d6e0acf51
|
Translations: Fix WrongTranslationVariablesTest issue (LinkSetDescription key)
|
2024-05-06 19:21:00 +04:00 |
|
|
|
c49fcc1adb
|
updated si
|
2024-05-06 18:15:49 +03:00 |
|
Vladimir Khvan
|
df4b248a81
|
Web: Client: Data Import: translation was corrected
|
2024-05-03 16:30:40 +05:00 |
|
|
|
4f2295c2d8
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-03 14:51:27 +04:00 |
|
|
|
b52e7af32c
|
Fix Bug 67813
No translation of Share panel in editor
|
2024-05-03 12:32:58 +03:00 |
|
|
|
e06a0ee594
|
Merge branch 'develop' into feature/connecting-storage
|
2024-05-02 18:18:24 +04:00 |
|
Akmal Isomadinov
|
e818c0389f
|
Merge branch 'develop' into bugfix/form-room
|
2024-05-02 16:11:58 +05:00 |
|
|
|
ee84c16335
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-02 15:05:36 +04:00 |
|
|
|
c1269a6a60
|
edited zh
|
2024-05-02 13:45:15 +03:00 |
|
Vladimir Khvan
|
c61fbe3e40
|
Web: Client: JavascriptSDK: translation was added
|
2024-05-02 13:43:11 +05:00 |
|
Akmal Isomadinov
|
662e0bef18
|
Client:Public:Locales:EmptyView Fixed translation
|
2024-05-01 14:05:21 +05:00 |
|
Vladimir Khvan
|
aa878a4d3c
|
Merge branch 'develop' into feature/connecting-storage
Conflicts:
packages/shared/api/files/index.ts
|
2024-04-30 14:38:43 +05:00 |
|
Vladimir Khvan
|
e4ab7e11e4
|
Merge branch 'develop' into feature/sdk-presets
|
2024-04-30 02:09:42 +05:00 |
|
Vladimir Khvan
|
8c8bd5a910
|
Web: Client: JavascriptSDK: reworked file selector's type selection
|
2024-04-30 01:47:49 +05:00 |
|
|
|
237bb490e8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/common/store/CurrentQuotaStore.js
# packages/shared/api/settings/index.ts
|
2024-04-27 17:24:21 +04:00 |
|
|
|
a1939a225a
|
Fix bug 65235 - Files. Display a bar notification about the reached disk space limit for Room admin/Power user.
|
2024-04-27 13:51:14 +03:00 |
|
|
|
846617aacc
|
Merge branch 'develop' into feature/profile-active-sessions
|
2024-04-26 18:05:58 +04:00 |
|
|
|
fcc50d6dfc
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-26 18:05:43 +04:00 |
|
|
|
fede13cd74
|
Translations: Moved "Errors:InvalidLink" to Common
|
2024-04-26 17:41:30 +04:00 |
|
|
|
1ab2c02025
|
Merge branch 'develop' into feature/sdk-presets
# Conflicts:
# public/locales/en/Common.json
|
2024-04-26 16:40:45 +04:00 |
|
|
|
f9c2426fcd
|
Merge branch 'develop' into feature/profile-active-sessions
|
2024-04-26 16:06:31 +04:00 |
|
Vladimir Khvan
|
bd5d8810f4
|
Merge branch 'develop' into feature/connecting-storage
Conflicts:
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/ThirdPartyComboBox.js
|
2024-04-24 16:14:43 +05:00 |
|
|
|
9705f93ab9
|
Merge branch 'develop' into feature/profile-active-sessions
# Conflicts:
# packages/shared/components/empty-view/EmptyView.styled.ts
|
2024-04-24 15:15:56 +05:00 |
|
Vladimir Khvan
|
5542b5245a
|
Web: Client: JavascriptSDK: corrected ShowEditedFiles translation
|
2024-04-23 14:14:05 +05:00 |
|
Vladimir Khvan
|
45e3133382
|
Merge branch 'develop' into feature/sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
|
2024-04-23 14:05:15 +05:00 |
|
Akmal Isomadinov
|
41e70017a0
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/shared/components/empty-view/EmptyView.styled.ts
|
2024-04-22 19:22:51 +05:00 |
|
|
|
d2733829e5
|
Merge branch 'release/v2.5.0' into develop
|
2024-04-19 19:10:43 +04:00 |
|
|
|
3568091e0f
|
Merge branch 'develop' into feature/profile-active-sessions
# Conflicts:
# packages/client/src/pages/Profile/Section/Body/sub-components/active-session/styled-active-sessions.js
|
2024-04-19 18:42:23 +05:00 |
|
Akmal Isomadinov
|
0623e57d9e
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/doceditor/src/utils/index.ts
|
2024-04-19 16:42:10 +05:00 |
|
|
|
af7ea9116e
|
Translations: Moved 'Reconnect' key to Common
|
2024-04-19 14:54:40 +04:00 |
|
Vladimir Khvan
|
88132ddb35
|
Web: Client: JavascriptSDK: corrected translations
|
2024-04-19 14:27:03 +05:00 |
|
|
|
8a202e1d79
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/shared/utils/common.ts
|
2024-04-19 13:13:00 +04:00 |
|
Akmal Isomadinov
|
4027d69236
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/doceditor/src/utils/actions.ts
# public/locales/en/Common.json
|
2024-04-18 12:23:54 +05:00 |
|
Akmal Isomadinov
|
081eb3c32c
|
Client:Components:EmptyContainer Added empty screen for form filler
|
2024-04-17 17:18:52 +05:00 |
|
Akmal Isomadinov
|
abea7a8655
|
Client:Components:EmptyContainer Added upload action
|
2024-04-17 16:55:18 +05:00 |
|
