Timofey Boyko
|
f4cb8acf1d
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-18 18:06:22 +03:00 |
|
|
|
2c2f759d01
|
remove waste
|
2023-01-17 10:51:26 +03:00 |
|
|
|
a1fc302536
|
add user for already exist portal
|
2023-01-17 10:50:56 +03:00 |
|
Timofey Boyko
|
0e68d1e0df
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-13 16:39:56 +03:00 |
|
|
|
2f29eb444f
|
fix 60163
|
2023-01-13 14:28:44 +03:00 |
|
|
|
29e0ef45b9
|
fix 60163
|
2023-01-13 14:26:12 +03:00 |
|
|
|
1ab804e4a0
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-12 22:48:30 +03:00 |
|
Timofey Boyko
|
5730a5e8ac
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-12 18:10:15 +03:00 |
|
|
|
92f786c572
|
fix 60163
|
2023-01-12 12:09:01 +03:00 |
|
|
|
08937a22b6
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-11 19:28:02 +03:00 |
|
Timofey Boyko
|
b46d21c258
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-11 18:47:06 +03:00 |
|
|
|
c51141a5d4
|
fix SetTenantActiveaAndTenantOwner before migration
|
2023-01-11 18:25:00 +03:00 |
|
|
|
2782778c71
|
add Console.WriteLine in migration
|
2023-01-11 13:51:48 +03:00 |
|
|
|
070475af5b
|
running ActivePassiveHostedService in singletone mode as default
|
2023-01-11 00:31:12 +03:00 |
|
|
|
5e1e4caa5b
|
SetTenantOwner before migration
|
2023-01-10 17:42:32 +03:00 |
|
|
|
1198303f22
|
fix merge
|
2023-01-10 14:47:38 +03:00 |
|
|
|
0090561fb6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2023-01-10 14:47:27 +03:00 |
|
|
|
769b621eca
|
add console writeline new alias
|
2023-01-10 13:35:38 +03:00 |
|
|
|
2710c8b4ee
|
fix SetAdmin before migration
|
2023-01-10 13:31:46 +03:00 |
|
|
|
6092262bbe
|
add migration for use mail instead of userName and autogenerate unique alias
|
2023-01-10 13:31:23 +03:00 |
|
|
|
aac2a388e2
|
fix migration: set userGroup before migration and remove "RemoveGeneralBunchObjects"
|
2023-01-09 17:45:11 +03:00 |
|
Timofey Boyko
|
96d3458e2d
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-09 11:03:08 +03:00 |
|
|
|
6142c450af
|
fix migration
add ignore general rows in files_bunch_objects
|
2022-12-29 12:07:41 +03:00 |
|
|
|
ad4ae24191
|
fix migration
add skip tables
add default value for files_folder.private
|
2022-12-29 11:36:40 +03:00 |
|
|
|
44804e34db
|
fixed cache room logo/user photo
|
2022-12-29 11:31:22 +03:00 |
|
|
|
1312bfefd0
|
Revert "temp delete migrationRunner"
This reverts commit 0457feafde.
|
2022-12-28 18:18:10 +03:00 |
|
|
|
0457feafde
|
temp delete migrationRunner
|
2022-12-28 15:09:36 +03:00 |
|
|
|
45ab3bcc5f
|
remove find backup files
|
2022-12-28 10:22:46 +03:00 |
|
|
|
9f198ef31d
|
fixed user avatar/room logo cache
|
2022-12-27 18:20:05 +03:00 |
|
|
|
522034215f
|
fix migration
|
2022-12-27 15:32:02 +03:00 |
|
|
|
57eff73098
|
fix migration runner
|
2022-12-27 15:06:30 +03:00 |
|
|
|
e8ed2bcd89
|
fix GetFilesToProcess in migration
|
2022-12-27 14:57:20 +03:00 |
|
|
|
24bbd0d46e
|
parallel ListFilesRelativeAsync
|
2022-12-26 15:06:10 +03:00 |
|
|
|
031d54aa30
|
fix: remove waste in startup
|
2022-12-26 10:32:36 +03:00 |
|
|
|
e6c1991c39
|
fix Bug 60187
|
2022-12-25 19:44:37 +03:00 |
|
|
|
b25dbdf123
|
improved user/room logo images load
|
2022-12-23 17:08:06 +03:00 |
|
|
|
c00edf1374
|
fix migration to docspace
|
2022-12-23 13:54:23 +03:00 |
|
|
|
1eef0350d5
|
add console.writeline in migration personal to docspace
|
2022-12-23 13:49:25 +03:00 |
|
|
|
aa447f3384
|
fix key
|
2022-12-23 13:27:49 +03:00 |
|
|
|
d40e3e8e3b
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2022-12-22 21:23:21 +03:00 |
|
|
|
f687c16a6b
|
fixed StorageHandler class
|
2022-12-22 18:48:30 +03:00 |
|
|
|
ceebd5b47d
|
refactoring
|
2022-12-22 18:48:05 +03:00 |
|
|
|
fde5bdff1c
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2022-12-22 18:34:54 +03:00 |
|
|
|
575784dd01
|
fix migration
|
2022-12-22 18:17:21 +03:00 |
|
|
|
9ed6dff1be
|
remove waste
|
2022-12-22 18:17:10 +03:00 |
|
|
|
e47d45c7fd
|
Merge branch 'release/rc-v1.2.0' into feature/cache-fix
|
2022-12-22 16:17:06 +03:00 |
|
|
|
62cec7b7c5
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-22 14:17:24 +03:00 |
|
|
|
82392b601d
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-21 21:22:19 +03:00 |
|
|
|
6496ff3576
|
Log: disable cloudwatch logging when awsAccessKeyId not specified
|
2022-12-21 21:22:04 +03:00 |
|
|
|
724345a2b7
|
fixed validate link restore password
|
2022-12-21 20:12:43 +03:00 |
|
|
|
84aec69091
|
fix backup files_thirdparty_account
|
2022-12-21 18:34:23 +03:00 |
|
|
|
d0fe06052e
|
Db: optimization
|
2022-12-21 15:57:32 +03:00 |
|
|
|
995d78ecd6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-21 12:39:28 +03:00 |
|
|
|
a1daacb4d0
|
fix
|
2022-12-21 12:38:47 +03:00 |
|
|
|
d4aaa4afaf
|
fix Bug 60194 - Settings: Restore. When trying to restore the docspace portal crashes with multiple errors in the console
|
2022-12-21 12:19:47 +03:00 |
|
|
|
a764ceef1a
|
fix Bug 60191 - Settings: Backup. Does not create a backup file in temporary storage
|
2022-12-20 13:58:16 +03:00 |
|
|
|
045d61c0bf
|
add bat for asc.apicache
|
2022-12-20 13:04:21 +03:00 |
|
|
|
40ea7aefeb
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-20 12:47:44 +03:00 |
|
|
|
14d07500b2
|
fix
|
2022-12-20 12:34:39 +03:00 |
|
|
|
d31e341ff9
|
add async and AddBaseDbContext with settings
|
2022-12-20 10:27:55 +03:00 |
|
|
|
d1c436ea11
|
add migration to Teamlabsite
|
2022-12-19 18:01:57 +03:00 |
|
|
|
56c9ffcd21
|
Api.Core: added option for default logo
|
2022-12-19 11:54:32 +03:00 |
|
|
|
0b6ba47863
|
refactoring
|
2022-12-16 15:56:03 +03:00 |
|
|
|
db951d00e6
|
asc.apicache
|
2022-12-16 15:41:09 +03:00 |
|
|
|
b4963cecb9
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2022-12-15 14:43:32 +03:00 |
|
|
|
df82b4fc8a
|
Update ImagesTest.cs
Added DublicatesFilesByFileNameButDifferentByMD5HashTest
+ refactoring
|
2022-12-15 11:57:39 +03:00 |
|
|
|
fb7d17dfce
|
fix
|
2022-12-15 11:24:39 +03:00 |
|
|
|
bb8cde9d9c
|
Update ImagesTest.cs
|
2022-12-15 00:27:04 +03:00 |
|
|
|
9be6fcb22c
|
fix restore
|
2022-12-14 17:32:06 +03:00 |
|
|
|
dd4537963a
|
Merge branch 'develop' into feature/chunk-backup
|
2022-12-14 17:10:27 +03:00 |
|
|
|
02c9adc57b
|
chunk backup
|
2022-12-14 15:55:41 +03:00 |
|
|
|
6c112da511
|
Core: fixed user status change
|
2022-12-14 14:38:40 +03:00 |
|
|
|
896fc7117a
|
Merge branch 'develop' into feature/static-versioned
|
2022-12-14 09:58:09 +03:00 |
|
|
|
bf4e16d43a
|
Update svg imports
|
2022-12-14 00:23:58 +03:00 |
|
|
|
f7e6702d75
|
Update ImagesTest.cs
Add opportunity to auto-fix image imports
|
2022-12-13 23:54:29 +03:00 |
|
|
|
cd684de7cc
|
Core: fixed permissions checking
|
2022-12-13 14:11:37 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
|
|
e8886fbc7d
|
Web: Tests: Moved SourceImageFile to ImageFile list
|
2022-12-12 14:48:59 +03:00 |
|
Vashchuk Nikita
|
38857366e1
|
Bug 59715 - Studio: Users. Аватарки пользователей не кешируются браузером
|
2022-12-12 14:09:29 +05:00 |
|
|
|
90afa8c57b
|
Web: Tests: fix search and define images
|
2022-12-11 09:56:10 +03:00 |
|
|
|
d4a8b2609f
|
Web: Tests: Added new images tests
|
2022-12-10 14:07:57 +03:00 |
|
|
|
ffde2bf1c2
|
s3: fixed presigned url
|
2022-12-09 23:46:08 +03:00 |
|
|
|
143a4d01ec
|
removed unused variables
|
2022-12-09 17:47:46 +03:00 |
|
|
|
6e45bc5aa8
|
removed unused variables
|
2022-12-09 16:34:00 +03:00 |
|
|
|
7e52c309c1
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 15:13:43 +03:00 |
|
|
|
e8e75dfa8a
|
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
|
2022-12-09 13:16:21 +03:00 |
|
|
|
153c68b3bd
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 13:05:08 +03:00 |
|
|
|
ddd791096d
|
Feed.Aggregator: changed socket client resolving
|
2022-12-09 12:38:02 +03:00 |
|
|
|
8d1393ba8e
|
Core: changed singleton to scope
|
2022-12-09 12:23:26 +03:00 |
|
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
|
|
5e630feb68
|
Merge branch 'develop' into fix/tests
|
2022-12-08 19:46:44 +03:00 |
|
|
|
4fa41aa273
|
fixed updating ownerId
|
2022-12-08 18:50:50 +03:00 |
|
|
|
cd0de88e6c
|
Core.Common: fix getting user groups
|
2022-12-08 14:55:05 +03:00 |
|
|
|
4affc5f58f
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 18:50:14 +03:00 |
|
|
|
ce773b76bd
|
rename appsettings in migration.sln
|
2022-12-07 17:28:40 +03:00 |
|
|
|
a03b50bd7c
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 16:20:29 +03:00 |
|
|
|
ea1f2ba1b7
|
Merge branch 'develop' into feature/socket-newtag
|
2022-12-07 16:16:59 +03:00 |
|
|
|
de46ba5203
|
fix test GlobalFilter
|
2022-12-07 14:25:45 +03:00 |
|
|
|
0e6d5405d2
|
fix web.api tests
|
2022-12-07 13:38:35 +03:00 |
|
|
|
7afc44abda
|
fix webhooks tests
|
2022-12-07 13:38:35 +03:00 |
|
|
|
2ca007eb81
|
ApiSystem: cors
|
2022-12-07 12:34:14 +03:00 |
|
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
Viktor Fomin
|
15ff7aa19d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-06 16:50:55 +03:00 |
|
|
|
7d0cc5a396
|
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
|
2022-12-06 15:22:47 +03:00 |
|
|
|
346c8d08e3
|
Core.Common: changed permissions validation logic
|
2022-12-06 01:57:45 +03:00 |
|
|
|
1596b4392b
|
Core.Common: added rules matching support
|
2022-12-06 01:55:33 +03:00 |
|
|
|
3ee45f256b
|
Core.Common: added new secuirty objects
|
2022-12-06 01:55:13 +03:00 |
|
|
|
6202e65932
|
Core.Common: added default rules
|
2022-12-06 01:54:35 +03:00 |
|
|
|
cd23ed5efc
|
Core.Common: added rule
|
2022-12-06 01:54:18 +03:00 |
|
|
|
5e026445f5
|
Core.Common: added check for default rules
|
2022-12-06 01:49:57 +03:00 |
|
|
|
52f77ac06b
|
Common: added interface IRuleData
|
2022-12-06 01:48:02 +03:00 |
|
|
|
f5a16c7e64
|
Merge branch 'develop' into feature/socket-newtag
|
2022-12-05 15:55:26 +03:00 |
|
|
|
28e2392e55
|
Core.Common: added clearing cache with user id
|
2022-12-05 14:06:42 +03:00 |
|
|
|
094e8d41ff
|
Merge branch 'develop' into feature/room-admin-permissions
|
2022-12-05 11:15:15 +03:00 |
|
|
|
8e0bc0a732
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-02 19:56:43 +03:00 |
|
|
|
aa7c2f5b61
|
Update LocalesTest.cs
Fix translations tests for toast getTitle method
|
2022-12-02 16:52:49 +03:00 |
|
|
|
8b9f3a5c82
|
Update LocalesTest.cs
Fix detection of tKey translations
|
2022-12-02 16:30:24 +03:00 |
|
|
|
d401c06876
|
Translations tests refactoring
|
2022-12-02 15:56:52 +03:00 |
|
|
|
374e7f5915
|
add ASC.Migration.PersonalToDocspace for linux
|
2022-12-02 11:49:56 +03:00 |
|
|
|
d0deecda18
|
Update ASC.Migration.PersonalToDocspace.exe
|
2022-12-02 11:16:29 +03:00 |
|
|
|
12e800a8be
|
remove waste
|
2022-12-02 11:07:16 +03:00 |
|
|
|
997b2547b5
|
remove waste
|
2022-12-02 11:01:00 +03:00 |
|
|
|
0b6000e200
|
Tests: Refactoring
|
2022-12-01 18:56:13 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
|
9276cd9dfc
|
Update LocalesTest.cs
Added support of typescript files
|
2022-12-01 13:48:43 +03:00 |
|
|
|
6923a767bd
|
Fix run NotTranslatedCommonKeysTest on macos
|
2022-12-01 13:47:53 +03:00 |
|
|
|
9a2c392a96
|
Fix running tests on macos
|
2022-12-01 13:26:50 +03:00 |
|
|
|
5e253bb9c8
|
set region when start app
|
2022-11-30 19:03:44 +03:00 |
|
|
|
fbfd9daa46
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-30 18:37:34 +03:00 |
|
|
|
a44d24d86f
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-30 16:24:04 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
|
|
3a927973e3
|
Merge pull request #1018 from ONLYOFFICE/feature/users-payments-filter
Feature/users payments filter
|
2022-11-29 23:31:37 +04:00 |
|
|
|
bacde66b72
|
Merge branch 'develop' into feature/users-payments-filter
|
2022-11-29 22:24:50 +03:00 |
|
|
|
4db7b76f6d
|
refactoring
|
2022-11-29 17:05:43 +03:00 |
|
|
|
baedfcc93a
|
fixed performance issue
|
2022-11-29 16:47:26 +03:00 |
|
|
|
caa2143203
|
asc.data.backup: upgrade mysql.data.dll
|
2022-11-29 16:43:22 +03:00 |
|
|
|
3068359636
|
refactoring
|
2022-11-29 16:38:44 +03:00 |
|
|
|
b9f45035b9
|
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
|
2022-11-29 13:07:12 +03:00 |
|
|
|
610e0b3064
|
Core.Common: added method to get user type
|
2022-11-29 11:52:29 +03:00 |
|
|
|
014c07c06a
|
Core.Common: added option to disable validation
|
2022-11-29 11:51:54 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
|
|
1b7844b44a
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-25 17:17:31 +03:00 |
|
|
|
78bbd45fdc
|
DI: optimization
|
2022-11-25 17:00:49 +03:00 |
|
|
|
e2e81982f9
|
SocketIO: new rooms and events
|
2022-11-25 12:42:15 +03:00 |
|
|
|
18b89b1517
|
nlog: fixed
|
2022-11-24 19:18:27 +03:00 |
|
|
|
130532927b
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-24 17:56:32 +03:00 |
|
|
|
db7dffe624
|
refactoring
|
2022-11-24 17:22:34 +03:00 |
|
|
|
8d421a3b24
|
refactoring
|
2022-11-24 17:21:34 +03:00 |
|
|
|
ee04a7a55c
|
removed unused dependencies
|
2022-11-24 14:40:13 +03:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
|
|
0d65c0dccf
|
revert
|
2022-11-23 18:54:59 +03:00 |
|
|
|
284c329f70
|
Core: autodetect mysql version
|
2022-11-23 18:45:33 +03:00 |
|
Viktor Fomin
|
fd181baae3
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 15:01:42 +05:00 |
|
|
|
2b9446dc26
|
fix startup
|
2022-11-23 12:17:08 +03:00 |
|
Viktor Fomin
|
c2fb9f583e
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 04:36:46 +05:00 |
|
|
|
4b180094e8
|
Whitelabel: rename
|
2022-11-22 18:03:59 +03:00 |
|
|
|
5582353715
|
Update portalManager.js
Commented wrong portalInternalUrl
|
2022-11-22 14:44:59 +03:00 |
|
|
|
9453c6cd77
|
Added more logs
|
2022-11-22 12:45:51 +03:00 |
|
|
|
ffe0fbde97
|
Cors: fix
|
2022-11-21 12:44:28 +03:00 |
|
|
|
1a3b5d9a2f
|
fix cookie name
|
2022-11-18 18:40:56 +03:00 |
|
|
|
d1c0e79eee
|
Get tenantDomain from origin
|
2022-11-18 17:17:50 +03:00 |
|
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48:19 +03:00 |
|
|
|
34d7f58dbb
|
Core: cookie for origin
|
2022-11-18 13:20:50 +03:00 |
|
|
|
8ab20eea79
|
Merge branch 'develop' into feature/api-origin
|
2022-11-17 18:16:43 +03:00 |
|
|
|
af88793aa4
|
Merge branch 'develop' into feature/api-origin
|
2022-11-17 16:09:15 +03:00 |
|
|
|
22c6aa6896
|
Api: cors support
|
2022-11-17 15:58:40 +03:00 |
|
|
|
bf89726fbc
|
fix nconf
|
2022-11-17 14:56:04 +03:00 |
|
|
|
2f7fdaf00a
|
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
|
2022-11-16 18:24:29 +03:00 |
|
|
|
dcfde7df07
|
common settings for configure aws cloudwatch credentials
|
2022-11-16 17:18:58 +03:00 |
|
|
|
e50833f7f3
|
common settings for configure aws cloudwatch credentials
|
2022-11-16 12:44:53 +03:00 |
|
|
|
0fb1e343a5
|
fix
|
2022-11-16 11:34:21 +03:00 |
|
|
|
ca5e0e4d1e
|
fix
|
2022-11-16 11:18:24 +03:00 |
|
|
|
e5863dddcc
|
fix
|
2022-11-15 17:07:51 +03:00 |
|
|
|
e17ef78c00
|
fix
|
2022-11-15 14:22:53 +03:00 |
|
|
|
56ad3d2287
|
fix
|
2022-11-15 13:53:53 +03:00 |
|
|
|
61b401d906
|
fix
|
2022-11-15 13:28:25 +03:00 |
|
|
|
dd1fa60145
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-14 18:29:46 +03:00 |
|
|
|
0845e6226a
|
SocketIO: fix ipv4
|
2022-11-14 18:00:16 +03:00 |
|
|
|
9dfcd25033
|
backend: update dependency dll
|
2022-11-14 14:11:10 +03:00 |
|
|
|
cd4bfe5299
|
Merge pull request #1031 from ONLYOFFICE/develop
merge from develop
|
2022-11-14 14:56:16 +04:00 |
|
|
|
7581ba7234
|
Merge pull request #1029 from ONLYOFFICE/feature/fix-apisystem-SendCongratulations
fix SendCongratulations
|
2022-11-14 12:50:24 +03:00 |
|
|
|
7047c030d7
|
Merge branch 'develop' into feature/users-payments-filter
|
2022-11-14 12:29:47 +03:00 |
|
|
|
629f44b2f2
|
Core: added sorting users by type
|
2022-11-14 12:17:33 +03:00 |
|
|
|
3b6eece8c7
|
add cache in DbFactory
|
2022-11-14 12:05:54 +03:00 |
|
|
|
b686ca1632
|
Merge pull request #1030 from ONLYOFFICE/develop
merge from develop
|
2022-11-14 12:55:07 +04:00 |
|
|
|
4432bf7d22
|
Socket: async, refactoring
Files: markasnew
|
2022-11-13 20:33:19 +03:00 |
|
|
|
d7c1787442
|
dbContext from regions
|
2022-11-13 00:44:57 +03:00 |
|
|
|
e58ade423f
|
Merge pull request #1026 from ONLYOFFICE/feature/node-v18
Feature/node v18
|
2022-11-11 15:59:18 +03:00 |
|
|
|
aa0222f078
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-11 15:05:26 +03:00 |
|
|
|
e0ee5562e5
|
fix SendCongratulations
|
2022-11-11 11:53:11 +03:00 |
|
|
|
2314dce176
|
fix apisystem
|
2022-11-10 18:07:11 +03:00 |
|
|
|
8636aecf06
|
Update yarn.lock
|
2022-11-10 17:41:49 +03:00 |
|
|
|
7e633c8e70
|
Core: added payments filter
|
2022-11-10 17:13:33 +03:00 |
|
|
|
6537a2c7e6
|
add logs
|
2022-11-10 14:04:58 +03:00 |
|
|
|
a4fd81b404
|
migrate from .net6 to .net7
|
2022-11-10 13:10:18 +03:00 |
|
|
|
b999f6dbc5
|
fix PasswordChange
|
2022-11-09 20:26:59 +03:00 |
|
|
|
d733880485
|
dark whitelabel
|
2022-11-09 16:30:56 +03:00 |
|
|
|
f034f1279f
|
fixed AppName
|
2022-11-09 14:31:22 +03:00 |
|
|
|
789ab8f956
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-11-09 12:57:16 +03:00 |
|
