|
|
fc31cd290b
|
Merge branch 'develop' into feature/user-quota
|
2024-02-16 17:23:49 +04:00 |
|
|
|
ff37aa1b48
|
Merge branch 'develop' into bugfix/article-error
|
2024-02-16 12:52:29 +04:00 |
|
|
|
0e5368b03a
|
Shared:Components:Zendesk: move zendeskAPI to separate file and rewrite to class
|
2024-02-16 10:43:46 +03:00 |
|
|
|
e77378ce2b
|
Shared:Components:Article: restore article body
|
2024-02-16 10:43:14 +03:00 |
|
|
|
25bc1d9fdc
|
Merge branch 'develop' into feature/user-quota
|
2024-02-16 01:11:33 +04:00 |
|
|
|
fd86a6ffa4
|
Merge branch 'develop' into feature/user-quota
|
2024-02-15 23:26:24 +04:00 |
|
|
|
c59225610a
|
Shared: Components: Filter: delete useless
|
2024-02-15 18:30:47 +03:00 |
|
|
|
17a12deedd
|
Merge pull request #266 from ONLYOFFICE/bugfix/article-error
Shared:Components:Article: return part of article body and delete use…
|
2024-02-15 16:30:07 +04:00 |
|
|
|
0987d0785f
|
Shared:Components:Article: return part of article body and delete useless console log
|
2024-02-15 15:21:45 +03:00 |
|
|
|
4e14e52cfc
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-02-15 16:05:41 +04:00 |
|
|
|
3339d7478a
|
Shared: Components: ColorTheme: delete useless
|
2024-02-15 15:04:11 +03:00 |
|
|
|
4aaf55dcb0
|
Shared:Components:Article: add logs for detect 130 error and hide part of content
|
2024-02-15 14:10:48 +03:00 |
|
|
|
3380ea9318
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/helpers/enums.ts
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/TableStore.js
|
2024-02-15 12:08:27 +03:00 |
|
|
|
e2521ff22a
|
Merge branch 'develop' into feature/rewrite-recover-access-modal-dialog
|
2024-02-14 17:04:15 +04:00 |
|
|
|
6980f088bd
|
Merge branch 'develop' into bugfix/my-documents-share
|
2024-02-14 16:29:35 +04:00 |
|
|
|
f208280cd8
|
Merge branch 'develop' into feature/rewrite-beta-badge
|
2024-02-14 16:23:25 +04:00 |
|
|
|
c5a24619dd
|
Merge branch 'develop' into feature/rewrite-app-loader
|
2024-02-14 16:10:00 +04:00 |
|
|
|
b151e17a25
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-14 15:40:16 +04:00 |
|
|
|
0d6ff55fb7
|
Web: Files: UploadPanel: fixed Minified React error #130
|
2024-02-14 14:29:03 +03:00 |
|
|
|
405406d9e5
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/routes/portalSettings.js
# public/locales/en/Common.json
|
2024-02-14 14:19:11 +03:00 |
|
|
|
e909a104cb
|
Web: ToggleButton: Refactoring.
|
2024-02-14 14:12:48 +03:00 |
|
Akmal Isomadinov
|
a00fe8cbf2
|
Merge branch 'develop' into feature/rewrite-recover-access-modal-dialog
# Conflicts:
# packages/client/src/pages/PortalUnavailable/index.js
# packages/login/src/client/components/Login.tsx
|
2024-02-14 16:03:20 +05:00 |
|
Akmal Isomadinov
|
e042f7c8eb
|
Merge branch 'develop' into feature/rewrite-app-loader
# Conflicts:
# packages/client/src/components/System/index.js
|
2024-02-14 15:41:23 +05:00 |
|
|
|
5b28408a17
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/TableStore.js
# packages/client/src/store/index.js
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/utils/common.ts
# public/locales/en/Common.json
|
2024-02-14 12:15:32 +03:00 |
|
Akmal Isomadinov
|
b8e83bb0fe
|
Client: Fix provider order and refactoring
|
2024-02-14 12:21:57 +05:00 |
|
|
|
20887d0f4b
|
Move some error translation keys to common
|
2024-02-14 02:27:50 +04:00 |
|
|
|
d8c2da7abf
|
Merge branch 'develop' into feature/rewrite-error-boundary
|
2024-02-14 01:21:13 +04:00 |
|
Akmal Isomadinov
|
faf3990959
|
Shared:Components:RecoverAccessModalDialog Rewrite and moved to shared
|
2024-02-14 00:39:02 +05:00 |
|
|
|
6ff443de9a
|
Merge branch 'develop' into bugfix/my-documents-share
|
2024-02-13 13:08:28 +03:00 |
|
Akmal Isomadinov
|
3cb31f417a
|
Merge branch 'develop' into feature/rewrite-error-boundary
|
2024-02-13 14:28:52 +05:00 |
|
Akmal Isomadinov
|
55adeea6c1
|
Merge branch 'develop' into feature/rewrite-app-loader
# Conflicts:
# packages/client/src/pages/Sdk/index.js
|
2024-02-13 14:13:51 +05:00 |
|
Akmal Isomadinov
|
f9902d95fc
|
Shared:Components:BetaBadge Rewrite and moved to shared
|
2024-02-13 14:05:47 +05:00 |
|
Akmal Isomadinov
|
2084477720
|
Shared:Components:MoreLoginModal Rewrite and moved to shared
|
2024-02-13 11:27:26 +05:00 |
|
|
|
ca200878d9
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-12 20:21:07 +04:00 |
|
Akmal Isomadinov
|
10bb0b6fc4
|
Shared:Components:AppLoader: Rewrite to typescript
|
2024-02-12 17:49:29 +05:00 |
|
Akmal Isomadinov
|
e933e911ba
|
AppLoader moved from common to shared
|
2024-02-12 16:41:00 +05:00 |
|
|
|
66b311743d
|
Shared: Filter: return sort button for recent
|
2024-02-11 20:30:16 +03:00 |
|
|
|
88b0184a08
|
Merge branch 'develop' into bugfix/my-documents-share
|
2024-02-10 00:46:50 +03:00 |
|
|
|
d997ce3eb6
|
Shared: LinkWithDropdown: fix style
|
2024-02-10 00:40:59 +03:00 |
|
|
|
d40ca0bb97
|
Merge branch 'develop' into bugfix/calendar
|
2024-02-09 19:25:48 +04:00 |
|
Vladimir Khvan
|
137207b78b
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/shared/selectors/Room/RoomSelector.types.ts
packages/shared/selectors/Room/index.tsx
|
2024-02-09 20:24:06 +05:00 |
|
|
|
b57da7b8d4
|
Merge branch 'develop' into feature/invite-panel-input
|
2024-02-09 18:16:55 +04:00 |
|
|
|
d0c3d6be6d
|
Merge pull request #246 from ONLYOFFICE/bugfix/table-resize
Web: Components: Table: fixed resize
|
2024-02-09 18:15:13 +04:00 |
|
|
|
d9b026c166
|
Merge branch 'develop' into feature/invite-panel-input
# Conflicts:
# packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
# packages/client/src/components/panels/InvitePanel/sub-components/Item.js
|
2024-02-09 17:11:02 +03:00 |
|
Vladimir Khvan
|
528fdae2f5
|
Web: Client: Component: minDate, maxDate and initialDate issues were fixed
|
2024-02-09 18:35:22 +05:00 |
|
|
|
5fa8ebe810
|
Web: Components: Table: fixed resize
|
2024-02-09 16:28:16 +03:00 |
|
Akmal Isomadinov
|
84a0bde5a2
|
Removed useless code
|
2024-02-09 15:52:02 +05:00 |
|
Akmal Isomadinov
|
1c95617184
|
Shared:Components:ErrorBoundary Added missing props
|
2024-02-09 15:51:04 +05:00 |
|
Akmal Isomadinov
|
d610ab622a
|
Shared:Components:Errors Rewrite to typescript
|
2024-02-09 14:26:00 +05:00 |
|
Akmal Isomadinov
|
4541d4cdfa
|
Shared:Components:ReportDialog Rewrite to typescript
|
2024-02-09 14:07:14 +05:00 |
|
