Commit Graph

10521 Commits

Author SHA1 Message Date
ca3f29cd5d Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-08 18:25:15 +03:00
fef76e032f added translations 2023-06-08 18:24:46 +03:00
21ff40ff20 Notify: fixed null reference exception 2023-06-08 14:30:32 +03:00
65d2343c65 added translations 2023-06-07 17:40:23 +03:00
6888fdbd51 added translations 2023-06-06 18:47:15 +03:00
Viktor Fomin
aff8d417d1 Merge branch 'release/v1.1.0' into feature/crash-report 2023-06-02 13:27:24 +03:00
f4983243f9 added samesite option 2023-06-01 19:02:21 +03:00
Viktor Fomin
47921a0fcb Web: API: return firebase database url 2023-06-01 13:11:55 +03:00
Viktor Fomin
e68a67ad68 Revert "Web: API: return firebase database url"
This reverts commit 17a23f1b51.
2023-06-01 13:09:17 +03:00
Viktor Fomin
17a23f1b51 Web: API: return firebase database url 2023-05-31 16:32:20 +03:00
daef20f563 Wizard: login to the portal after completing the wizard 2023-05-30 11:58:17 +03:00
01c3b6e2a1 fixed accepting overdue licence 2023-05-30 11:38:38 +03:00
ff122af0cc Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-27 09:13:06 +03:00
37a3f5648e Consumers: fixed instruction 2023-05-26 14:57:52 +03:00
d1b384da2c Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-26 12:45:13 +04:00
0efb8d58e7 Accept license if exists 2023-05-24 18:49:10 +03:00
48b580f1b0 added translations 2023-05-24 18:25:14 +03:00
6b62074721 Revert "Quota: fixed quota check"
This reverts commit a307be32ba.
2023-05-24 18:11:12 +03:00
NikitaVashchuk
294ba3ffa8 sending Saas lettters for startup plan 2023-05-24 15:50:54 +05:00
a307be32ba Quota: fixed quota check 2023-05-23 17:58:04 +03:00
94388c0616 Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-23 17:00:12 +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
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
ba6eeb623f fix 2023-05-16 19:58:23 +03:00
b644a16e6f Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-16 18:44:02 +03:00
24081d3fdd added translations 2023-05-16 18:43:39 +03:00
bb70294faa Quota: update is a Standalone feature 2023-05-16 17:33:25 +03:00
d145872b6e fixed portal request 2023-05-16 14:41:01 +03:00
1ecea2eaa8 fix bugs 62206 and 62204 2023-05-16 13:56:12 +03:00
0d54ec005a Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-16 13:11:19 +04:00
e0f82c1a86 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 11:25:26 +03:00
47a8b890da added translations 2023-05-15 17:52:57 +03:00
fc23b9d04c fixed warnings 2023-05-15 13:41:37 +03:00
6efa64b91b remove unused resources 2023-05-12 22:48:47 +03:00
3bb1ca7969 Billing: fixed upload license 2023-05-12 18:58:53 +03:00
dbe48a260d added translations 2023-05-12 18:18:10 +03:00
4f10368a78 added translations 2023-05-11 19:12:10 +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
437e2d4aa5 fix smtp delete 2023-05-10 13:23:38 +03:00
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
fc5672ebb3
Merge pull request #1409 from ONLYOFFICE/bugfix/62456
fix bug 62456
2023-05-08 17:24:59 +03:00
bede99f758 fixed price for current quota 2023-05-07 22:35:39 +03:00
9c9df73b96 backend: dbip_location rename to dbip_lookup. refactoring. 2023-05-06 14:48:36 +03:00
NikitaVashchuk
4888973e73 fix bug 62456 2023-05-05 22:09:17 +05:00
13a156bea9 added translations 2023-05-05 18:57:21 +03:00
0751f62c75 fixed tenantExtra method 2023-05-05 12:11:21 +03:00
678d1d4c03 smtp: status 2023-05-05 12:05:31 +03:00