DmitrySychugov
|
1105568509
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-31 18:20:37 +05:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
DmitrySychugov
|
1c257bc3bc
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-26 19:46:23 +05:00 |
|
|
|
ae5b3667ac
|
Web:Moved LoginContainer to a separate file.
|
2023-05-25 12:00:05 +03:00 |
|
|
|
bb9b2f8c90
|
Web:Login:Replacing import "@docspace/common/components/ColorTheme" with "@docspace/components/ColorTheme".
|
2023-05-24 19:45:57 +03:00 |
|
DmitrySychugov
|
462d0eb3b5
|
Web: renamed code input callback function
|
2023-05-16 18:57:09 +05:00 |
|
Viktor Fomin
|
e3bc603f9d
|
Fix Bug 62511: Uninformative error when session time expires
|
2023-05-16 15:53:40 +03:00 |
|
|
|
db1bcf5fc3
|
Fix UselessModuleTranslationKeysTest issue (key: Authorization)
|
2023-05-15 15:35:09 +04:00 |
|
Viktor Fomin
|
05b70bd749
|
Login: fix NotFoundKeysTest
|
2023-05-10 11:23:39 +03:00 |
|
Viktor Fomin
|
85d47987db
|
Login: add types
|
2023-05-05 12:42:57 +03:00 |
|
Viktor Fomin
|
c914c82590
|
Login: fix UselessTranslationKeysTest
|
2023-05-05 12:42:31 +03:00 |
|
Viktor Fomin
|
11b10e1602
|
Login: add translates
|
2023-04-27 13:39:08 +03:00 |
|
Viktor Fomin
|
c05f8aabe8
|
Login: rename translate file
|
2023-04-27 13:38:55 +03:00 |
|
Viktor Fomin
|
a625e3869a
|
Login: show sso errors
|
2023-04-27 12:21:05 +03:00 |
|
Viktor Fomin
|
2089774190
|
Login: add translates
|
2023-04-27 12:20:36 +03:00 |
|
Viktor Fomin
|
8033b2a519
|
Login: fix style
|
2023-04-25 21:15:46 +03:00 |
|
|
|
615cc4e183
|
Bump version to v1.0.1
|
2023-04-25 14:32:55 +04:00 |
|
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|
|
|
97cd9824e1
|
Add translations (vi)
|
2023-04-19 16:32:38 +03:00 |
|
Viktor Fomin
|
2800c8a625
|
Login: ready toast translate
|
2023-04-18 10:31:21 +03:00 |
|
Timofey Boyko
|
1300df6333
|
Merge branch 'develop' into feature/react-router-6
|
2023-04-17 10:42:19 +03:00 |
|
|
|
100bddeb4a
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-17 11:38:48 +04:00 |
|
Viktor Fomin
|
4f7e9f8fdd
|
Login: fix more label color
|
2023-04-14 12:58:45 +03:00 |
|
Timofey Boyko
|
474937a412
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-14 10:54:27 +03:00 |
|
|
|
1bfe27bd7a
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-13 17:41:38 +03:00 |
|
|
|
7e5c048415
|
logger: configure logStreamName in aws logger target on startup
|
2023-04-13 17:41:23 +03:00 |
|
|
|
5fcd3e166b
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-13 16:44:51 +04:00 |
|
|
|
edc28f5d9b
|
Web: Login: Added redirect to /wizard
|
2023-04-13 16:43:53 +04:00 |
|
|
|
18bf4167f7
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-13 13:27:58 +04:00 |
|
Timofey Boyko
|
e6f1969879
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-12 13:56:41 +03:00 |
|
|
|
d0a4bff865
|
added translations
|
2023-04-11 17:12:13 +03:00 |
|
|
|
df62b3862f
|
Merge branch 'release/v1.0.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
|
2023-04-10 17:24:09 +03:00 |
|
|
|
debf275864
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-10 15:35:23 +03:00 |
|
|
|
ee49a99dde
|
Update translations: bg, el, lo, pt
|
2023-04-10 15:35:14 +03:00 |
|
Timofey Boyko
|
75cff9e01f
|
Web: change useMatch to useParams or delete useless code
|
2023-04-10 15:20:28 +03:00 |
|
|
|
d84c3d3a0a
|
Fix NotTranslatedToastsTest issue
|
2023-04-10 15:25:40 +04:00 |
|
Timofey Boyko
|
809929f18b
|
Web: fix confirm pages
|
2023-04-07 17:54:49 +03:00 |
|
Timofey Boyko
|
8d6f0880ad
|
Web: change history to navigate/location
|
2023-04-07 12:51:10 +03:00 |
|
Timofey Boyko
|
8b2ecd4a51
|
Web:Login:Server: fix import StaticRouter
|
2023-04-07 12:37:46 +03:00 |
|
|
|
91489a069c
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-06 17:48:26 +03:00 |
|
|
|
dcca9fda56
|
Add translations
|
2023-04-06 17:48:09 +03:00 |
|
Timofey Boyko
|
6ab66f3849
|
Web: change Switch to Routes
|
2023-04-06 16:37:01 +03:00 |
|
|
|
e27306570f
|
Merge pull request #1331 from ONLYOFFICE/feature/health-route
Feature/health route
|
2023-04-06 13:58:57 +04:00 |
|
|
|
84d1a9a899
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# packages/client/public/locales/pl/DeleteDialog.json
# packages/client/public/locales/ro/Payments.json
# packages/client/public/locales/ro/Translations.json
|
2023-04-05 17:44:00 +03:00 |
|
|
|
48e011ea19
|
Add translations: nl, pl, ro, sk, tr
|
2023-04-05 17:37:15 +03:00 |
|
|
|
746826fcce
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 17:03:38 +03:00 |
|
|
|
0c4d1f8810
|
added translations
|
2023-04-05 17:03:14 +03:00 |
|
|
|
597e047320
|
Web: Login: added health route
|
2023-04-05 14:41:38 +03:00 |
|
Viktor Fomin
|
d301a3e8dd
|
Login: fix tooltip position
|
2023-04-05 14:31:36 +03:00 |
|
|
|
99d13d36f6
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
|
2023-04-03 18:41:02 +03:00 |
|
