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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8030f66036
|
Web: Fix translations
|
2022-09-13 17:23:52 +03:00 |
|
TimofeyBoyko
|
42d6b3e7d3
|
Web: add new translation keys
|
2022-09-13 13:47:40 +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 |
|
|
|
d016efea48
|
Web: Moved translations to the common.
|
2022-09-09 11:12:02 +03:00 |
|
|
|
5954c20c37
|
Web: Translations: Moved all toasts title translations to Common.json
|
2022-09-08 12:10:33 +03:00 |
|
|
|
ced1ef8c8f
|
Web: Translations: Renamed key Culture_en to Culture_en-GB
|
2022-09-06 12:52:19 +03:00 |
|
|
|
0e0fe15e1d
|
Web: Translations: Renamed some Culture_ keys
|
2022-09-06 11:28:25 +03:00 |
|
|
|
46f0ed08f1
|
Web: Renamed locale folders
|
2022-09-06 11:23:00 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
e84ba1ff80
|
Merge branch 'develop' into feature/dns-settings
|
2022-09-02 13:05:58 +03:00 |
|
|
|
3d5447bfa2
|
Web:Added translations for dns.
|
2022-09-02 12:37:00 +03:00 |
|
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
|
|
a9338edd81
|
Web: Transferring translations to a common file
|
2022-08-31 15:22:48 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
|
|
547c1782f1
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
|
2022-08-30 12:34:48 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +03:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
|
|
17a557e96a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-28 00:12:05 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
8ecddf3d8a
|
Web: add translates
|
2022-08-25 19:24:32 +03:00 |
|
TimofeyBoyko
|
5dc51e2c32
|
Web:Client:PortalPlugins: add translation keys
|
2022-08-23 14:35:51 +03:00 |
|
|
|
76e9125e86
|
Web:Client:Added translations "Color","Preview","Standard".
|
2022-08-18 12:01:44 +03:00 |
|
TimofeyBoyko
|
d371d865a8
|
Web: add new translation key 'Room'
|
2022-08-17 11:06:44 +03:00 |
|
TimofeyBoyko
|
17ffdff16f
|
Web:Public: add new translation key 'Invite' for en locale
|
2022-08-16 18:45:11 +03:00 |
|
TimofeyBoyko
|
f5e6f97f52
|
Web:Public: add new translation key 'Paid' for en locale
|
2022-08-16 18:34:27 +03:00 |
|
