|
|
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 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
be8b455718
|
Files: UsersInRoom feature
|
2022-10-18 17:12:35 +03:00 |
|
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
|
6c476010fd
|
Files: fix file lock
|
2022-10-17 18:30:51 +03:00 |
|
|
|
a1ee600ae6
|
Files: fix security
|
2022-10-17 18:21:40 +03:00 |
|
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
|
9ed0b00594
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-17 12:58:06 +03:00 |
|
|
|
a9a02cb0d5
|
Files: changed sharing rules
|
2022-10-17 12:56:51 +03:00 |
|
|
|
ddcb1f4789
|
Files: removed archiving for room admin
|
2022-10-17 12:56:26 +03:00 |
|
|
|
a77b213f75
|
fix jwt
|
2022-10-17 11:39:59 +03:00 |
|
|
|
669a5116d5
|
Merge pull request #876 from ONLYOFFICE/feature/rooms-counter-new
Feature/rooms counter new
|
2022-10-14 19:23:38 +04:00 |
|
|
|
21075fd4c3
|
Quota: fix
|
2022-10-13 17:45:09 +03:00 |
|
|
|
5a7d46a6fd
|
Files: hid trash for user
|
2022-10-13 15:34:35 +03:00 |
|
|
|
8baaa2b83e
|
Files: fix for visiotor
|
2022-10-13 15:26:12 +03:00 |
|
|
|
efde1f00a9
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-13 13:37:05 +03:00 |
|
|
|
44149d47b7
|
Users: trash, favorites, recent folders
|
2022-10-12 18:53:48 +03:00 |
|
|
|
e3e6062e23
|
Files: fix creating tags for room administrators
|
2022-10-12 18:08:27 +03:00 |
|
|
|
39d101c95d
|
Files: fix unarchiving room for room administrator
|
2022-10-12 18:08:06 +03:00 |
|
|
|
f23b5efb52
|
Files: fix
|
2022-10-12 17:05:12 +03:00 |
|
|
|
b1bd5a100f
|
Quota: recalculate user quota
|
2022-10-12 14:23:57 +03:00 |
|
|
|
b8486d22de
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-12 14:03:36 +03:00 |
|
|
|
61a977b972
|
Files: hide archive for visitors
|
2022-10-11 17:59:40 +03:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
|
fcabf8b73c
|
fix
|
2022-10-11 11:13:22 +03:00 |
|
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
mushka
|
8e2335416a
|
removed unused file
|
2022-10-07 18:55:26 +03:00 |
|
mushka
|
aecc841e55
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 17:15:15 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
cc0f93603f
|
Files: fix room admin rights
|
2022-10-06 16:10:30 +03:00 |
|
|
|
bfdfd371cf
|
fix
|
2022-10-06 14:57:50 +03:00 |
|
|
|
8f3cfca11f
|
Files: updated permissions for room administrators
|
2022-10-05 15:32:22 +03:00 |
|
|
|
20e37c254d
|
Files: added parameter for filtering by provider
|
2022-10-03 17:56:54 +03:00 |
|
|
|
627e6b75fc
|
Files: fix
|
2022-10-03 12:15:20 +03:00 |
|
|
|
8f7216d506
|
Files: added room filtering by provider type
|
2022-10-03 11:45:02 +03:00 |
|
|
|
1618d0cd39
|
Files: fix
|
2022-10-03 10:09:46 +03:00 |
|
|
|
e2fc3476b2
|
Files: fix favorites
|
2022-09-30 14:21:43 +03:00 |
|
|
|
ff6c83e7ef
|
Files: fix tags
|
2022-09-30 14:21:33 +03:00 |
|
|
|
3e9470b64c
|
Files: fix
|
2022-09-29 18:29:11 +03:00 |
|
|
|
8b8b213090
|
Files: fix
|
2022-09-28 18:02:45 +03:00 |
|
|
|
ac5739f235
|
Files: fix for thirdparty
|
2022-09-28 14:11:50 +03:00 |
|
|
|
e098cc372b
|
Files: added new default share for rooms, refactor
|
2022-09-27 23:16:00 +03:00 |
|
|
|
03e99082df
|
Files: fix counting
|
2022-09-27 23:14:59 +03:00 |
|
|
|
ed42050de3
|
Merge branch 'feature/feed' into feature/doc-space-info-panel
|
2022-09-26 11:14:35 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +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 |
|
|
|
101e30b364
|
Files: added large room logo, refactor
|
2022-09-23 16:37:04 +03:00 |
|
|
|
fffdc56a80
|
fix
|
2022-09-23 16:22:02 +03:00 |
|
|
|
7d19f090fb
|
Feed: refactor
|
2022-09-23 16:19:17 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
d7e17828e0
|
Files: added additional parameters to feed
|
2022-09-23 14:57:04 +03:00 |
|
|
|
727175f571
|
Files: fix
|
2022-09-23 14:55:35 +03:00 |
|
|
|
9c8bf9708a
|
Payment: UsersInRoomStatistic
|
2022-09-20 23:22:27 +03:00 |
|
|
|
eeb94810f1
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
|
2022-09-19 18:40:08 +03:00 |
|
|
|
5740b578db
|
Payment: rename
|
2022-09-19 18:20:21 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
|
|
4b0fc12efc
|
Payment: rename
|
2022-09-19 18:03:25 +03:00 |
|
|
|
5848bf5cd3
|
Api: payments check
|
2022-09-19 17:56:45 +03:00 |
|
|
|
2f64a1531f
|
Files: fix
|
2022-09-19 11:55:03 +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 |
|
|
|
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 |
|
|
|
f5bdc75bc1
|
Merge pull request #826 from ONLYOFFICE/feature/nlog-refactoring
Feature/nlog refactoring
|
2022-09-16 17:43:41 +04: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 |
|
|
|
6f1243b382
|
Files: changed filter logic, refactor
|
2022-09-16 15:30:43 +03:00 |
|
|
|
abe0f8563f
|
Files: refactor
|
2022-09-16 14:01:50 +03:00 |
|
|
|
22d5c0c427
|
Files: refactor
|
2022-09-16 13:52:54 +03:00 |
|
|
|
5296bb8394
|
Merge branch 'develop' into feature/files-filter
|
2022-09-16 13:34:49 +03:00 |
|
|
|
d91848cfff
|
Files: added withoutMe for files filter
|
2022-09-16 13:32:00 +03:00 |
|
|
|
7f7d7e5200
|
merge from develop
|
2022-09-16 00:03:52 +03:00 |
|
|
|
6b728a0fca
|
refactoring
|
2022-09-15 18:58:05 +03:00 |
|
|
|
ab5de603c1
|
nlog: fixed config
|
2022-09-15 18:17:23 +03:00 |
|
|
|
53e0146a26
|
Quota: countroom
|
2022-09-15 17:44:48 +03:00 |
|
|
|
ee27ad4437
|
nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property
|
2022-09-15 17:44:04 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
cfb0c957e9
|
Quota: user quota storage core_user -> webstudio_settings
|
2022-09-15 15:38:31 +03:00 |
|
|
|
17d476aafc
|
Files: added new categories OForm,OFormTemplate
|
2022-09-14 18:56:18 +03:00 |
|
|
|
ccdce719bc
|
Files: refactor, updated api doc
|
2022-09-14 15:33:02 +03:00 |
|
|
|
9d545daff8
|
Files: fix
|
2022-09-14 14:49:47 +03:00 |
|
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +03:00 |
|
|
|
923a45ed8c
|
Files: refactor
|
2022-09-14 13:00:08 +03:00 |
|
|
|
1726057d95
|
People: fix, refactor
|
2022-09-14 12:59:55 +03:00 |
|
|
|
b04f50fc72
|
Files: added invintation by link
|
2022-09-14 12:59:02 +03:00 |
|
|
|
8834b2bdff
|
Files: deleted unnecessary
|
2022-09-14 12:53:20 +03:00 |
|
|
|
292c6af917
|
Files: changed logic
|
2022-09-13 23:47:57 +03:00 |
|
|
|
d573733800
|
People: added invite by link
|
2022-09-13 23:47:35 +03:00 |
|
|
|
7ccfe9547f
|
Web.Api: refactor, changed links logic
|
2022-09-13 16:01:04 +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 |
|
|
|
7803fdb318
|
fix
|
2022-09-12 11:08:01 +03:00 |
|
|
|
705ca6fee1
|
fix
|
2022-09-12 11:04:30 +03:00 |
|
|
|
23731e8eab
|
UserQuota: fix
|
2022-09-10 18:07:50 +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 |
|
|
|
6f710be0c2
|
Quota: refactoring
|
2022-09-09 17:39:28 +03:00 |
|
|
|
f16da6e3ad
|
refactor
|
2022-09-09 17:31:56 +03:00 |
|
|
|
2556c805d3
|
File.Service: added feed config
|
2022-09-09 13:38:29 +03:00 |
|
|
|
d4c2c55df8
|
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
|
2022-09-09 11:54:36 +03:00 |
|
|
|
2a7e15b9cb
|
Quota: fix quota setting
|
2022-09-09 11:54:17 +03:00 |
|
|
|
25ae19d601
|
Merge branch 'develop' into feature/remove-waste
|
2022-09-09 11:52:13 +03:00 |
|
|
|
87cfb294ab
|
Quota: CountRoomFeature
|
2022-09-09 10:27:35 +03:00 |
|
|
|
f3a05087fa
|
fix
|
2022-09-08 18:39:53 +03:00 |
|
|
|
8dfe176414
|
Files: added subject type, files link options
|
2022-09-08 18:05:33 +03:00 |
|
|
|
882445e371
|
Quota: add user quota
|
2022-09-08 17:42:36 +03:00 |
|
|
|
26df50c457
|
remove unused projects
|
2022-09-08 17:05:35 +03:00 |
|
mushka
|
20f2fde176
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-08 15:28:38 +03:00 |
|
|
|
3e515032a9
|
remove waste asc.files.service
|
2022-09-08 13:42:33 +03:00 |
|
|
|
47600daa03
|
Files: added api for resend room invintation
|
2022-09-08 13:11:14 +03:00 |
|
|
|
ad09c4a61e
|
remove waste asc.files.core
|
2022-09-08 13:08:45 +03:00 |
|
|
|
ff7eeb0940
|
remove waste in asc.files
|
2022-09-08 10:57:49 +03:00 |
|
|
|
24c729078e
|
Files: refactor
|
2022-09-07 19:51:19 +03:00 |
|
|
|
375853bf8e
|
Quota: removed hasMigrationFeature
|
2022-09-07 19:35:07 +03:00 |
|
|
|
8905f1eb36
|
Files: fix, refactor
|
2022-09-07 18:24:39 +03:00 |
|
|
|
07d909358a
|
Files: removed unnecessary
|
2022-09-07 18:24:27 +03:00 |
|
|
|
950266a3d6
|
People: changed invite by link
|
2022-09-07 18:23:08 +03:00 |
|
|
|
950f8a91bd
|
Quota: check user quota
|
2022-09-07 14:16:22 +03:00 |
|
|
|
47fcba349b
|
Files: added email validation
|
2022-09-06 14:33:29 +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 |
|
|
|
bb35633387
|
Files: added creation users invited by email
|
2022-09-06 13:18:51 +03:00 |
|
|
|
1ca9c85a50
|
Files: added email
|
2022-09-06 13:03:09 +03:00 |
|
|
|
244501710e
|
Files: added email
|
2022-09-06 13:02:39 +03:00 |
|
|
|
09a02d01ff
|
Api: method without payment.
|
2022-09-06 12:48:09 +03:00 |
|
|
|
1a1b2c68b0
|
backend: refactoring start application
|
2022-09-06 11:29:01 +03:00 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +03:00 |
|
|
|
cf88dc8243
|
Files: changed to get room information
|
2022-09-05 14:27:24 +03:00 |
|
mushka
|
84a47113b0
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 13:44:33 +03:00 |
|
|
|
844cc0338c
|
Files: fix files counter
|
2022-09-05 13:41:11 +03:00 |
|
|
|
45339de198
|
Files: added gettting shares for rooms
|
2022-09-05 13:12:40 +03:00 |
|
|
|
e169266b8f
|
Merge branch 'develop' into feature/rooms-feed
|
2022-09-05 11:02:17 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
4ddfe898f5
|
File.Service: refactor
|
2022-09-02 18:59:30 +03:00 |
|
|
|
4a50770792
|
Feed: refactor
|
2022-09-02 18:58:53 +03:00 |
|
|
|
3bf145c123
|
Files: added security filter
|
2022-09-02 18:58:36 +03:00 |
|
|
|
16722854df
|
Files: canshare =false for files in personal room in docspace
|
2022-09-02 10:44:37 +03:00 |
|
|
|
88e38e82e2
|
Merge branch 'develop' into feature/rooms-feed
|
2022-09-01 20:25:11 +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 |
|
|
|
9477006b9f
|
Api: method without payment.
|
2022-09-01 14:02:04 +03:00 |
|
|
|
8e82656e57
|
Files.Service: added context id for folders inside the room
|
2022-08-31 20:06:57 +03:00 |
|
|
|
257693d3f6
|
Files.Service: added context id for files inside the room
|
2022-08-31 20:06:49 +03:00 |
|
|
|
99f62b936d
|
Files: added getting parent room IDs for the folder list
|
2022-08-31 20:04:52 +03:00 |
|
|
|
c35d51bd8e
|
Files.Service: added rooms module
|
2022-08-31 16:11:51 +03:00 |
|
|
|
e811c0e496
|
Files.Service: refactor
|
2022-08-31 16:10:42 +03:00 |
|
|
|
7a7ae03b0e
|
Files: fix security
|
2022-08-31 16:10:20 +03:00 |
|
|
|
8110048220
|
Files: added rooms feeds, refactor, fix
|
2022-08-31 16:10:10 +03:00 |
|
|
|
f8a2b8caef
|
Files: fix cast
|
2022-08-31 13:02:22 +03:00 |
|
|
|
ea2d97b6f5
|
Api: removed unused columns
|
2022-08-30 19:01:12 +03:00 |
|
|
|
54ff8de78b
|
Quota: moved UserQuotaSettings
|
2022-08-30 16:03:14 +03:00 |
|
|
|
33d3520505
|
Quota: fix
|
2022-08-30 14:16:10 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
|
da7bea6736
|
Files: refactor
|
2022-08-30 13:01:27 +03:00 |
|
|
|
4092c567b6
|
Files: fix
|
2022-08-30 12:59:39 +03:00 |
|
|
|
13a1da0b04
|
Files: added private
|
2022-08-30 12:59:20 +03:00 |
|
|
|
c162a56834
|
Quota: fix
|
2022-08-30 12:00:44 +03:00 |
|
|
|
bf7f4f04da
|
Merge branch 'develop' into feature/user-quota
|
2022-08-30 11:04:49 +03:00 |
|
|
|
7e74d4efaa
|
Quota: set default quota
|
2022-08-30 10:26:55 +03:00 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
8e5fcfc3c8
|
Quota: errors
|
2022-08-29 23:35:25 +03:00 |
|
|
|
74a2006420
|
Quota: no quota
|
2022-08-29 22:15:06 +03:00 |
|
|
|
08832f005c
|
Files: refactor
|
2022-08-29 22:10:27 +03:00 |
|
|
|
933a4129fa
|
Quota: string representation of quota
|
2022-08-29 20:20:58 +03:00 |
|
|
|
3db342ffec
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-29 17:39:57 +03:00 |
|
|
|
ff8cfa3737
|
Quota: api
|
2022-08-29 15:03:36 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
mushka
|
18b56dbc3e
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 12:36:47 +03:00 |
|
|
|
16c7d80398
|
Files: fix root files
|
2022-08-29 11:57:48 +03:00 |
|
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
|
|
a8972c7cba
|
Files: fix rooms sorting
|
2022-08-29 10:47:54 +03:00 |
|
|
|
d11e228792
|
Merge branch 'develop' into bugfix/sharpbox
|
2022-08-29 10:27:50 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
4797576a0c
|
Files: fix open in editor
|
2022-08-26 13:54:22 +03:00 |
|
|
|
b4a5fb253f
|
Files: fix rename for SharpBox, SharePoint providers
|
2022-08-26 13:08:03 +03:00 |
|
|
|
1be967fe3f
|
Files: added id conversion in base64 string
|
2022-08-26 13:07:27 +03:00 |
|
|
|
641695ec51
|
Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController
|
2022-08-25 23:09:12 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
mushka
|
64f899fbbf
|
Merge branch 'develop' into feature/create-room
|
2022-08-25 15:36:52 +03:00 |
|
|
|
0c596956f6
|
Merge branch 'develop' into feautre/private-virtual-rooms
|
2022-08-25 15:30:11 +03:00 |
|
|
|
4dcd9be041
|
fix: removed IOptionsSnapshot
|
2022-08-25 13:29:08 +03:00 |
|
|
|
9b22d27306
|
Files: added keys check
|
2022-08-25 11:55:54 +03:00 |
|
|
|
1b158e1e5e
|
Merge branch 'develop' into feature/push
|
2022-08-25 11:22:07 +03:00 |
|
|
|
ca8b4f9b54
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-25 10:36:39 +03:00 |
|
|
|
6ee5cdb0c3
|
Merge branch 'develop' into feature/room-filter
|
2022-08-25 10:23:24 +03:00 |
|
|
|
e2472b392e
|
Files: fix doceditor link
|
2022-08-24 20:27:20 +03:00 |
|
|
|
cce276ed20
|
Files: fix
|
2022-08-24 18:07:36 +03:00 |
|
|
|
ccea188dd4
|
Merge branch 'develop' into feature/create-room
|
2022-08-24 17:55:37 +03:00 |
|
|
|
7f4838901a
|
fix after merge
|
2022-08-24 17:30:06 +03:00 |
|
|
|
0daea49132
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-24 17:12:13 +03:00 |
|
|
|
00e580438f
|
Files: fix rename room
|
2022-08-24 16:13:20 +03:00 |
|
|
|
3d706635f5
|
Files: fix rename room
|
2022-08-24 16:09:43 +03:00 |
|
|
|
6d3a6cb58e
|
Merge branch 'develop' into feature/create-room
|
2022-08-23 18:06:58 +03:00 |
|
