|
|
a908363898
|
Web: Files: Public-room: fixed socket error, refactoring
|
2023-06-14 15:52:28 +03:00 |
|
Viktor Fomin
|
4ba3fda1fa
|
Common: Utils: Firebase: fix
|
2023-06-14 10:47:23 +03:00 |
|
Viktor Fomin
|
41998d9a06
|
Common: Utils: Firebase: fix
|
2023-06-13 14:26:06 +03:00 |
|
|
|
ca03feb835
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-05 14:28:21 +03:00 |
|
|
|
7e601fa5e2
|
Merge branch 'develop' into feature/public-room
|
2023-06-05 12:38:12 +03:00 |
|
Viktor Fomin
|
215c27d6b9
|
Common: Utils: Firebase: add isEnabledDB
|
2023-06-02 18:25:54 +03:00 |
|
Viktor Fomin
|
b30f404d05
|
Common: Utils: Firebase: add error handling
|
2023-06-02 16:31:09 +03:00 |
|
|
|
7287880862
|
Web: Files: Public-room: refactoring api requests
|
2023-06-02 16:25:30 +03:00 |
|
|
|
2dae5a3a4a
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-06-02 13:16:21 +04:00 |
|
|
|
b5b1d30aa3
|
Merge branch 'develop' into feature/public-room
|
2023-06-02 11:55:10 +03:00 |
|
|
|
0c072c0c55
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-01 14:53:15 +03:00 |
|
|
|
8bba856ec4
|
Merge branch 'develop' into feature/redirect-after-access-denied
# Conflicts:
# packages/client/src/pages/Home/index.js
# packages/client/src/routes/client.js
|
2023-06-01 14:41:43 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
Viktor Fomin
|
06f440a36d
|
Common: Utils: Firebase: add sendCrashReport
|
2023-05-31 16:32:20 +03:00 |
|
Viktor Fomin
|
4f3f68b24e
|
Common: Utils: useThemeDetector: fix warning
|
2023-05-31 12:34:51 +03:00 |
|
|
|
3b74cf457a
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
|
2023-05-30 12:43:31 +03:00 |
|
|
|
73e707a3f6
|
Web: Added check for filter instead of "instanceof".
|
2023-05-29 17:14:50 +03:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
d803201ec5
|
Web: Files: fixed sharing-dialog
|
2023-05-26 15:06:30 +03:00 |
|
|
|
37f0bf9920
|
SDK: Added events callback from config
|
2023-05-26 12:33:54 +03:00 |
|
|
|
53baa82197
|
Added methods for creating hash
|
2023-05-26 12:33:54 +03:00 |
|
|
|
99e9aa852d
|
Web: Files: added socket support to public room
|
2023-05-24 15:08:02 +03:00 |
|
|
|
94388c0616
|
Merge branch 'hotfix/v1.0.1' into feature/standalone
|
2023-05-23 17:00:12 +03:00 |
|
|
|
e5a0170c22
|
Web: Files: added RoomSharingDialog
|
2023-05-22 13:17:11 +03:00 |
|
Viktor Fomin
|
e3bc603f9d
|
Fix Bug 62511: Uninformative error when session time expires
|
2023-05-16 15:53:40 +03:00 |
|
|
|
4401a35a1f
|
Merge branch 'feature/standalone' of https://github.com/ONLYOFFICE/DocSpace into feature/standalone
|
2023-05-16 13:12:24 +04:00 |
|
|
|
dd78d891f1
|
Web: Added getting info from api.
|
2023-05-15 13:15:39 +03:00 |
|
|
|
c61c938729
|
removed x-rewriter-url
|
2023-05-03 20:25:50 +03:00 |
|
|
|
5f99ad8698
|
Merge branch 'develop' into feature/redirect-after-access-denied
|
2023-04-27 17:05:38 +04:00 |
|
Timofey Boyko
|
2f4c61b778
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-04-27 10:06:07 +03:00 |
|
|
|
0f8d44800a
|
Web: Files: added public-room translation, icons
|
2023-04-26 16:34:22 +03:00 |
|
|
|
a7dc928f27
|
Web: Fix removeEventListener usage
|
2023-04-24 13:56:03 +04:00 |
|
|
|
64ccf41ad1
|
Web: Fixed redirect after merge.
|
2023-04-24 12:23:20 +03:00 |
|
|
|
339102aa77
|
Merge branch 'develop' into feature/redirect-after-access-denied
# Conflicts:
# packages/client/src/pages/Files.jsx
|
2023-04-24 12:21:15 +03:00 |
|
|
|
c100b87933
|
Web: Added redirect with navigate. Added redirect to archives.
|
2023-04-20 17:59:15 +03:00 |
|
|
|
a8816c43fe
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-04-20 14:34:57 +04:00 |
|
|
|
b6f84d510d
|
Web: Replaced deprecated addListener of matchMedia (fix crash)
|
2023-04-17 17:37:17 +04:00 |
|
Timofey Boyko
|
d2f4748d79
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-04-17 12:31:05 +03:00 |
|
|
|
dfa30fdc3b
|
Web: Moved logic to a common file.
|
2023-04-13 15:55:39 +03:00 |
|
Viktor Fomin
|
4d80e002ce
|
Common: Utils: fix getProviderTranslation
|
2023-04-11 14:21:17 +03:00 |
|
|
|
fa7447048c
|
Web: The function has been moved to the common 'utils'.
|
2023-04-07 17:23:34 +03:00 |
|
Timofey Boyko
|
fdaf44956b
|
Merge branch 'release/v1.0.0' into branch feature/image-thumbnail
|
2023-03-29 13:04:09 +03:00 |
|
|
|
2448456ed2
|
Web: Utils: Refactoring.
|
2023-03-28 13:37:31 +03:00 |
|
|
|
c5d773194c
|
Web: Utils: Refactoring function.
|
2023-03-28 13:31:41 +03:00 |
|
Timofey Boyko
|
e48fe72577
|
Merge branch 'release/v1.0.0' into branch feature/image-thumbnail
|
2023-03-22 15:51:16 +03:00 |
|
Timofey Boyko
|
bde6197071
|
Revert "Merge branch 'release/1.0.0' into branch feature/image-thumbnail"
This reverts commit ae890b8595.
|
2023-03-22 15:37:41 +03:00 |
|
Timofey Boyko
|
ae890b8595
|
Merge branch 'release/1.0.0' into branch feature/image-thumbnail
|
2023-03-22 15:10:35 +03:00 |
|
|
|
85af9dc2d8
|
Web: Fixed translation.
|
2023-03-17 13:02:04 +03:00 |
|
Timofey Boyko
|
cbecc8df9b
|
Web:Common:Utils: add max item count for indexed db store
|
2023-03-09 17:38:08 +03:00 |
|
Timofey Boyko
|
77775c2084
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-03-06 18:39:46 +03:00 |
|
Timofey Boyko
|
8d2df6fb57
|
Web:Common:Utils: add helper for indexedDB
|
2023-03-06 18:16:01 +03:00 |
|
|
|
83c03823aa
|
Fix confirmLink activeEmail
|
2023-03-06 12:35:49 +04:00 |
|
|
|
67e0b6a65d
|
Fix BUG 61061 - Files. ‘Cannot Read Properties of Undefined (Reading 'Trim')’ when opening a file.
|
2023-03-01 14:27:51 +04:00 |
|
Timofey Boyko
|
1343c93db5
|
Web:Common:Utils: add new role 'Collaborator'
|
2023-02-27 15:21:04 +03:00 |
|
Timofey Boyko
|
fc3030e0af
|
Web:Common:Utils: getBgPattern can accept undefined as colorSchemeId
|
2023-02-07 18:31:06 +03:00 |
|
|
|
8c18fb254d
|
Fix TypeError: Cannot read properties of undefined (reading 'split')
|
2023-02-06 20:47:54 +03:00 |
|
Timofey Boyko
|
c3461b61e8
|
Web:Common:Utils: add logic for work with additionalPath for beforeBuild function
|
2023-02-03 17:13:03 +03:00 |
|
|
|
de95953b14
|
Web: Fix OS path separator split
|
2023-02-02 16:50:45 +03:00 |
|
Timofey Boyko
|
bf63c3e1ec
|
Web:Common:Utils: update beforeBuild function, now it auto generate translations file
|
2023-02-01 18:35:13 +03:00 |
|
Timofey Boyko
|
72e3fe9032
|
Web: rename translations to autoGeneratedTranslations
|
2023-02-01 17:53:33 +03:00 |
|
Timofey Boyko
|
d7b059afaa
|
Web:Common:Utils: delete useless code from beforeBuild function
|
2023-02-01 16:11:34 +03:00 |
|
Timofey Boyko
|
c3154d88a3
|
Web:Common:Utils: add beforeBuild function
|
2023-02-01 16:06:08 +03:00 |
|
Timofey Boyko
|
776b0b7627
|
Web:Common: delete useless code
|
2023-01-31 12:18:19 +03:00 |
|
Timofey Boyko
|
2a46b713d9
|
Web:Common:Utils: change loadLanguagePath
|
2023-01-30 19:19:35 +03:00 |
|
Timofey Boyko
|
5dcfac2dc8
|
Web:Common:Utils: import all locales
|
2023-01-30 19:19:14 +03:00 |
|
Timofey Boyko
|
baa30e0305
|
Web:Common/Client/Components: add PUBLIC_DIR alias
|
2023-01-27 17:08:30 +03:00 |
|
Timofey Boyko
|
0300c5990d
|
Web: delete useless ?url for png images
|
2023-01-24 18:29:33 +03:00 |
|
Timofey Boyko
|
9e5f76d7c0
|
Web: fix double slash for favicon
|
2023-01-24 17:37:18 +03:00 |
|
Timofey Boyko
|
34a6b8eefa
|
Web:Common:Utils: fix path for favicon logo
|
2023-01-23 13:22:23 +03:00 |
|
Timofey Boyko
|
0cb238e5d3
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-16 10:36:22 +03:00 |
|
Viktor Fomin
|
49c5104806
|
Common: add useThemeDetector
|
2023-01-13 21:59:47 +03:00 |
|
Timofey Boyko
|
6b8afcaa33
|
Web: add import svg with url
|
2023-01-11 18:08:01 +03:00 |
|
Timofey Boyko
|
c968dc21d9
|
Web: move logo from client to public
|
2023-01-11 11:35:11 +03:00 |
|
Timofey Boyko
|
fddd5a615d
|
Web:Common:Firebase: update campaigns images import
|
2023-01-10 12:05:30 +03:00 |
|
Timofey Boyko
|
96d3458e2d
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-09 11:03:08 +03:00 |
|
Timofey Boyko
|
e7d58afda0
|
Web:Common:Utils: add support url images for background pattern
|
2022-12-29 12:26:31 +03:00 |
|
Timofey Boyko
|
52351c382a
|
Web: update use thirdparties logo
|
2022-12-28 18:23:22 +03:00 |
|
Timofey Boyko
|
4c4c79a015
|
Web:Common:Utils: add image helpers for icons
|
2022-12-28 16:59:09 +03:00 |
|
Timofey Boyko
|
774065c165
|
Web: fix default logo import
|
2022-12-27 17:04:56 +03:00 |
|
|
|
a40b71be06
|
Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-26 17:08:32 +03:00 |
|
|
|
b27045eb18
|
Web: Replaced pure axios to request function
|
2022-12-26 17:08:28 +03:00 |
|
Akmal Isomadinov
|
c87ef9316c
|
Web: Fixed cyclic import method getUserRole
|
2022-12-23 20:54:04 +05:00 |
|
Timofey Boyko
|
4a3438ed90
|
Web:Common:AxiosClient: fix SSR error message
|
2022-12-23 10:52:42 +03:00 |
|
|
|
a9d08f397e
|
Web: SDK: Fixed config initialization
|
2022-12-21 14:44:05 +03:00 |
|
|
|
e8141c6f22
|
Web: Changed load Docspace config for clients
|
2022-12-20 19:51:49 +03:00 |
|
Akmal Isomadinov
|
639478d0f4
|
Web:Common:Utils:axiosClient Fixed error message
|
2022-12-20 13:53:21 +05:00 |
|
|
|
67a85a0095
|
Merge branch 'release/rc-v1.2.0' into feature/advanced-security
|
2022-12-16 16:45:54 +03:00 |
|
Akmal Isomadinov
|
91257d2745
|
Web:Client Added a stub for rooms not found or inaccessible
|
2022-12-16 17:17:01 +05:00 |
|
|
|
5ccbda995b
|
Web: Deleted getArchiveRoomRoleActions;
|
2022-12-14 19:42:12 +03:00 |
|
|
|
c209e55210
|
Web: Deleted useless code.
|
2022-12-14 19:35:35 +03:00 |
|
|
|
32ad4c9e2b
|
Web: Removed ability to delete users in the archive room.
|
2022-12-09 18:38:58 +03:00 |
|
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
|
|
23a7210fbc
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-24 20:33:59 +03:00 |
|
|
|
9ad9127eeb
|
Web: Removed the ability to delete a room without being in the archive.
|
2022-11-22 17:12:32 +03:00 |
|
|
|
407dd9c74e
|
Update socket.js
Fix work of early subscriptions to socket events
|
2022-11-22 16:59:23 +03:00 |
|
|
|
045c98258f
|
Web: Added check for archive folder.
|
2022-11-21 10:37:10 +03:00 |
|
|
|
f68789220e
|
Web: Refactoring.
|
2022-11-21 10:02:31 +03:00 |
|
|
|
c41a4bb17f
|
Web: Fixed error.
|
2022-11-21 10:01:12 +03:00 |
|
|
|
69944587b9
|
fix
|
2022-11-20 20:02:32 +03:00 |
|
|
|
0f49b15dd6
|
fix
|
2022-11-19 21:01:47 +03:00 |
|
|
|
9bcaf62b9a
|
temp
|
2022-11-18 21:54:05 +03:00 |
|
|
|
28b8ac504e
|
Web: Common: added getArchiveFileRoleActions
|
2022-11-18 18:01:58 +03:00 |
|
|
|
94ce8ff399
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-18 17:41:40 +03:00 |
|
|
|
d26c875f0a
|
Web: Added canCopy function.
|
2022-11-18 15:34:40 +03:00 |
|
|
|
811c58e4da
|
Web: Added canPinRoom function.
|
2022-11-18 14:11:39 +03:00 |
|
|
|
d29088c33f
|
Web: Common: added getArchiveRoomRoleActions
|
2022-11-18 14:04:29 +03:00 |
|
|
|
8bc024d260
|
Web: Added canMakeForm function.
|
2022-11-18 11:58:17 +03:00 |
|
|
|
8b9683022c
|
Update axiosClient.js
|
2022-11-16 18:00:41 +03:00 |
|
|
|
b3db2e5f3e
|
Update axiosClient.js
|
2022-11-14 19:46:07 +03:00 |
|
|
|
8a909c33d2
|
Merge branch 'develop' into feature/api-origin
|
2022-11-14 17:17:14 +03:00 |
|
TimofeyBoyko
|
05de3adde7
|
Web:Common:Utirls: delete accessRights and add actions for rooms, files and accounts
|
2022-11-14 12:03:49 +03:00 |
|
TimofeyBoyko
|
5f9a777c2d
|
Web:Common:AccessRights: rename getAccountsAccessRights to getAccountsRights
|
2022-11-14 10:36:51 +03:00 |
|
|
|
8da3deaa72
|
Added api_origin
|
2022-11-13 22:38:33 +03:00 |
|
TimofeyBoyko
|
21a1c0c10d
|
Web:Common:Utils: fix get room rights
|
2022-11-11 17:34:39 +03:00 |
|
TimofeyBoyko
|
5e52c802df
|
Web:Common:Utils: add access rights matrix for accounts
|
2022-11-11 16:26:05 +03:00 |
|
TimofeyBoyko
|
5bbc75f8bf
|
Web:Common:Utils: add access rights matrix
|
2022-11-11 15:58:41 +03:00 |
|
Viktor Fomin
|
86c6a8421a
|
Common: Utils: add bg pattern func
|
2022-10-24 15:01:43 +05:00 |
|
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
5953732f20
|
Common: Utils: init data url to file
|
2022-09-21 03:39:38 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
|
|
d2ce2f4435
|
Web: Added replacement in returned feature objects.
|
2022-09-14 16:01:40 +03:00 |
|
|
|
cb1da48faf
|
Web: Profile: fix selected language
|
2022-09-06 12:52:57 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
Artem Tarasov
|
106152a2a4
|
Web: Login/Common: fixed types
|
2022-08-27 00:49:06 +03:00 |
|
Artem Tarasov
|
6f9120ee03
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/store/TargetUserStore.js
# packages/common/store/AuthStore.js
# packages/common/store/SettingsStore.js
# packages/common/utils/index.ts
# packages/login/src/Login.jsx
# packages/login/src/RoomsLogin.jsx
|
2022-08-24 10:17:39 +03:00 |
|
Artem Tarasov
|
eba3f4ebe5
|
Web: Common: utils: added types for login func
|
2022-08-22 15:07:11 +03:00 |
|
Artem Tarasov
|
1de8c98913
|
Web: Login: added loginUtils, added types
|
2022-08-18 10:51:35 +03:00 |
|
Artem Tarasov
|
46ca8055f2
|
Web: Common/Components: added checkIsSSR to utils, applied changes
|
2022-08-17 11:19:49 +03:00 |
|
Artem Tarasov
|
f21c7812ab
|
Web: Common: the login function is moved to a separate file
|
2022-08-17 10:23:46 +03:00 |
|
Artem Tarasov
|
06981645c1
|
Web: Common/Client: added ts support in client, getOAuthToken, getLoginLink placed in common/utils
|
2022-08-15 17:27:40 +03:00 |
|
Artem Tarasov
|
a520446d69
|
Web: Packages: localStorage usage changed to cookies when saving language
|
2022-08-05 17:21:14 +03:00 |
|
|
|
11098da084
|
Common: Utils: Added methods for interacting with integration frame: frameCallbackData, frameCallCommand
|
2022-08-04 13:29:42 +03:00 |
|
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
|
|
359c160ac1
|
Web: Refactoring routes urls
|
2022-07-31 13:52:35 +03:00 |
|
|
|
256c2de843
|
Web: Removed modules dependencies and People and Files mobx providers
|
2022-07-28 16:11:55 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
