|
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 |
|
|
2ed2f68cb6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-22 12:48:46 +03:00 |
|
|
058d3acbd3
|
Merge branch 'develop' into feature/favorites-redesign-empty-screen
|
2022-09-21 18:15:08 +03:00 |
|
|
7133d20a69
|
Web:Client:Delete translation "SubheadingEmptyText".
|
2022-09-21 18:09:35 +03:00 |
|
|
ee42f4be3a
|
Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2022-09-21 17:18:42 +03:00 |
|
|
a642d42bcc
|
Client: fix translations
|
2022-09-21 16:16:19 +03:00 |
|
TimofeyBoyko
|
f1e6d9c8f4
|
Web:Client:Locales: add new translation keys for trash context menu
|
2022-09-21 15:58:52 +03:00 |
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
|
2e44136820
|
Merge branch 'feature/archived-redesign-empty-screen' into feature/recent-redesign-empty-screen
|
2022-09-20 11:06:06 +03:00 |
|
|
ead5485288
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-19 23:30:28 +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 |
|
|
8f1a8deda9
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 13:48:26 +03:00 |
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
13e47e8c40
|
Web:Client:Add translation "RoomEmptyContainerDescription".
|
2022-09-19 11:32:57 +03:00 |
|
|
a4919f43c8
|
Web:Client:Add translation "GoToPersonal", "NoFilesHereYet", change "RecentEmptyContainerDescription".
|
2022-09-19 11:25:11 +03:00 |
|
TimofeyBoyko
|
39366b49ab
|
Web:Client:Components: add new tranlsation key for rooms emptyFilterContainer
|
2022-09-19 11:23:32 +03:00 |
|
|
ae0eb0a143
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 09:55:07 +03:00 |
|
|
0f45e83a41
|
Web:Client:Add translation "GoToShared".
|
2022-09-16 11:11:05 +03:00 |
|
|
de122f813e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 21:17:28 +03:00 |
|
|
6438bca15d
|
Web: Files: Fix translation
|
2022-09-15 20:47:04 +03:00 |
|
|
30618e3e22
|
Web: Files: Fix translation
|
2022-09-15 20:43:35 +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 |
|
|
21fc46b8bc
|
Web: Removed useless translations.
|
2022-09-15 15:07:26 +03:00 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
TimofeyBoyko
|
8480a1f525
|
Web:Client:Home: add new translation key 'ByLastModifiedDate' for filter sort
|
2022-09-15 14:08:18 +03:00 |
|
TimofeyBoyko
|
fe98362066
|
Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified'
|
2022-09-15 14:07:02 +03:00 |
|
TimofeyBoyko
|
1ca5819e0f
|
Web:Client:Home: add new translation key 'ByCreationDate' for filter sort
|
2022-09-15 14:05:51 +03:00 |
|
TimofeyBoyko
|
977dc1f7ed
|
Web:Client: change translation key 'ByCreationDate' to 'ByCreation'
|
2022-09-15 14:02:53 +03:00 |
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
|
95de5a66c8
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-15 10:26:56 +03:00 |
|
|
c0244b5400
|
Web: Added plan title from the store.
|
2022-09-14 17:17:40 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
TimofeyBoyko
|
d65255f47d
|
Web:Client:Home: chage translation key 'MasterForms' to 'FormsTemplates'
|
2022-09-14 16:31:20 +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 |
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +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 |
|
|
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 |
|
TimofeyBoyko
|
2f940452ad
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-13 11:08:51 +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 |
|
|
88e8218bf4
|
Web:Client:Delete ModalDialog.
|
2022-09-12 12:50:53 +03:00 |
|
|
7540d85405
|
Web:Client:Add "WhiteLabelSubtitle", "WhiteLabelHelper", "WhiteLabelTooltip".
|
2022-09-12 12:29:17 +03:00 |
|
TimofeyBoyko
|
939b3651df
|
Web:Client:Locales: fix translation key for filter header
|
2022-09-12 11:52:32 +03:00 |
|
|
866e7d616f
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-12 11:44:47 +03:00 |
|
|
8db56ce0ad
|
Web:Client:Add locales "ShowFeedbackAndSupport","ShowSampleDocuments","ShowVideoGuides","ShowHelpCenter".
|
2022-09-10 20:45:03 +03:00 |
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
|
8df94b6af1
|
i18n: Translations: fix project files + sorting
|
2022-09-09 18:02:39 +03:00 |
|