Commit Graph

349 Commits

Author SHA1 Message Date
Viktor Fomin
17a23f1b51 Web: API: return firebase database url 2023-05-31 16:32:20 +03:00
01c3b6e2a1 fixed accepting overdue licence 2023-05-30 11:38:38 +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
ba6eeb623f fix 2023-05-16 19:58:23 +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
3bb1ca7969 Billing: fixed upload license 2023-05-12 18:58:53 +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
9c9df73b96 backend: dbip_location rename to dbip_lookup. refactoring. 2023-05-06 14:48:36 +03:00
0751f62c75 fixed tenantExtra method 2023-05-05 12:11:21 +03:00
c93374d10a fix smtp 2023-05-05 11:53:01 +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
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
5d55683496 tariff method now accepts "refresh" argument 2023-05-03 13:44:19 +03:00
NikitaVashchuk
aa963d61b9 fix bug 62369 2023-05-03 08:53:46 +05:00
39c1824162 Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
2023-04-27 22:35:00 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
NikitaVashchuk
a6bb9aac83 WhitelabelController: GetWhiteLabelLogos: removed notification field from response 2023-04-19 13:03:01 +05:00
41483c51be add base-domain in api method "settings" 2023-04-14 10:49:00 +03:00
ed96fe2bdb refresh quota 2023-04-11 18:58:44 +03:00
2a736e7c64 Settings: legalterms 2023-04-10 19:10:30 +03:00
64c44bed2a Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-07 16:14:11 +04:00
7b1101b50c add "documentation-email" in config 2023-04-07 14:18:22 +03:00
8d6e51a16f fix 2023-04-05 12:54:02 +03:00
e35e8f1369 Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-05 11:20:45 +04:00
32f5d3dc2f fix 2023-04-04 14:35:22 +03:00
3e2de4cb75 add ZendeskKey and BookTrainingEmail in SettingsDto 2023-04-04 13:20:59 +03:00
Vashchuk Nikita
0db7c335bf socket notification when archiving a room,
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
5aacc82904 fixed room history 2023-03-30 18:36:22 +03:00
Vashchuk Nikita
604b67fa58 functionality for notification ASC.Socket.IO about quota changes 2023-03-30 19:13:13 +05:00
04f6fe5db4 api method "whitelabel/logos" AllowSuspended 2023-03-30 13:49:52 +03:00
0abe404476 invitation link: added tariff/quota/permissions check, refactoring 2023-03-23 16:22:01 +03:00
9762e4eaca Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 11:45:30 +03:00
2fee97df3d Added 'AllowNotPayment'. 2023-03-13 11:43:58 +03:00
03a0ed298e fix Bug 61558 2023-03-13 10:47:39 +03:00
e84356411d fix 2023-03-10 18:30:34 +03:00
Vashchuk Nikita
2d92da7c0c Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
#	web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
e5f733c771 fix Bug 61076 2023-03-10 11:39:54 +03:00
4d0ed3d7db
Merge pull request #1284 from ONLYOFFICE/bugfix/61465
Bugfix/61465
2023-03-09 15:36:31 +03:00
30dc57380e fix Bug 60163 2023-03-07 20:53:31 +03:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
84d102c1af fix Bug 61465 - Accounts. Two-factor authentication. 2023-03-04 00:57:15 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
ead94f371e Merge branch 'develop' into feature/notifications 2023-02-27 10:29:50 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00