|
53e0146a26
|
Quota: countroom
|
2022-09-15 17:44:48 +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 |
|
|
17d476aafc
|
Files: added new categories OForm,OFormTemplate
|
2022-09-14 18:56:18 +03:00 |
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +03:00 |
|
|
6f710be0c2
|
Quota: refactoring
|
2022-09-09 17:39:28 +03:00 |
|
|
87cfb294ab
|
Quota: CountRoomFeature
|
2022-09-09 10:27:35 +03:00 |
|
|
375853bf8e
|
Quota: removed hasMigrationFeature
|
2022-09-07 19:35:07 +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 |
|
|
cf88dc8243
|
Files: changed to get room information
|
2022-09-05 14:27:24 +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 |
|
|
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 |
|
|
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 |
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
08832f005c
|
Files: refactor
|
2022-08-29 22:10:27 +03:00 |
|
|
3db342ffec
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-29 17:39:57 +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 |
|
|
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 |
|