Commit Graph

10486 Commits

Author SHA1 Message Date
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
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
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
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
6efa64b91b remove unused resources 2023-05-12 22:48:47 +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
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
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
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
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
5d55683496 tariff method now accepts "refresh" argument 2023-05-03 13:44:19 +03:00
f20eb2429c edited Note in pattern_portal_rename 2023-05-03 12:01:40 +03:00
NikitaVashchuk
aa963d61b9 fix bug 62369 2023-05-03 08:53:46 +05:00
e3dfc1cd0a edited pattern_portal_rename 2023-05-02 16:22:38 +03:00
7bed1e829c edited Chinese 2023-05-02 15:14:05 +03:00
2fb3c9f975 added translations 2023-04-28 16:24:46 +03:00
39c1824162 Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
2023-04-27 22:35:00 +03:00
8687b3ae99 edited translations 2023-04-27 17:42:34 +03:00
8864f289e6 fix Bug 62246 2023-04-26 20:30:23 +03:00
NikitaVashchuk
30f001a4c0 fix periodic and welcome notifications 2023-04-26 20:47:06 +05:00
6d13c4bc32 added translations 2023-04-26 18:20:27 +03:00
a1f63b88ea SSO: fixed redirect to login on error 2023-04-26 14:39:49 +03:00
09b5f612c9 added translations 2023-04-26 12:23:34 +03:00
cf05348934
Merge pull request #1382 from ONLYOFFICE/bugfix/bug-62137
Bugfix/bug 62137
2023-04-24 16:29:34 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
6574df323c fix Bug 62255 2023-04-24 06:21:35 -07:00
00f96b5090 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-04-24 13:47:22 +03:00