Commit Graph

2607 Commits

Author SHA1 Message Date
4ebd5323c0 Quota: fix 2022-10-06 15:55:47 +03:00
f655620485 Quota: fix 2022-10-06 15:17:07 +03:00
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +03:00
28802b6926 Quota: fix 2022-09-23 17:14:55 +03:00
d9dd4c7139 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 13:52:51 +03:00
557b1baaf9 Merge branch 'develop' into feature/room-security 2022-09-21 12:22:45 +03:00
ead5485288 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-19 23:30:28 +03:00
bf4eee0f11 Fix Confirm LinkInvite validation 2022-09-19 18:08:00 +03:00
d05071110d Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
9faa6a947a Files: refactor 2022-09-19 11:50:31 +03:00
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
c91711dbeb hosting: fixed running ActivePassive instance 2022-09-15 23:56:55 +03:00
581598e5d7 Quota: fix 2022-09-15 23:40:19 +03:00
de122f813e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-15 21:17:28 +03:00
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
cfb0c957e9 Quota: user quota storage core_user -> webstudio_settings 2022-09-15 15:38:31 +03:00
12780606c2 Merge branch 'develop' into feature/backup_remove_waste_modules 2022-09-15 14:27:24 +03:00
2aae44f654 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-14 15:02:50 +03:00
40702707bd refactoring 2022-09-14 14:21:25 +03:00
384f83f10e Merge branch 'develop' into feature/room-security 2022-09-14 13:02:33 +03:00
d24f9db4c7 Quota: migration 2022-09-13 17:29:01 +03:00
795e76f9d5 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-13 16:42:09 +03:00
7ccfe9547f Web.Api: refactor, changed links logic 2022-09-13 16:01:04 +03:00
12c7a28c21 Core: fix 2022-09-13 15:11:09 +03:00
b43ca7368e Quota: fix 2022-09-13 01:35:12 +03:00
14dfc1f5a7 Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota 2022-09-13 00:41:59 +03:00
068e3c051b Quota: Quota limit string -> long 2022-09-13 00:40:10 +03:00
bc738ab5ea fix 2022-09-12 19:41:16 +03:00
f7fd831a17 Merge branch 'develop' into feature/ip-security 2022-09-12 13:31:13 +03:00
705ca6fee1 fix 2022-09-12 11:04:30 +03:00
23731e8eab UserQuota: fix 2022-09-10 18:07:50 +03:00
46ad007012 Migration: remove EnsureCreated 2022-09-10 17:16:32 +03:00
1ab51406cd Merge branch 'develop' into feature/user-quota
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-09 18:47:38 +03:00
2f0c494cda Files: added multiplie invintation link 2022-09-09 18:07:04 +03:00
4b3f9f7e29 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-09-09 17:34:19 +03:00
ae825d8f7e Api.Core: refactor 2022-09-09 17:32:10 +03:00
f16da6e3ad refactor 2022-09-09 17:31:56 +03:00
c2cbd25c4c redditmq: fixed config setup 2022-09-09 15:56:24 +03:00
882445e371 Quota: add user quota 2022-09-08 17:42:36 +03:00
888744a586 rabbitmq: extended config 2022-09-08 14:20:01 +03:00
b7d0a532ca Api.Core: refactor, removed unnecessary 2022-09-07 18:23:54 +03:00
9988e86a8c Quota: return used user space 2022-09-07 13:44:59 +03:00
519afffa58 Merge branch 'develop' into feature/backup_remove_waste_modules 2022-09-07 11:35:40 +03:00
1008e1c47e Quota: added users quota row table 2022-09-07 02:10:58 +03:00
c096c05032 Merge branch 'develop' into feature/room-security 2022-09-06 13:51:36 +03:00
46d0b89433
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
2022-09-06 14:46:49 +04:00
fb4e996196 Merge branch 'develop' into feature/room-security 2022-09-06 13:36:03 +03:00
31297798aa refactor 2022-09-06 13:32:37 +03:00
1d75a5adc3 refactor 2022-09-06 13:26:08 +03:00