|
|
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 |
|
TimofeyBoyko
|
f5030ea73d
|
Web:Locales:RoomSelector: add new translation keys
|
2022-09-05 19:51:50 +03:00 |
|
|
|
661d39e5a6
|
Web: Locales: PeopleSelector: Added new translation keys
|
2022-09-05 18:17:17 +03:00 |
|
mushka
|
f0956da7d0
|
translated keys in /Files to russian (for context options)
|
2022-09-05 18:02:56 +03:00 |
|
mushka
|
26b180e002
|
added new translation keys to en/Files (for context options)
|
2022-09-05 18:02:24 +03:00 |
|
|
|
b034f904f9
|
Web: It was hid cost calculation in grace and expired periods.
|
2022-09-05 17:30:07 +03:00 |
|
|
|
bcdc2993c6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/My/i18n.js
# packages/client/src/pages/Profile/Section/Body/index.js
|
2022-09-05 16:47:09 +03:00 |
|
|
|
2a4fa1862f
|
Merge branch 'develop' into feature/dns-settings
|
2022-09-05 16:31:17 +03:00 |
|
TimofeyBoyko
|
a0df5d9a80
|
Web:Client: delete useless
|
2022-09-05 12:22:21 +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 |
|
|
|
fd803d8e06
|
Client: add translation
|
2022-09-03 16:03:58 +03:00 |
|
TimofeyBoyko
|
41012a2919
|
Web:Client: add transltaion keys for user selector
|
2022-09-02 16:03:34 +03:00 |
|
|
|
18a6012d23
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-02 15:42:50 +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 |
|
|
|
8ce30932a3
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-02 10:10:26 +03:00 |
|
|
|
8db5a16495
|
Client: add translation
|
2022-09-02 02:52:45 +03:00 |
|
|
|
1116843315
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
|
2022-09-02 01:25:30 +03:00 |
|
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
|
|
de00a24e3a
|
Web: Added pay button.
|
2022-09-01 17:52:47 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
Tatiana Lopaeva
|
f6d2c6e5b4
|
Merge branch 'develop' into feature/edit-ThirdPartyResourceDescription
|
2022-09-01 11:50:46 +03:00 |
|
|
|
2297a35fac
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-01 11:17:54 +03:00 |
|
|
|
8de4c5ee34
|
edited ThirdPartyResourceDescription zh-CN
|
2022-09-01 11:04:03 +03:00 |
|
Artem Tarasov
|
a845244ee0
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-01 01:51:29 +03:00 |
|
|
|
47f4c557b4
|
edited key: ThirdPartyResourceDescription
|
2022-08-31 17:22:23 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
|
|
849591813d
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 15:53:14 +03:00 |
|
|
|
c54817bfb1
|
Web: Client: InvitePanel: Fixed search result styles, added memo list. Fixed events on validating input value. Added "Сhoose from list" option
|
2022-08-31 14:17:38 +03:00 |
|
|
|
33fa1dd087
|
Web: Added sales department request dialog.
|
2022-08-31 12:55:34 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
TimofeyBoyko
|
938d354ae9
|
Web:Accounts: fix translation for info panel
|
2022-08-31 10:12:03 +03:00 |
|
|
|
66412730de
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 09:03:17 +03:00 |
|
Artem Tarasov
|
0621fd9c86
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/login/src/Login.jsx
# packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# yarn.lock
|
2022-08-30 18:38:12 +03:00 |
|
|
|
6b25c3d7af
|
Web: Client: InvitePanel: Added invitePanel at DialogsStore, added translation keys at InviteDialog, fixed adding and deleting operation with invite list, fixed styles of icons
|
2022-08-30 18:08:58 +03:00 |
|
|
|
778b27ed5c
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 12:55:38 +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 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
dc3ba67fea
|
Web: Client: added DownloadReportBtn ru translation
|
2022-08-30 11:53:06 +05: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 |
|
|
|
c794bf5308
|
Web: Fixed warnings.
|
2022-08-29 17:51:10 +03:00 |
|
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +03:00 |
|
mushka
|
435e15b217
|
added enw translation keys for dropzone
|
2022-08-29 13:49:43 +03:00 |
|
mushka
|
3807afb3ea
|
added missing translation key
|
2022-08-29 13:40:08 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
TimofeyBoyko
|
fa26f74d96
|
Web:Client: change locales for context menu options of users
|
2022-08-29 12:22:19 +03:00 |
|
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
|
|
eaa4bf40b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-28 00:18:48 +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 |
|
Artem Tarasov
|
0a3ebbc436
|
Web: Login: translations for InvalidError moved to login
|
2022-08-27 01:48:29 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
a9b8a64e61
|
Web: Added translation for rooms module.
|
2022-08-26 18:59:28 +03:00 |
|
|
|
2bfa12f8b6
|
Web: Changed translations, deleted useless translations.
|
2022-08-26 17:54:50 +03:00 |
|
|
|
fc0bcdf4b4
|
Web: Client: added zh-CN translation for security history
|
2022-08-26 19:11:42 +05:00 |
|
|
|
0741b1b3f4
|
Web: Client: added vi translation for security history
|
2022-08-26 19:11:26 +05:00 |
|
|
|
4832ef4b81
|
Web: Client: added uk translation for security history
|
2022-08-26 19:11:11 +05:00 |
|
|
|
23f21496b3
|
Web: Client: added tr translation for security history
|
2022-08-26 19:10:56 +05:00 |
|
|
|
c05e46d5cb
|
Web: Client: added sl translation for security history
|
2022-08-26 19:10:44 +05:00 |
|
|
|
dbe287db85
|
Web: Client: added sk translation for security history
|
2022-08-26 19:10:29 +05:00 |
|
|
|
80e83b0b2b
|
Web: Client: added ru translation for security history
|
2022-08-26 19:10:16 +05:00 |
|
|
|
cf9a0ed9ff
|
Web: Client: added pt-BR translation for security history
|
2022-08-26 19:09:59 +05:00 |
|
|
|
874c5eb274
|
Web: Client: added pl translation for security history
|
2022-08-26 19:09:26 +05:00 |
|
|
|
1909d86e09
|
Web: Client: added nl translation for security history
|
2022-08-26 19:09:09 +05:00 |
|
|
|
13bbc56de9
|
Web: Client: added lv translation for security history
|
2022-08-26 19:08:37 +05:00 |
|
|
|
8d1fb25e58
|
Web: Client: added ja translation for security history
|
2022-08-26 19:08:12 +05:00 |
|
|
|
bac412e123
|
Web: Client: added it translation for security history
|
2022-08-26 19:07:40 +05:00 |
|
|
|
aa25d97fe7
|
Web: Client: added fr translation for security history
|
2022-08-26 19:07:25 +05:00 |
|
|
|
ff1a113b13
|
Web: Client: added fi translation for security history
|
2022-08-26 19:06:47 +05:00 |
|
|
|
d24acfb3a7
|
Web: Client: added es translation for security history
|
2022-08-26 19:06:28 +05:00 |
|
|
|
92d4cba5c1
|
Web: Client: added en translation for security history
|
2022-08-26 19:06:14 +05:00 |
|
|
|
902b5d3aaf
|
Web: Client: added de translation for security history
|
2022-08-26 19:05:14 +05:00 |
|
|
|
783c739af9
|
Web: Client: added cs translation for security history
|
2022-08-26 19:04:54 +05:00 |
|
|
|
c9ab34c1b3
|
Web: Client: added bg translation for security history
|
2022-08-26 19:04:35 +05:00 |
|
|
|
2855fb4ff9
|
Web: Client: added az translation for security history
|
2022-08-26 19:04:05 +05:00 |
|
|
|
ac47004401
|
Web: Fixed translations.
|
2022-08-26 10:25:56 +03:00 |
|
|
|
8998c9ee5b
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-08-26 10:21:08 +03:00 |
|
|
|
084cea375a
|
Web: Fixed translation for module documents.
|
2022-08-26 10:18:54 +03:00 |
|
|
|
63ba97d982
|
Web: Fixed styles.
|
2022-08-26 08:14:44 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
|
|
a8142c3446
|
Client: add translates
|
2022-08-25 19:24:20 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
543c6a222d
|
Client: add translates
|
2022-08-25 13:35:15 +03:00 |
|
|
|
1354b95534
|
Client: delete useless translates
|
2022-08-25 13:00:22 +03:00 |
|
mushka
|
2b936a8879
|
added new roomType translation in russian
|
2022-08-24 19:50:09 +03:00 |
|
mushka
|
c41652d121
|
deleted NewTag translation
|
2022-08-24 19:49:44 +03:00 |
|
|
|
61ff3cfd15
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-08-24 18:00:33 +03:00 |
|
|
|
4f666dfe25
|
Web: Added portal unavailable page.
|
2022-08-24 14:59:21 +03:00 |
|
|
|
6c331a3074
|
Web: Added functionality for the grace period.
|
2022-08-24 10:25:08 +03:00 |
|
|
|
5e3a65cce3
|
Client: add translates, remove duplicate
|
2022-08-23 14:05:56 +03:00 |
|
|
|
06cf08c4f5
|
Web:Client:Added translations "AdditionalResources", "CompanyInfoSettings", change "TimeZone".
|
2022-08-23 13:42:37 +03:00 |
|
|
|
95a41119f6
|
Client: move translates
|
2022-08-23 13:21:37 +03:00 |
|
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
TimofeyBoyko
|
906b660d44
|
Web:Client:Accounts: fix bugs at info-panel and update table and row views for pending users
|
2022-08-23 10:54:09 +03:00 |
|
|
|
52a008ca61
|
Web: Fixed translations,icons.
|
2022-08-22 16:16:49 +03:00 |
|
|
|
80f0e53912
|
Web: Fixed translation.
|
2022-08-22 13:22:58 +03:00 |
|
|
|
8c0e685f29
|
Web: Fixed translations.
|
2022-08-22 12:54:54 +03:00 |
|
|
|
91ea939069
|
Client: add translate
|
2022-08-22 12:27:04 +03:00 |
|
|
|
3854d484a4
|
Web: Added an alert about a free tariff.
|
2022-08-22 11:59:18 +03:00 |
|
TimofeyBoyko
|
124a955ef2
|
Web:Client:Accounts: add info-panel for user
|
2022-08-22 10:05:44 +03:00 |
|
|
|
c026e186a7
|
Confirm: add translates
|
2022-08-19 22:43:46 +03:00 |
|
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
|
|
514b874124
|
Web: Added tooltip for payer.
|
2022-08-18 18:46:02 +03:00 |
|
|
|
9ea79e41a1
|
Web: Added payer container.
|
2022-08-18 18:44:56 +03:00 |
|
|
|
74b7e3886b
|
Client: add translates
|
2022-08-18 16:54:38 +03:00 |
|
TimofeyBoyko
|
bc8d2916f1
|
Web:Client: add new translation keys
|
2022-08-18 15:37:15 +03:00 |
|
|
|
7b7218a4c1
|
Web: Added tooltip.
|
2022-08-18 15:22:03 +03:00 |
|
|
|
a47c4c09fb
|
Web: Added due date, added date conversion according to page language.
|
2022-08-18 13:47:33 +03:00 |
|
|
|
e78b02cd0b
|
Web: Added portal quota, added translations.
|
2022-08-18 12:28:17 +03:00 |
|
|
|
ffb684cddf
|
Web:Client:Added translations "Appearance", "Branding".
|
2022-08-18 12:01:14 +03:00 |
|
|
|
3d93f45ded
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/pages/Confirm/index.js
|
2022-08-18 11:26:04 +03:00 |
|
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
TimofeyBoyko
|
b8a5f121e3
|
Web:Client: add new translation keys for accounts empty screen page
|
2022-08-17 14:49:53 +03:00 |
|
TimofeyBoyko
|
c8cf18030e
|
Web:Client: add new key for en locale 'Manager'
|
2022-08-16 18:43:04 +03:00 |
|
|
|
d99293bdff
|
Web: Fixed translation, added icon.
|
2022-08-16 17:54:44 +03:00 |
|
|
|
24d19b37ee
|
Web: Transferred page into settings.
|
2022-08-16 17:49:44 +03:00 |
|
|
|
0238498377
|
Web: Added description if people count is more then limit.
|
2022-08-16 17:02:54 +03:00 |
|
|
|
b65b7c75e5
|
Move translates from NavMenu to Login
|
2022-08-16 16:26:00 +03:00 |
|
|
|
3309e68cd8
|
Web: Added disabling the component if the person does not have access rights.
|
2022-08-16 14:26:50 +03:00 |
|
|
|
12a83327b0
|
Web: Added payments page.
|
2022-08-16 10:49:34 +03:00 |
|
|
|
e3d7f4cee8
|
Web: Added translations.
|
2022-08-15 17:03:55 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
a2ef8d46b5
|
updated and edited translations
|
2022-08-15 15:49:43 +03:00 |
|
|
|
0fb9979ee0
|
Client: add translation
|
2022-08-15 14:17:30 +03:00 |
|
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
|
048237dffc
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/pages/Confirm/sub-components/deactivatePortal.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/DeleteDataLoader.js
# packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
# packages/client/src/pages/PortalSettings/categories/delete-data/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
|
2022-08-11 21:47:39 +03:00 |
|
|
|
b252732ed2
|
SSO: add translate
|
2022-08-08 13:55:23 +03:00 |
|
|
|
cf0e9e05a1
|
SSO: fix translate
|
2022-08-04 14:42:59 +03:00 |
|
mushka
|
4272c1f661
|
small stranslation fix
|
2022-08-03 16:34:14 +03:00 |
|
mushka
|
507979d9cc
|
added translation keys for storageLocation and MakePrivate secondary infos
|
2022-08-03 14:55:59 +03:00 |
|
mushka
|
50c6a82c8c
|
added translation keys for room types
|
2022-08-03 14:47:30 +03:00 |
|
|
|
c8c4395d4c
|
SSO: fix modal style
|
2022-08-02 17:35:19 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
af5cfe6553
|
Web: Rename translation file on 'en'
|
2022-08-01 18:03:27 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
f9640a400c
|
Web: Moved 'People' images and translations to 'Client'
|
2022-07-25 10:29:16 +03:00 |
|
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
