mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
|
|
bf4eee0f11
|
Fix Confirm LinkInvite validation
|
2022-09-19 18:08:00 +03:00 |
|
|
|
a51cde20c7
|
Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
# products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
|
2022-09-16 18:26:36 +03:00 |
|
|
|
6563d4b633
|
nlog: refactoring service name
|
2022-09-16 16:41:51 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +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 |
|
|
|
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 |
|
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +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 |
|
|
|
c2cbd25c4c
|
redditmq: fixed config setup
|
2022-09-09 15:56:24 +03:00 |
|
|
|
d838c937cc
|
Feed: moved portion size to config
|
2022-09-09 13:38:13 +03:00 |
|
|
|
888744a586
|
rabbitmq: extended config
|
2022-09-08 14:20:01 +03:00 |
|
|
|
519afffa58
|
Merge branch 'develop' into feature/backup_remove_waste_modules
|
2022-09-07 11:35:40 +03:00 |
|
|
|
46d0b89433
|
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
|
2022-09-06 14:46:49 +04: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 |
|
|
|
eccca5ea5f
|
remove waste modules
|
2022-08-30 14:16:41 +03:00 |
|
|
|
d426b2f5d2
|
FederatedLogin: deleted unnecessary
|
2022-08-30 13:08:55 +03:00 |
|
|
|
15f5b67008
|
FederationLogin: refactor
|
2022-08-29 22:08:55 +03:00 |
|
|
|
3db342ffec
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-29 17:39:57 +03:00 |
|
|
|
34969029a0
|
fixed warnings
|
2022-08-29 15:27:50 +03:00 |
|
|
|
ed5f62a877
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-26 18:48:20 +03:00 |
|
TimofeyBoyko
|
f92ffe10e5
|
Plugin: delete useless save
|
2022-08-26 17:13:22 +03:00 |
|
TimofeyBoyko
|
4c4fa75af9
|
Plugins: add validation for uploading file
|
2022-08-26 16:49:41 +03:00 |
|
TimofeyBoyko
|
30906a305f
|
Plugins: fix warnings
|
2022-08-26 14:05:13 +03:00 |
|
TimofeyBoyko
|
908349a111
|
Plugins: remfraf dist after start
|
2022-08-26 14:04:50 +03:00 |
|
TimofeyBoyko
|
3803163ff3
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-26 13:26:41 +03:00 |
|
TimofeyBoyko
|
bf170b594e
|
Plugins: delete useless code
|
2022-08-26 13:22:13 +03:00 |
|
TimofeyBoyko
|
0748afe854
|
Plugins: add logs, config and change service start
|
2022-08-26 12:51:43 +03:00 |
|
|
|
834a52707f
|
FederatedLogin: fix
|
2022-08-25 18:31:07 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
TimofeyBoyko
|
413f27a794
|
Plugins: import path to plugins from config file
|
2022-08-25 15:31:01 +03:00 |
|
|
|
0c596956f6
|
Merge branch 'develop' into feautre/private-virtual-rooms
|
2022-08-25 15:30:11 +03:00 |
|
