|
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 |
|
|
845aaa085f
|
Quota: cache by region
|
2023-05-27 19:44:29 +03:00 |
|
|
ef7795f2df
|
Backup: fixed payment after restore
|
2023-05-24 19:33:10 +03:00 |
|
|
48b580f1b0
|
added translations
|
2023-05-24 18:25:14 +03:00 |
|
|
395faf8121
|
fixed Bug 62708
|
2023-05-23 15:02:01 +03:00 |
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
|
819c6597f4
|
added translations
|
2023-05-18 18:23:26 +03:00 |
|
|
986361b4a0
|
People: new filter AccountLoginType
|
2023-05-17 11:20:27 +03:00 |
|
|
f5cb9d9e21
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
# Conflicts:
# common/services/ASC.AuditTrail/AuditReportResource.de.resx
# common/services/ASC.AuditTrail/AuditReportResource.tr.resx
# common/services/ASC.AuditTrail/AuditReportResource.uk-UA.resx
|
2023-05-16 21:53:23 +03:00 |
|
|
24081d3fdd
|
added translations
|
2023-05-16 18:43:39 +03:00 |
|
|
dc805b8cbd
|
Fix UselessModuleTranslationKeysTest issue (key: FreeStartupPlan)
|
2023-05-16 12:46:49 +04:00 |
|
|
e0f82c1a86
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
|
2023-05-16 11:25:26 +03:00 |
|
|
fd45e59e51
|
transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6)
|
2023-05-15 20:49:23 +03:00 |
|
|
0338a029e8
|
Payments: fixed price for eu
|
2023-05-15 19:30:14 +03:00 |
|
|
47a8b890da
|
added translations
|
2023-05-15 17:52:57 +03:00 |
|
|
4dc8faeea9
|
fixed RegionHelper
|
2023-05-13 21:37:04 +03:00 |
|
|
c65685b9ef
|
fix
|
2023-05-12 22:53:18 +03:00 |
|
|
7ca54ad440
|
fix translate tests
|
2023-05-12 22:49:19 +03:00 |
|
|
6efa64b91b
|
remove unused resources
|
2023-05-12 22:48:47 +03:00 |
|
|
163853751d
|
fix
|
2023-05-12 20:47:41 +03:00 |
|
|
2586edcef3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-12 18:18:45 +03:00 |
|
|
dbe48a260d
|
added translations
|
2023-05-12 18:18:10 +03:00 |
|
|
5a92a23467
|
remove crm resource
|
2023-05-12 17:36:47 +03:00 |
|
|
986545dc63
|
fix translate tests
|
2023-05-12 17:13:49 +03:00 |
|
|
cff0bed424
|
Bug 62544 - Settings:Restore: add elastic.json in ASC.Data.Backup.BackgroundTasks
|
2023-05-12 14:56:36 +03:00 |
|
|
bbfdd149a0
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-12 12:22:02 +03:00 |
|
|
aca3cf4e3b
|
fixed tests
|
2023-05-12 12:20:37 +03:00 |
|
|
0c5fa3ca49
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-11 19:12:33 +03:00 |
|
|
4f10368a78
|
added translations
|
2023-05-11 19:12:10 +03:00 |
|
|
9386b2ae09
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-11 16:20:33 +03:00 |
|
|
15b5aaaf83
|
Revert "removed products"
This reverts commit fee81e8a3b .
|
2023-05-11 11:26:28 +03:00 |
|
|
4817ccbfb3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 18:43:17 +03:00 |
|
|
a0293fee03
|
added translations
|
2023-05-10 18:42:42 +03:00 |
|
|
aa33f00c23
|
socket.io: fixed routes
|
2023-05-10 14:16:27 +03:00 |
|
|
18acde413b
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-10 13:57:30 +03:00 |
|
|
605e4376ce
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 13:23:15 +03:00 |
|
|
a0bbc7d40f
|
Core: RegionHelper: added null check
|
2023-05-10 13:22:57 +03:00 |
|
|
1da3a38513
|
Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162 .
|
2023-05-10 13:07:24 +03:00 |
|
|
74ca3e7705
|
Api: removed support for xml and format filter
|
2023-05-10 11:29:22 +03:00 |
|
|
8f9e698b88
|
RegisterInstanceWorkerService: optimization
|
2023-05-10 10:58:33 +03:00 |
|
|
fee81e8a3b
|
removed products
|
2023-05-10 10:57:06 +03:00 |
|
|
322fb1aba3
|
fixed slow stopping service
|
2023-05-10 10:51:26 +03:00 |
|
|
3076d3d45d
|
Merge branch 'hotfix/v1.0.1' into bugfix/61992
|
2023-05-08 17:40:16 +03:00 |
|
|
3e451e54b6
|
fix
|
2023-05-08 17:37:53 +03:00 |
|
|
976c288d32
|
Merge branch 'hotfix/v1.0.1' into bugfix/61992
|
2023-05-08 17:30:29 +03:00 |
|
|
bede99f758
|
fixed price for current quota
|
2023-05-07 22:35:39 +03:00 |
|
|
950e867013
|
GeolocationHelper: fix
|
2023-05-06 22:08:40 +03:00 |
|
|
571932a4e0
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-06 21:39:54 +03:00 |
|
|
136d1a8715
|
fix
|
2023-05-06 21:39:34 +03:00 |
|
|
ca27ccb590
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-06 20:22:40 +03:00 |
|