|
88e78f6695
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-14 17:18:56 +03:00 |
|
|
3bd63b26fe
|
Web: Added new translations.
|
2022-10-13 15:06:51 +03:00 |
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +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 |
|
|
2414cc030c
|
Web: Client: InvitePanel: Fixes after merge
|
2022-10-10 12:37:02 +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 |
|
|
d3d4ff6639
|
Web: Fixed description of grace period.
|
2022-10-05 13:34:59 +03:00 |
|
|
a2fb5e4b36
|
Web: Changed translations for grace period.
|
2022-10-05 13:26:45 +03:00 |
|
|
c3c64d847c
|
Web: removed useless translations.
|
2022-10-05 11:55:15 +03:00 |
|
|
11479c14ba
|
Web: Added missing translations.
|
2022-10-05 11:35:40 +03:00 |
|
|
84c8749e4f
|
Web: Changed translations.
|
2022-10-05 10:58:10 +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 |
|
|
a5d3106907
|
Web: Added translation.
|
2022-10-04 16:52:43 +03:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
mushka
|
6ef11ff695
|
fixed spelling in FilesEmptyScreenText translation key
|
2022-10-02 03:20:29 +03:00 |
|
mushka
|
6fbac45198
|
complete overhaul of translation kets in en & ru InfoPanel locales, changed history translations
|
2022-10-02 02:24:49 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
mushka
|
4627ad75a7
|
deleted unused InfoPanelHistory.json
|
2022-09-26 10:43:16 +03:00 |
|
mushka
|
da139d8bbc
|
added new tranaslation keys to InfoPanel.json
|
2022-09-26 10:40:46 +03:00 |
|
|
33d0c10eb3
|
Merge branch 'develop' into feature/personal-redesign-empty-screen
|
2022-09-23 16:53:50 +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 |
|
|
57f9f8420f
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-22 18:13:42 +03:00 |
|
|
295c39b050
|
Web:Client:Change translation "MyEmptyContainerDescription" in "PersonalEmptyContainerDescription".
|
2022-09-22 15:30:22 +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 |
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
mushka
|
82471a5d2c
|
created new InfoPanelHistory json file for feed translation and added new keys
|
2022-09-20 14:09:04 +03:00 |
|
mushka
|
c42b743835
|
deleted old feed translations
|
2022-09-20 14:08: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 |
|
|
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 |
|
mushka
|
fb0e23b2cf
|
added some translations for history
|
2022-09-16 15:12:03 +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 |
|