Commit Graph

397 Commits

Author SHA1 Message Date
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
TimofeyBoyko
ae584739e8 Merge branch 'develop' into feature/portal-access-rights 2022-10-04 06:58:16 +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
7ad6d99c0f updated key name for InfoPanel translations 2022-10-02 02:24:00 +03:00
TimofeyBoyko
d1c77c37d0 Web:Client:Locales: fix translation key 2022-09-29 13:07:27 +03:00
TimofeyBoyko
c3c4316c93 Web:Client:Locales: add new translation keys for profile 2022-09-28 18:17:39 +03:00
TimofeyBoyko
4626fbf7a7 Web:Client:Locales: change translation key 'Manager' to 'Room admin 2022-09-27 13:12:39 +03:00
TimofeyBoyko
a8893025ff Web:Client: add new translation keys for Main bar 2022-09-27 12:29:17 +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
3e7661899e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation 2022-09-24 01:51:56 +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
a778e10d58 Web:Client:Delete old translation "MyEmptyContainerDescription". 2022-09-22 15:30:55 +03:00
295c39b050 Web:Client:Change translation "MyEmptyContainerDescription" in "PersonalEmptyContainerDescription". 2022-09-22 15:30:22 +03:00
fd2799163a Web:Client:Add personal image. 2022-09-22 15:26:13 +03:00
6f1290671d Web:Client:Moved the picture to the client section. 2022-09-22 15:24:45 +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
1dfcb5f6d8 Web:Client:Change image favorites. 2022-09-21 17:34:59 +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
TimofeyBoyko
ed067146c0 Web:Client:Public: add new icon for restore all 2022-09-21 15:58:20 +03:00
79fa7815c4 Merge branch 'develop' into feature/company-info-settings 2022-09-21 14:48:28 +03:00
16feeaf988 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
#	packages/client/src/Shell.jsx
2022-09-21 14:00:17 +03:00
91490ae7bf Merge branch 'develop' into feature/recent-redesign-empty-screen 2022-09-21 13:19:49 +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
ffabcea9d6
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-21 11:07:04 +03:00
6f003a8459 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-20 21:54:33 +03:00
fd72f668ba Web: added new third-party icons 2022-09-20 16:34:15 +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
19cbf4bc40 updated russian InfoPanel translation keys 2022-09-20 14:08:32 +03:00
mushka
c42b743835 deleted old feed translations 2022-09-20 14:08:03 +03:00
fd4b664b64 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-20 11:29:26 +03:00
2e44136820 Merge branch 'feature/archived-redesign-empty-screen' into feature/recent-redesign-empty-screen 2022-09-20 11:06:06 +03:00
c9a0e3195c Web: Added backup icon. 2022-09-20 10:46:41 +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
7dec07dc69 Web:Client:Delete old translation. 2022-09-19 11:28:05 +03:00
a4919f43c8 Web:Client:Add translation "GoToPersonal", "NoFilesHereYet", change "RecentEmptyContainerDescription". 2022-09-19 11:25:11 +03:00
c3680f8a4e Web:Client:Delete unnecessary image. 2022-09-19 11:24:17 +03:00
TimofeyBoyko
39366b49ab Web:Client:Components: add new tranlsation key for rooms emptyFilterContainer 2022-09-19 11:23:32 +03:00
a8111836b2 Web:Client:Add person image. 2022-09-19 11:23:32 +03:00
a077a245b5 Web:Client:Add image recent empty screen. 2022-09-19 11:23:11 +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
26b07766fa Web:Client:Add image folder. 2022-09-16 11:10:21 +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
aa195fe76b
Merge branch 'develop' into feature/company-info-settings 2022-09-15 14:40:00 +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
9071278cfe Web:Client:Fix translation "BreakpointWarningTextPrompt", "CompanyInfoSettingsDescription". 2022-09-14 18:11:00 +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
1c31018d8d Web:Client:Change duplicate logo. 2022-09-14 13:17:27 +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
7decafcdc0 Merge branch 'develop' into feature/company-info-settings 2022-09-14 10:18:22 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
ed18968601 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
#	packages/client/public/locales/en/Errors.json
#	packages/client/public/locales/en/Settings.json
2022-09-14 01:45:01 +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
6acca331b4 Merge branch 'develop' into feature/company-info-settings 2022-09-13 17:56:02 +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
9614fcab32 Web:Client:Add "TheBrandingSettings" translation. 2022-09-13 14:08:32 +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
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
9fcccfaa42 Web: Client: Locales: Added translations for roles 2022-09-12 18:47:50 +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
4bbef5fd6d Merge branch 'develop' into feature/company-info-settings 2022-09-12 11:38:18 +03:00
e476b26601 Web:Client:Change name locales "RestoreDefaultButton". 2022-09-12 11:29:10 +03:00
d19caa298d Merge branch 'develop' into feature/invite-panel 2022-09-12 10:50:43 +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
0541ce525e Web:Add image for About. 2022-09-10 19:11:42 +03:00
741378d08f Web:Client:Add locales "Site", change "AboutCompanyEmailTitle", "AboutCompanyAddressTitle". 2022-09-10 19:10:40 +03:00
mushka
68ba76b6bf added new no room svg 2022-09-10 00:21:22 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
4b3f9f7e29 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-09-09 17:34:19 +03:00
b8f5438c19 Merge branch 'develop' into feature/company-info-settings 2022-09-09 17:10:04 +03:00
0b496e4e3c Web:Client:Add locales "ArchiveEmptyScreen", "ArchiveEmptyScreenHeader". 2022-09-09 16:06:15 +03:00
4d08dae9be Web:Add image empty_screen_archive. 2022-09-09 16:05:49 +03:00
mushka
ab7ace5af6 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-09 13:22:36 +03:00
310a189a66 Web:Client:Add locales "AdditionalResourcesDescription","DocSpaceMenu". 2022-09-09 12:34:31 +03:00
ead45257f1 Web: Added 'Recover Access Modal Dialog' to the unavailable portal page. 2022-09-09 11:25:55 +03:00
05c01d85e6 Web: Fix toast translations (Remove room(s) issue) 2022-09-09 11:22:04 +03:00
d016efea48 Web: Moved translations to the common. 2022-09-09 11:12:02 +03:00
e860c10333 Merge branch 'develop' into feature/invite-panel 2022-09-09 09:02:56 +03:00
TimofeyBoyko
ec0e91ee99 Merge branch 'feature/change-owner-dialog' of github.com:ONLYOFFICE/DocSpace into feature/change-owner-dialog 2022-09-08 18:36:04 +03:00
TimofeyBoyko
eaea59943c Web:Client:ChangePortalOwner: add new translation key 'ChooseFromList' 2022-09-08 18:23:57 +03:00
TimofeyBoyko
07c7352604 Web:Client:Locales: clone translation for ChangePortalOwner 2022-09-08 18:19:46 +03:00
06803de440 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/BackupCodesDialog/index.js
#	packages/client/src/pages/My/index.js
#	packages/client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	packages/client/src/pages/Profile/Section/Body/index.js
#	packages/client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
#	packages/client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
#	packages/client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	packages/client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	packages/client/src/pages/ProfileAction/index.js
2022-09-08 17:31:12 +03:00
TimofeyBoyko
1b3fbb3129 Web:Client:ChangePortalOwnerDialog: split translation key 'OwnerRights' 2022-09-08 16:55:00 +03:00
97bd153ec5
Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 16:29:09 +03:00
TimofeyBoyko
8334d4e3e6 Web:Client:ChangePortalOwnerdialog: fix translation key 2022-09-08 16:14:48 +03:00
ce419159b9 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation 2022-09-08 15:44:30 +03:00
mushka
20f2fde176 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-08 15:28:38 +03:00
TimofeyBoyko
4c27fb0c02 Web:Client:ChangePortalOwnerDialog: fix translation 2022-09-08 15:14:48 +03:00
TimofeyBoyko
41873e3c69 Web:Client:ChangePortalOwnerDialog: fix translation keys and theme 2022-09-08 14:45:52 +03:00
TimofeyBoyko
0aba1e4a95 Web:Client:Locales: add new translation keys for change portal owner 2022-09-08 14:01:09 +03:00
024826b64a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-08 13:09:25 +03:00
a236948577 Merge branch 'develop' into feature/invite-panel 2022-09-08 12:27:14 +03:00
5954c20c37 Web: Translations: Moved all toasts title translations to Common.json 2022-09-08 12:10:33 +03:00
cd99a3b7b9 Web:Client:Add translation "BrandingSectionDescription", "CompanyInfoSettingsDescription". 2022-09-07 18:18:51 +03:00
2abf7ef5d9 Merge branch 'develop' into feature/invite-panel 2022-09-07 17:38:06 +03:00
TimofeyBoyko
ac496bfe9e Merge branch 'develop' into feature/selector 2022-09-07 15:06:24 +03:00
TimofeyBoyko
d8a6315417 Web:Client:Locales: fix RoomSelector translation key 2022-09-07 13:33:19 +03:00
e4c47bd230 Web: Added the number of days of delay in translations. 2022-09-06 18:25:53 +03:00
a9b7facd9a Web: Added information if the user is not found. 2022-09-06 14:13:00 +03:00
5e6ad92dc2 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-06 13:31:32 +03:00
f66c0bb91f Web: Client: Renamed locale folders 2022-09-06 13:18:35 +03:00
afe2de7521 Web: Added new translations. 2022-09-06 11:04:16 +03:00
150060faff Web: Refactoring, added downgrade plan button. 2022-09-06 10:52:02 +03:00
3ba7052e2f Web: Added downgrade plan dialog. 2022-09-06 10:50:11 +03:00
f96784ba5d Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
#	packages/client/public/locales/en/Errors.json
2022-09-06 00:22:24 +03:00
90457c3d76 Client: add translate 2022-09-05 22:41:55 +03:00
mushka
0a2318ea59 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 20:53:35 +03:00
TimofeyBoyko
6c632497f9 Merge branch 'develop' into feature/selector 2022-09-05 20:33:29 +03:00