Commit Graph

10503 Commits

Author SHA1 Message Date
6b62074721 Revert "Quota: fixed quota check"
This reverts commit a307be32ba.
2023-05-24 18:11:12 +03: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
c93374d10a fix smtp 2023-05-05 11:53:01 +03:00
fa1bfb8acd Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-04 19:21:08 +03:00
738ae4e38d added translations 2023-05-04 19:20:39 +03:00
95eea07d41
Merge pull request #1401 from ONLYOFFICE/bugfix/daily-feed
fix 4000, 4006 actions(create, update docspace user)
2023-05-04 18:31:18 +03:00
fad4cc1dbe add isdefaultSettings 2023-05-04 17:55:23 +03:00
NikitaVashchuk
b613e66cb7 Merge branch 'hotfix/v1.0.1' into bugfix/62369
# Conflicts:
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx
2023-05-04 19:24:15 +05:00
32053e0c05
Merge pull request #1399 from ONLYOFFICE/bugfix/aws
Bugfix/aws
2023-05-04 17:10:17 +03:00
0f0128e4d0
Merge pull request #1394 from ONLYOFFICE/bugfix/notifications
Bugfix/notifications
2023-05-04 17:02:55 +03:00
NikitaVashchuk
dc20e2cb2d fix settings naming 2023-05-04 18:57:57 +05:00
NikitaVashchuk
9745e65d07 fix settings naming 2023-05-04 18:55:14 +05:00
4322eff660 fix smtp 2023-05-04 16:32:59 +03:00
a69bcf1cfc SendJoinInviteMail didn't throw exceptions 2023-05-03 20:45:17 +03:00
fa77fc1dbf added translations 2023-05-03 18:15:10 +03:00
1acb252c87 added translations 2023-05-03 17:42:43 +03:00
NikitaVashchuk
1c301b572a fix 4000, 4006 actions(create, update docspace user) 2023-05-03 19:09:17 +05:00
686b37f1a2 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-03 16:06:40 +03:00
2742771897 added translations 2023-05-03 16:06:12 +03:00
NikitaVashchuk
78c75d355d image only via attachment 2023-05-03 16:58:54 +05:00