Commit Graph

2580 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
519afffa58 Merge branch 'develop' into feature/backup_remove_waste_modules 2022-09-07 11:35:40 +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
e15d0163a2 Api.Core: removed unnecessary 2022-09-06 13:02:12 +03:00
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
Vashchuk Nikita
cdb3b2ce65 - added functionality for adding ip restrictions for users and admins separately
- added functionality for reading CIDR notations
- modified EFmodel
2022-09-05 15:48:41 +04:00
cda1d1ff8c Feed: added usings 2022-09-02 19:00:01 +03:00
df9a92e5b4 Feed: changed filter 2022-09-02 18:59:52 +03:00
e17d7cf95a Feed: added module 2022-09-02 18:58:08 +03:00
abd9c47b26 Feed: added constants 2022-09-02 18:57:51 +03:00
9f4d38951c Feed: added AsNoTracking 2022-09-02 11:31:04 +03:00
88e38e82e2 Merge branch 'develop' into feature/rooms-feed 2022-09-01 20:25:11 +03:00
50175aad40 Web.Api: added id, withRelated for feed filter 2022-09-01 20:22:59 +03:00
7895a214c9
Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms
Feature/private virtual rooms
2022-09-01 19:34:12 +04:00
91d396c026 Feed: refactor 2022-09-01 18:19:38 +03:00
e966afb49a Feed: fix 2022-09-01 18:19:22 +03:00
effe113ff0 Feed: refactor 2022-09-01 18:19:17 +03:00
df96629834 Core: fixed user cache 2022-08-31 21:06:26 +03:00
481223a51b Files: added context id 2022-08-31 20:02:56 +03:00
a48b836633 Feed: added rooms module, refactor 2022-08-31 16:08:14 +03:00