|
|
987d161ce9
|
Files: fixed room logo audit, refactor
|
2023-02-02 13:24:29 +03:00 |
|
|
|
8adde07aea
|
fixed creation file
|
2023-02-02 13:20:31 +03:00 |
|
|
|
cb3c12b072
|
Files: changed message action
|
2023-02-02 11:32:00 +03:00 |
|
|
|
7bd27a7e20
|
fixed Bug 60148
|
2023-02-01 20:52:34 +03:00 |
|
|
|
66c1a2b3f6
|
Files: changed default link access
|
2023-02-01 18:23:35 +03:00 |
|
|
|
4fbe654ed5
|
People: fixed user type change
|
2023-01-31 12:52:51 +03:00 |
|
|
|
08d8f13af3
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-29 23:44:35 +03:00 |
|
|
|
ce8d3b3471
|
Files: optimized getting thirdparty rooms
|
2023-01-29 23:43:52 +03:00 |
|
|
|
e780a10311
|
Socket: delete folder
|
2023-01-27 17:42:21 +03:00 |
|
|
|
b85f012310
|
fix Bug 60861
|
2023-01-27 13:04:47 +03:00 |
|
|
|
32914b6413
|
Merge branch 'develop' into feature/chunk-backup
|
2023-01-26 21:28:53 +03:00 |
|
|
|
e2e73d7ced
|
Files: autocleanup
|
2023-01-26 20:44:53 +03:00 |
|
|
|
cd137d9b4c
|
Bug 60846
|
2023-01-26 12:42:21 +03:00 |
|
|
|
67768b680f
|
Files: fixed thirdparty
|
2023-01-25 22:40:48 +03:00 |
|
|
|
ed18a66a3f
|
Converter: fix
|
2023-01-25 18:52:26 +03:00 |
|
|
|
d4cb3327b7
|
SocketIO: updateFolder, deleteFolder
|
2023-01-25 14:50:46 +03:00 |
|
|
|
80f9a69322
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-25 13:07:47 +03:00 |
|
|
|
75f5832407
|
Files: fixed creating thirdparty room
|
2023-01-25 13:06:59 +03:00 |
|
|
|
8a8143950d
|
replace CreateScope() => CreateScopeAsync()
|
2023-01-24 20:33:27 +03:00 |
|
|
|
bc2b94b64e
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-24 19:23:43 +03:00 |
|
|
|
fb44d72af1
|
updateToVersion: refactoring
|
2023-01-24 19:23:39 +03:00 |
|
|
|
7af94acd8b
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-24 17:37:01 +03:00 |
|
|
|
6681cc86e5
|
Bug 60714
|
2023-01-24 17:36:52 +03:00 |
|
|
|
2adc84efe1
|
Bug 60497
|
2023-01-24 13:32:17 +03:00 |
|
|
|
4a8721d894
|
fix Bug 60627
|
2023-01-23 13:25:23 +03:00 |
|
|
|
10c4dec28f
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-23 12:49:19 +03:00 |
|
|
|
08fb297064
|
People: fixed adding user as activated
|
2023-01-23 12:49:04 +03:00 |
|
|
|
f65019a8e3
|
fixed download bytes range from StorageHandler
|
2023-01-20 21:04:13 +03:00 |
|
|
|
ea2ef90d5c
|
fix Bug 60595
|
2023-01-20 19:39:57 +03:00 |
|
|
|
7f2101af12
|
Files: fixed form linking in my documents
|
2023-01-20 11:11:44 +03:00 |
|
|
|
667b10e874
|
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
|
2023-01-19 22:00:57 +03:00 |
|
|
|
4ddf7d521c
|
update external dependency
|
2023-01-19 19:05:07 +03:00 |
|
|
|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +03:00 |
|
|
|
26834b6211
|
fix Bug 60466
|
2023-01-19 17:26:33 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
2b42383e89
|
Files: fixed rights for form
|
2023-01-19 15:00:31 +03:00 |
|
|
|
6e6ae80fda
|
Files: fixed security check
|
2023-01-19 14:58:14 +03:00 |
|
|
|
9e4c0f93e6
|
add token and filetype in fileReference
|
2023-01-19 14:24:24 +03:00 |
|
|
|
3f97d3a470
|
People: added resending all invitations
|
2023-01-19 13:29:45 +03:00 |
|
|
|
22a5fc81a4
|
fix Bug 60623 - Rooms.Archived.
|
2023-01-19 11:44:54 +03:00 |
|
|
|
cf4d6b3138
|
fixed file converter
|
2023-01-18 20:11:13 +03:00 |
|
|
|
8ba37860c8
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-18 18:53:23 +03:00 |
|
|
|
bff2128b5f
|
Resources renamed
|
2023-01-18 18:53:09 +03:00 |
|
|
|
0d46e034e7
|
Files.Service: added users module for feed aggregator
|
2023-01-18 18:36:06 +03:00 |
|
|
|
4caf51e3d5
|
Files: fixed for MyRooms folder, changed for implicit members
|
2023-01-17 19:15:22 +03:00 |
|
|
|
f18a8735e6
|
Files: fixed new tag for room owner
|
2023-01-17 19:03:08 +03:00 |
|
|
|
e5fbbdb38c
|
feed: refactoring
|
2023-01-14 22:32:51 +03:00 |
|
|
|
48d525970d
|
fixed file converter
|
2023-01-14 17:58:19 +03:00 |
|
|
|
d1a109648d
|
Bug 60562
|
2023-01-13 17:15:51 +03:00 |
|
|
|
ee19865cf0
|
fix 60180
|
2023-01-13 16:27:21 +03:00 |
|
|
|
c1da97ee69
|
Bug 60351
|
2023-01-13 15:26:03 +03:00 |
|
|
|
1bc8f3ab1f
|
Files: optimized receipt tenants for feed
|
2023-01-13 14:01:31 +03:00 |
|
|
|
b7b7222040
|
Files: timeout for CommandRequestAsync to documentserver
|
2023-01-12 13:37:17 +03:00 |
|
|
|
49799127da
|
Files: fixed files counter for trash folder
|
2023-01-12 13:07:30 +03:00 |
|
|
|
6e5d43f84c
|
fix Bug 60259
|
2023-01-12 10:58:10 +03:00 |
|
|
|
9e3763739d
|
Bug 60435
|
2023-01-11 17:25:37 +03:00 |
|
|
|
aa893910d6
|
add semaphore when createIfNotExists folder
|
2023-01-10 17:43:12 +03:00 |
|
|
|
c215f6ff15
|
Files: fixed tag new
|
2022-12-30 15:15:16 +03:00 |
|
|
|
3dfb0ce753
|
Bug 60379
|
2022-12-30 13:18:04 +03:00 |
|
|
|
03c8891827
|
Bug 60406
|
2022-12-29 17:53:34 +03:00 |
|
|
|
9d258d5801
|
Bug 60379
|
2022-12-29 14:29:07 +03:00 |
|
|
|
97629e80e5
|
Bug 60168
|
2022-12-29 14:20:25 +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 |
|
|
|
13cd6508f6
|
Bug 60182, 60201, 60351, 60343
|
2022-12-28 18:20:05 +03:00 |
|
|
|
79934ae1db
|
Files: changed rights to unlock file
|
2022-12-28 12:45:49 +03:00 |
|
|
|
9f198ef31d
|
fixed user avatar/room logo cache
|
2022-12-27 18:20:05 +03:00 |
|
|
|
065b1d7308
|
Files: added socket notification when linking form
|
2022-12-27 13:50:59 +03:00 |
|
|
|
b1f65a94cb
|
Files: returned Shared
|
2022-12-27 12:51:34 +03:00 |
|
|
|
109d6df303
|
Files: changed check
|
2022-12-27 12:36:20 +03:00 |
|
|
|
c494e872d7
|
Files: fixed file type check
|
2022-12-26 18:13:17 +03:00 |
|
|
|
0dd582ef8e
|
Files: fixed file type check
|
2022-12-26 17:38:29 +03:00 |
|
|
|
ea430c6181
|
Merge branch 'release/rc-v1.2.0' into feature/form-links
|
2022-12-26 17:13:51 +03:00 |
|
|
|
3abab4fa44
|
Files: removed unnecessary
|
2022-12-26 13:49:33 +03:00 |
|
|
|
37656cd274
|
Files: added username to form title for provider entry
|
2022-12-26 13:35:53 +03:00 |
|
|
|
c528b83dd2
|
Files: refactor
|
2022-12-26 12:32:08 +03:00 |
|
|
|
846aa53583
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-26 12:19:54 +03:00 |
|
|
|
1ae54147ce
|
Files: added warning message, added demotion on invitation
|
2022-12-26 12:19:37 +03:00 |
|
|
|
59fc0dd457
|
fix bug 60245
|
2022-12-25 19:22:14 +03:00 |
|
|
|
9f8ad6fb2a
|
fix bug 60225
|
2022-12-25 19:05:03 +03:00 |
|
|
|
00b32e638a
|
fix Bug 60214
|
2022-12-23 21:00:05 +03:00 |
|
|
|
8b3363bfd1
|
Merge branch 'release/rc-v1.2.0' into feature/form-links
|
2022-12-22 17:02:34 +03:00 |
|
|
|
91e7e20474
|
Files: removed unnecessary
|
2022-12-22 16:44:50 +03:00 |
|
|
|
333dceb146
|
Files: added option for forms
|
2022-12-22 15:49:09 +03:00 |
|
|
|
740684004a
|
Files refactor
|
2022-12-22 15:48:34 +03:00 |
|
|
|
0d20a33102
|
Files: removed unnecessary
|
2022-12-22 15:48:11 +03:00 |
|
|
|
ae952b6d75
|
Files: fixing field names for referenceData
|
2022-12-22 15:37:25 +03:00 |
|
|
|
b21b933cbc
|
Files: fix title
|
2022-12-22 14:53:27 +03:00 |
|
|
|
d0fe06052e
|
Db: optimization
|
2022-12-21 15:57:32 +03:00 |
|
|
|
41408df33b
|
Files: fixed mapping
|
2022-12-20 18:16:48 +03:00 |
|
|
|
d75301fe6e
|
Files: fix security
|
2022-12-20 13:16:53 +03:00 |
|
|
|
324a10f5b0
|
Files: fix
|
2022-12-20 13:16:32 +03:00 |
|
|
|
8e83ebfd7d
|
Files: my documents folder changed to current location
|
2022-12-20 00:30:12 +03:00 |
|
|
|
22f19bede7
|
Files: added files link update
|
2022-12-20 00:30:03 +03:00 |
|
|
|
a0e9d1f512
|
Files: added mapping
|
2022-12-20 00:29:40 +03:00 |
|
|
|
67c6c7f4fd
|
refactoring
|
2022-12-16 17:08:02 +03:00 |
|
|
|
1403722ffd
|
Fixed request.
|
2022-12-16 15:33:27 +03:00 |
|
|
|
a12ea359d6
|
Merge branch 'feature/advanced-security' of https://github.com/ONLYOFFICE/DocSpace into feature/advanced-security
|
2022-12-16 15:07:40 +03:00 |
|
|
|
b0f25d1f58
|
Merge branch 'release/rc-v1.2.0' into feature/advanced-security
|
2022-12-16 15:07:32 +03:00 |
|
|
|
6b7f1b313d
|
Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security
|
2022-12-16 15:02:14 +03:00 |
|
|
|
50b1cd34c8
|
Files: fixed archiving/deleting room with locked files
|
2022-12-16 15:02:06 +03:00 |
|
|
|
d0b03e170b
|
Files: fix
|
2022-12-16 13:24:05 +03:00 |
|
|
|
496d7d2d48
|
Files: added logging
|
2022-12-16 11:45:39 +03:00 |
|
|
|
cfc81fc626
|
Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security
|
2022-12-16 11:42:36 +03:00 |
|
|
|
e12637ddb3
|
Files: fixed getting lock tag, removed unnecessary
|
2022-12-16 11:42:22 +03:00 |
|
|
|
0bd98986de
|
Files: portalName in referenceData as string
|
2022-12-16 10:37:36 +03:00 |
|
|
|
5566298dca
|
Files: removed CanWebRestrictedEditing, CanFillForms, CanEdit
added Accessability:convert
|
2022-12-15 20:54:35 +03:00 |
|
|
|
fd00fb18bb
|
Files: removed unnecessary
|
2022-12-15 17:18:23 +03:00 |
|
|
|
37b2a9aafd
|
Files: changed logic
|
2022-12-15 17:17:58 +03:00 |
|
|
|
8b009551fb
|
Files: added HasLogo
|
2022-12-15 17:15:18 +03:00 |
|
|
|
9e1bb8cb16
|
Files: fixing field names for referenceData
|
2022-12-15 16:50:08 +03:00 |
|
|
|
0cf0ffbadb
|
Merge branch 'release/rc-v1.2.0' into feature/advanced-security
|
2022-12-15 15:18:06 +03:00 |
|
|
|
5abfaf135f
|
Files: changed check
|
2022-12-15 10:31:37 +03:00 |
|
|
|
3c998f637a
|
Files: removed unnecessary
|
2022-12-15 10:30:38 +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 |
|
|
|
40a2bc3ead
|
Files: added edit access parametr to share
|
2022-12-14 15:48:55 +03:00 |
|
|
|
6c112da511
|
Core: fixed user status change
|
2022-12-14 14:38:40 +03:00 |
|
|
|
51bfb4d7cb
|
Files: added read access action
|
2022-12-14 14:20:47 +03:00 |
|
|
|
3a69c17856
|
Files: fixed security
|
2022-12-14 12:08:59 +03:00 |
|
|
|
498983e14a
|
Files: fixed editing history for editor role
|
2022-12-14 11:49:39 +03:00 |
|
|
|
d171269b6c
|
fix referencedata
|
2022-12-14 11:10:40 +03:00 |
|
|
|
effed62662
|
People: fixed user status change
|
2022-12-13 22:59:52 +03:00 |
|
|
|
ec2d02e018
|
Files: added duplicate action, fixed lock for my documents folder
|
2022-12-13 22:34:53 +03:00 |
|
|
|
c52c6b06ac
|
get reference data
|
2022-12-13 14:00:20 +03:00 |
|
|
|
fb32a9f4f6
|
Merge branch 'release/rc-v1.2.0' into feature/advanced-security
|
2022-12-13 11:53:59 +03:00 |
|
|
|
9625b10077
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-12 19:58:43 +03:00 |
|
|
|
c36ba1584a
|
fixed upload room logo to s3
|
2022-12-12 19:58:21 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
be698591d2
|
Merge branch 'develop' into bugfix/room-logo
|
2022-12-12 18:07:59 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
|
|
7f6d9f7b0e
|
Files: fixed messages creating from collection
|
2022-12-12 12:59:36 +03:00 |
|
|
|
3ead7898d1
|
Files: fixed getting headers
|
2022-12-12 12:59:04 +03:00 |
|
|
|
9b21875892
|
Merge branch 'develop' into feature/advanced-security
|
2022-12-12 11:01:23 +03:00 |
|
|
|
dc8ec5a963
|
Files: fix
|
2022-12-12 10:57:26 +03:00 |
|
|
|
a4b5726d99
|
Files: fix
|
2022-12-12 10:17:20 +03:00 |
|
|
|
528865128e
|
Files: fix, refactor
|
2022-12-12 02:45:29 +03:00 |
|
|
|
facee47ca2
|
Files: optimization
|
2022-12-12 02:01:22 +03:00 |
|
|
|
17d8488217
|
Files: refactor
|
2022-12-12 00:54:13 +03:00 |
|
|
|
def75f8e6f
|
Files: updated the rights
|
2022-12-11 23:34:18 +03:00 |
|
|
|
d58fe4fabe
|
Files: fixed security
|
2022-12-11 21:28:36 +03:00 |
|
|
|
60688e791f
|
Files: fix
|
2022-12-11 21:22:17 +03:00 |
|
|
|
5a4e2020c4
|
Files: added processing to get room logo path
|
2022-12-09 21:17:31 +03:00 |
|
|
|
2678cec591
|
Files: changed getting room logo logic
|
2022-12-09 21:16:30 +03:00 |
|
|
|
d6226ca7f6
|
Files: added new param const
|
2022-12-09 21:15:14 +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 |
|
|
|
796092812b
|
Files: refactor
|
2022-12-09 13:30:25 +03:00 |
|
|
|
e8e75dfa8a
|
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
|
2022-12-09 13:16:21 +03:00 |
|
|
|
00709ad59d
|
Merge branch 'develop' into feature/advanced-security
|
2022-12-09 13:12:47 +03:00 |
|
|
|
153c68b3bd
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 13:05:08 +03:00 |
|
|
|
eb697afd4f
|
Files: return
|
2022-12-09 12:57:35 +03:00 |
|
|
|
5f8f9dc29e
|
Files: removed unnecessary
|
2022-12-09 12:41:59 +03:00 |
|
|
|
ddae93c516
|
Files.Service: added new using
|
2022-12-09 12:39:44 +03:00 |
|
|
|
9f7c856e1c
|
Files.Service: register new service
|
2022-12-09 12:39:35 +03:00 |
|
|
|
36181065e2
|
Files: removed unnecessary
|
2022-12-09 12:22:50 +03:00 |
|
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
|
|
d557f7585c
|
Files: fix tenant resolving
|
2022-12-09 11:27:43 +03:00 |
|
|
|
078e59815d
|
Files: return first check
|
2022-12-08 19:55:34 +03:00 |
|
|
|
5e630feb68
|
Merge branch 'develop' into fix/tests
|
2022-12-08 19:46:44 +03:00 |
|
|
|
605a4dd0e7
|
Merge branch 'develop' into feature/advanced-security
|
2022-12-08 17:32:46 +03:00 |
|
|
|
ef97d0c4d0
|
Files: fix access in file dto
|
2022-12-08 15:16:30 +03:00 |
|
|
|
7ae8cbc5a6
|
Files: added additional parameter for link
|
2022-12-08 14:57:36 +03:00 |
|
|
|
33de49463a
|
People: fix permissions checking
|
2022-12-08 14:56:05 +03:00 |
|
|
|
6b2b7cbf0c
|
Files: fix duplicating tags
|
2022-12-08 13:46:50 +03:00 |
|
|
|
9b0082b23f
|
Files: added deleting unused tags
|
2022-12-08 13:46:37 +03:00 |
|
|
|
8dac43b756
|
Files: removed products/files/httphandlers
|
2022-12-08 13:24:57 +03:00 |
|
|
|
6aaa58c237
|
Files: fix tag new
|
2022-12-08 13:10:37 +03:00 |
|
|
|
ac1c2beb20
|
Files: added deleting pin after archiving
|
2022-12-08 11:27:02 +03:00 |
|
|
|
f120d8240f
|
Files: fix
|
2022-12-07 20:20:41 +03:00 |
|
|
|
6646076cd2
|
Files: fix
|
2022-12-07 19:04:53 +03:00 |
|
|
|
4affc5f58f
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 18:50:14 +03:00 |
|
|
|
9c326052c8
|
Files: refactoring, removed unnecessary
|
2022-12-07 16:41:56 +03:00 |
|
|
|
04a092782c
|
Files: new tag for folder
|
2022-12-07 16:36:58 +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 |
|
|
|
554c404b03
|
remove waste
|
2022-12-07 13:53:05 +03:00 |
|
|
|
0f3cbd3ecd
|
Files: removed unnecessary
|
2022-12-07 13:50:13 +03:00 |
|
|
|
c24349bad7
|
Files: removed unnecessary
|
2022-12-07 13:44:44 +03:00 |
|
|
|
7af896c925
|
Files: refactor
|
2022-12-07 13:44:24 +03:00 |
|
|
|
8236c38af5
|
remove waste
|
2022-12-07 13:38:35 +03:00 |
|
|
|
8f7a657671
|
fix files tests
|
2022-12-07 13:38:35 +03:00 |
|
|
|
56ca88641d
|
Files: removed reading history from thirdparty files
|
2022-12-07 12:33:36 +03:00 |
|
|
|
e0f253ec0a
|
Files: removed unnecessary
|
2022-12-07 12:20:30 +03:00 |
|
|
|
4951dd79ff
|
Files: added checks
|
2022-12-07 11:58:11 +03:00 |
|
|
|
824dbc57d0
|
Files: added archiving/unarchiving action
|
2022-12-07 11:55:56 +03:00 |
|
|
|
721f50e95d
|
Files: fix new tag
|
2022-12-07 10:53:45 +03:00 |
|
|
|
b7a3819d91
|
Files: added sharing security
|
2022-12-07 02:18:14 +03:00 |
|
|
|
0451b6ce92
|
Files: added rules for pinning a room
|
2022-12-07 01:11:10 +03:00 |
|
|
|
ccf252148c
|
Files: fix actions in root folders, refactoring
|
2022-12-06 23:52:49 +03:00 |
|
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
|
|
bf7fe0790f
|
Files: fix security, removed unnecessary
|
2022-12-06 19:16:57 +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 |
|
|
|
837cee5b8f
|
People: changed permissions validation logic
|
2022-12-06 01:57:55 +03:00 |
|
|
|
00e9ce2fb1
|
Security: refactoring
|
2022-12-05 18:35:25 +03:00 |
|
|
|
094e8d41ff
|
Merge branch 'develop' into feature/room-admin-permissions
|
2022-12-05 11:15:15 +03:00 |
|
|
|
6cf303a1d4
|
Files: copyTo, copyFrom rights
|
2022-12-02 16:48:00 +03:00 |
|
|
|
580c6688a3
|
Files: fix delete and readHistory for archive, added changeHistory
|
2022-12-02 15:02:42 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
|
fa43e3deaf
|
Files: fix model
|
2022-11-30 22:55:24 +03:00 |
|
|
|
2b7ece7553
|
Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2022-11-30 18:41:02 +03:00 |
|
|
|
eee9c05d9a
|
ASC.Web.Core: Notify: fix email templates
|
2022-11-30 18:40:01 +03:00 |
|
|
|
fbfd9daa46
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-30 18:37:34 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
|
|
a919c6ee48
|
Files: new security fields
|
2022-11-30 12:29:46 +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 |
|
|
|
a886b1b802
|
Merge pull request #1019 from ONLYOFFICE/feature/subject-filter
Feature/rooms subject filter
|
2022-11-29 22:58:11 +04:00 |
|
|
|
c32e90f9ef
|
People: changed validation
|
2022-11-29 11:59:33 +03:00 |
|
|
|
475deff8b9
|
People: added option to disable validation
|
2022-11-29 11:52:59 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
|
|
083eaeac4c
|
Files: updated filter by subject for rooms
|
2022-11-28 11:37:34 +03:00 |
|
|
|
cc77986859
|
Files: folders renamed
|
2022-11-25 18:07:47 +03:00 |
|
|
|
49dd8f538e
|
DocSpace: hide recent and favorites
|
2022-11-25 17:44:15 +03:00 |
|
|
|
4a0bb69db9
|
Merge branch 'develop' into feature/subject-filter
|
2022-11-25 13:21:40 +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 |
|
|
|
c3e32fac2f
|
WhiteLabel: fix async
|
2022-11-23 17:23:46 +03:00 |
|
Viktor Fomin
|
fd181baae3
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 15:01:42 +05:00 |
|
|
|
60ee6a9d49
|
WhiteLabel: fixed support img types
|
2022-11-23 12:59:47 +03:00 |
|
|
|
2b9446dc26
|
fix startup
|
2022-11-23 12:17:08 +03:00 |
|
|
|
4b180094e8
|
Whitelabel: rename
|
2022-11-22 18:03:59 +03:00 |
|
|
|
60284ff9e0
|
Merge pull request #1068 from ONLYOFFICE/bugfix/whitelabel
Bugfix/whitelabel
|
2022-11-22 12:26:18 +05:00 |
|
|
|
7132f3e351
|
fix
|
2022-11-21 16:35:20 +03:00 |
|
|
|
56e0760f96
|
Files: fix CORS
|
2022-11-21 11:07:17 +03:00 |
|
|
|
9a03f19b62
|
add semaphore
|
2022-11-19 05:40:13 +03:00 |
|
|
|
e940da5480
|
fix fileOperation
|
2022-11-19 05:40:00 +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 |
|
|
|
2f7fdaf00a
|
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
|
2022-11-16 18:24:29 +03:00 |
|
|
|
782b928ef0
|
People: allowNotPayment
|
2022-11-16 18:14:47 +03:00 |
|
|
|
d509f1e31b
|
fix FileMoveCopyOperation
|
2022-11-16 14:36:30 +03:00 |
|
|
|
ca5e0e4d1e
|
fix
|
2022-11-16 11:18:24 +03:00 |
|
|
|
f974bb0655
|
fix
|
2022-11-15 19:30:52 +03:00 |
|
|
|
7d9d8fcba3
|
Files: tag dao. Async
|
2022-11-15 19:10:39 +03:00 |
|
|
|
e5863dddcc
|
fix
|
2022-11-15 17:07:51 +03:00 |
|
|
|
e17ef78c00
|
fix
|
2022-11-15 14:22:53 +03:00 |
|
|
|
b379931d1f
|
fix whitelabel
|
2022-11-15 14:11:44 +03:00 |
|
|
|
00bc874422
|
Files: Socket. remove tags
|
2022-11-14 20:21:49 +03:00 |
|
|
|
9dfcd25033
|
backend: update dependency dll
|
2022-11-14 14:11:10 +03:00 |
|
|
|
4432bf7d22
|
Socket: async, refactoring
Files: markasnew
|
2022-11-13 20:33:19 +03:00 |
|
|
|
13eb4fec1b
|
People: added filtering users by paid
|
2022-11-10 17:14:03 +03:00 |
|
|
|
a3832db2f6
|
Files: added filtering by member for administrator
|
2022-11-10 15:15:50 +03:00 |
|
|
|
a4fd81b404
|
migrate from .net6 to .net7
|
2022-11-10 13:10:18 +03:00 |
|
|
|
d733880485
|
dark whitelabel
|
2022-11-09 16:30:56 +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 |
|
|
|
a9fc7a14ed
|
Removed old code
|
2022-11-08 13:57:51 +03:00 |
|
|
|
2ae75ec762
|
fix ide001
|
2022-11-07 12:49:29 +03:00 |
|
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +03:00 |
|
|
|
14a64f4ad0
|
Merge branch 'develop' into feature/remove-waste
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
|
2022-11-07 11:25:54 +03:00 |
|
|
|
6d61e2013e
|
Files: fix rooms constraints
|
2022-11-03 16:07:41 +03:00 |
|
|
|
e5393096a7
|
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
|
2022-11-02 19:05:17 +03:00 |
|
|
|
07937d9beb
|
fix
|
2022-11-02 14:07:27 +03:00 |
|
|
|
7d1717ac3e
|
fix
|
2022-11-02 14:06:05 +03:00 |
|
|
|
34bda20eb0
|
Merge branch 'develop' into feature/recalculate-user-quota
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2022-11-02 13:40:53 +03:00 |
|
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
|
434a34c021
|
Merge branch 'develop' into bugfix/rooms
|
2022-11-02 10:48:26 +03:00 |
|
|
|
606e851a34
|
FileOperation inherited DistributedTaskProgress
|
2022-11-01 18:44:05 +03:00 |
|
|
|
052249b4ef
|
Files: fixed when room access was 0
|
2022-10-31 13:13:35 +03:00 |
|
|
|
7a01578f0c
|
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove "new TenantQuotaController"
|
2022-10-31 13:03:28 +03:00 |
|
|
|
0f72136ff0
|
Merge branch 'develop' into bugfix/rooms
|
2022-10-31 11:34:50 +03:00 |
|
|
|
e197a7b506
|
Quota: fix
|
2022-10-28 17:35:22 +03:00 |
|
|
|
ef10f570f5
|
Files: fixed incorrect setting user type
|
2022-10-28 16:24:58 +03:00 |
|
|
|
7978fcbdfd
|
Files: added correct parent folder id for thirdparty room
|
2022-10-28 15:44:23 +03:00 |
|
|
|
8835bc9bac
|
Files: added correct path for thirdparty rooms
|
2022-10-28 15:43:17 +03:00 |
|
|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +03:00 |
|
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
|
aac059274e
|
Quota: fix
|
2022-10-27 17:44:20 +03:00 |
|
|
|
dbaf6bb264
|
remove unused resources
|
2022-10-27 16:15:08 +03:00 |
|
|
|
95a1743258
|
Revert "remove unused resources"
This reverts commit 2d99753676.
|
2022-10-27 16:01:32 +03:00 |
|
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
|
ef7215fbe3
|
fix
|
2022-10-27 14:06:37 +03:00 |
|
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
|
06f8917b77
|
People: added link logging
|
2022-10-26 18:20:37 +03:00 |
|
|
|
f137df85cc
|
People: added resend docspace invite
|
2022-10-26 18:16:46 +03:00 |
|
|
|
3e1b1bbe6a
|
People: fix links security, refactor
|
2022-10-26 17:40:43 +03:00 |
|
|
|
fffde238d6
|
People: added employee type parameter
|
2022-10-26 17:39:44 +03:00 |
|
|
|
eb485d035a
|
Api.Core: added employee type
|
2022-10-26 17:38:47 +03:00 |
|
|
|
fe5385053c
|
rebbitmq: split default queue on separate queue
|
2022-10-26 17:21:37 +03:00 |
|
|
|
3adb7d5e8e
|
People: added api for inviting users
|
2022-10-25 23:18:07 +03:00 |
|
|
|
92ef73eb86
|
async UpdateUserInfo and SaveUserInfo
|
2022-10-25 18:27:56 +03:00 |
|
|
|
128527a809
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-25 17:33:56 +03:00 |
|
|
|
4ad83e7258
|
Quota: quota recalculation check function
|
2022-10-25 17:31:25 +03:00 |
|
|
|
aa29906ab8
|
Files: fix
|
2022-10-25 16:37:52 +03:00 |
|
|
|
42b4787899
|
refactoring saveUserInfo
|
2022-10-24 18:30:17 +03:00 |
|
|
|
b33d55cfe7
|
Quota: fix
|
2022-10-24 17:26:29 +03:00 |
|
|
|
6fb1cc2115
|
Files: fix uploading files and folders to virtual rooms root
|
2022-10-24 14:41:54 +03:00 |
|
|
|
ac05302b21
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-21 13:14:00 +03:00 |
|
|
|
e3a093935d
|
Files: archived rooms are readonly
|
2022-10-21 12:57:32 +03:00 |
|
|
|
a0975f1d98
|
Files: added archive folder display for free users
|
2022-10-21 12:55:54 +03:00 |
|
|
|
6785bfb512
|
Files: check quota while unarchive room
|
2022-10-20 19:18:54 +03:00 |
|
|
|
60f2393940
|
Quota: fix
|
2022-10-20 14:53:38 +03:00 |
|
|
|
1f5605eb84
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 14:24:12 +03:00 |
|
|
|
2352ab01b6
|
Files: fix deleting folders from trash
|
2022-10-20 12:35:46 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
|
|
2d99753676
|
remove unused resources
|
2022-10-19 18:39:42 +03:00 |
|
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
|
ac0e87e581
|
Quota: fix
|
2022-10-19 14:48:48 +03:00 |
|
