|
|
85dae6bf4c
|
Fix warning of import TrashIcon (File not found)
|
2022-11-08 14:14:33 +03:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
Viktor Fomin
|
494247fa02
|
Web: update big logo
|
2022-10-24 15:22:59 +05:00 |
|
Viktor Fomin
|
cb5836bed2
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 17:54:36 +05:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
Viktor Fomin
|
cefcd10ddc
|
Web: add new bg patterns
|
2022-10-17 20:53:15 +05:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
TimofeyBoyko
|
e56b10d1e5
|
Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common
|
2022-10-13 15:35:58 +05:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
|
|
60b9ed3dd1
|
Web:Add translation "ReconnectStorage".
|
2022-10-10 19:13:01 +03:00 |
|
TimofeyBoyko
|
09dbd9d088
|
Web: move translation key 'AdvancedFilter' from Files to Common
|
2022-10-10 13:53:24 +05:00 |
|
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
|
|
ca1cd06fad
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/public/images/plus.react.svg
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/index.js
# packages/common/components/PrivateRoute/index.js
|
2022-10-04 17:13:46 +03:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +03:00 |
|
|
|
0c8703a58c
|
Web: Common: added show/hide article button
|
2022-09-26 11:22:46 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +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 |
|
|
|
a642d42bcc
|
Client: fix translations
|
2022-09-21 16:16:19 +03:00 |
|
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
|
f49d98d21d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-20 14:27:39 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
TimofeyBoyko
|
f1a8310ac3
|
Web: move svg from toast to public path
|
2022-09-20 12:56:14 +03:00 |
|
TimofeyBoyko
|
18ff4122a9
|
Web: delete alert.react.svg icon
|
2022-09-20 12:46:24 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
TimofeyBoyko
|
a65517a9de
|
Web: add new alert icon
|
2022-09-19 17:09:06 +03:00 |
|
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
|
|
de122f813e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 21:17:28 +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 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
|
|
28a3096a25
|
Web: Files: Settings: styling + new translations
|
2022-09-14 12:37:33 +03:00 |
|
|
|
f3412fa2f8
|
Merge branch 'develop' into feature/redisign-files-settings
|
2022-09-14 11:20:37 +03:00 |
|
|
|
b546a367e1
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-14 10:18:41 +03:00 |
|
|
|
033259116f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/settingsAppearance/preview.js
|
2022-09-14 01:15:03 +03:00 |
|
|
|
856e5b30d7
|
Images: Removed useless
|
2022-09-13 20:22:24 +03:00 |
|
|
|
8030f66036
|
Web: Fix translations
|
2022-09-13 17:23:52 +03:00 |
|
|
|
795e76f9d5
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-13 16:42:09 +03:00 |
|
TimofeyBoyko
|
42d6b3e7d3
|
Web: add new translation keys
|
2022-09-13 13:47:40 +03:00 |
|
|
|
bcf6fbb358
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-13 12:12:48 +03:00 |
|
|
|
d94918a1de
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-13 10:52:26 +03:00 |
|
|
|
16a9dc020d
|
Web: Files: fixed catalog-header translation, moved "Other" translation to Translations.json, added "Rooms" translation
|
2022-09-12 14:32:54 +03:00 |
|
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
