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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
2556c805d3
|
File.Service: added feed config
|
2022-09-09 13:38:29 +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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
0e9099017a
|
Merge branch 'develop' into bugfix/room-logo
|
2022-08-23 18:05:14 +03:00 |
|
|
|
58b48df3ab
|
Files: added folders only filter for rooms
|
2022-08-23 17:22:50 +03:00 |
|
|
|
b633dcb4e6
|
update DocStore
|
2022-08-23 17:19:21 +03:00 |
|
|
|
718d87c7d6
|
Files: forms. remove caching
|
2022-08-23 17:16:15 +03:00 |
|
|
|
34232bc735
|
Files: removed oformservice
|
2022-08-23 16:34:54 +03:00 |
|
|
|
e7fa60d13c
|
Merge branch 'develop' into feature/push
|
2022-08-23 15:32:06 +03:00 |
|
|
|
53ee8e9e15
|
Files: fix security
|
2022-08-23 15:18:37 +03:00 |
|
|
|
4c923b5117
|
Files: fix access
|
2022-08-23 14:54:51 +03:00 |
|
|
|
4278dbbf13
|
Merge branch 'develop' into feature/create-room
|
2022-08-23 14:23:45 +03:00 |
|
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
|
5375ad19c5
|
Files: fix logo for SharePoint
|
2022-08-23 13:20:26 +03:00 |
|
|
|
95fa372f8a
|
Files: fix update path for SharePoint
|
2022-08-23 13:15:24 +03:00 |
|
|
|
f649ee0292
|
Files: fix room logo
|
2022-08-23 13:07:30 +03:00 |
|
|
|
aa0a31e2f6
|
Files: quota* tables removed from filesDbContext
|
2022-08-23 12:57:20 +03:00 |
|
|
|
7c579fbd28
|
Files: fix thirdparty room deletion
|
2022-08-23 12:08:26 +03:00 |
|
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
|
a7ce34d4ce
|
Files: fix for SharpBox
|
2022-08-23 11:37:18 +03:00 |
|
|
|
670fd4952a
|
Files: fix security priority
|
2022-08-23 10:54:55 +03:00 |
|
|
|
953faf550e
|
Quota: user quota init
|
2022-08-23 09:44:07 +03:00 |
|
|
|
0be56bdc15
|
Files: refactor
|
2022-08-22 18:57:10 +03:00 |
|
|
|
b36abf5c0c
|
Files: fix renaming thirdparty room
|
2022-08-22 18:57:03 +03:00 |
|
|
|
61d8ed822a
|
Files: fix path updating
|
2022-08-22 18:56:27 +03:00 |
|
|
|
dd2ec8082c
|
Files: fix renaming thirdparty room
|
2022-08-22 18:55:03 +03:00 |
|
|
|
5ede1f3069
|
Merge branch 'develop' into feature/create-room
|
2022-08-22 16:14:48 +03:00 |
|
|
|
099e7058a7
|
Files: fix thirdparty id mapping
|
2022-08-22 11:06:16 +03:00 |
|
|
|
d4eefc6145
|
Files: fixed optional params
|
2022-08-19 15:47:11 +03:00 |
|
|
|
8b6821d410
|
Files: fixed .format folders methods
|
2022-08-19 14:57:51 +03:00 |
|
|
|
2b6c4b127a
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/ThirdpartyController.cs
|
2022-08-17 13:58:00 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
|
|
ce5009d0c6
|
Push: fixes
|
2022-08-15 14:27:54 +03:00 |
|
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +03:00 |
|
|
|
90c19508ea
|
CoreCommon: tariff contains a list of quotas
|
2022-08-12 15:57:31 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
|
2314d6fc47
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-11 22:33:13 +03:00 |
|
|
|
5b613b8078
|
Files: async fix
|
2022-08-11 22:25:29 +03:00 |
|
|
|
7d32616524
|
Files: fix
|
2022-08-11 19:02:52 +03:00 |
|
|
|
020fa7dcda
|
Merge branch 'develop' into feature/push
|
2022-08-11 17:15:37 +03:00 |
|
|
|
4463fc6e8f
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
# packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
# packages/common/components/Loaders/AutoBackupLoader/index.js
# packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
# packages/common/components/Loaders/DataBackupLoader/index.js
# packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
# packages/common/components/Loaders/RestoreBackupLoader/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
# products/ASC.Files/Server/GlobalUsings.cs
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/BackupStore.js
|
2022-08-11 17:10:37 +03:00 |
|
|
|
44bd9f1d6d
|
Files: fix
|
2022-08-11 16:55:35 +03:00 |
|
|
|
2936cb4ca2
|
Files: fix
|
2022-08-11 16:44:08 +03:00 |
|
|
|
e54617c275
|
Files: fix
|
2022-08-11 16:37:18 +03:00 |
|
|
|
c3252df9ec
|
Web: Added prop type.
|
2022-08-11 15:55:46 +03:00 |
|
|
|
c39451a531
|
Web: Added room selection.
|
2022-08-11 15:54:12 +03:00 |
|
|
|
0ad8be0d1a
|
Files: fix
|
2022-08-11 14:30:01 +03:00 |
|
|
|
c0bf10af9e
|
Files: fix
|
2022-08-10 22:27:44 +03:00 |
|
|
|
a63ee39d36
|
Files: removed unused method
|
2022-08-10 21:23:46 +03:00 |
|
|
|
69e5665763
|
Files: async fix
|
2022-08-10 19:45:59 +03:00 |
|
|
|
39c7a8ac2c
|
Files: fix
|
2022-08-09 23:23:36 +03:00 |
|
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
|
|
05d5421ebc
|
fix
|
2022-08-09 17:11:40 +03:00 |
|
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
|
|
d679a3d9a7
|
Files: async fix
|
2022-08-09 16:09:14 +03:00 |
|
|
|
a73b9cf2e4
|
Files: async fix
|
2022-08-08 23:03:58 +03:00 |
|
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
|
|
9149d08937
|
Files: async
|
2022-08-04 13:47:18 +03:00 |
|
mushka
|
9a0d61b0ff
|
Merge branch 'develop' into feature/create-room
|
2022-08-04 13:33:37 +03:00 |
|
|
|
ce1917c77f
|
Async: refactoring
|
2022-08-03 17:29:20 +03:00 |
|
|
|
7b40920552
|
Chinese (Traditional, Taiwan) empty file templates
|
2022-08-02 17:41:42 +03:00 |
|
|
|
3d531e653d
|
Files: update docstore submodule (b8a2cf5292)
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-08-02 17:41:04 +03:00 |
|
|
|
bb80d28945
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
|
2022-08-02 17:03:50 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
mushka
|
33a334f08b
|
empty room title translation fix
|
2022-08-02 12:17:17 +03:00 |
|
mushka
|
25176ecdc1
|
thirdparty gray label fix
|
2022-08-02 12:16:53 +03:00 |
|
|
|
9d3bc076b9
|
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
|
2022-08-02 11:59:47 +03:00 |
|
|
|
a4ea50c760
|
split AuditReportCreator
|
2022-08-01 17:23:50 +03:00 |
|
|
|
7000cd55f6
|
Merge branch 'develop' into refactoring/client
|
2022-08-01 15:59:18 +03:00 |
|
|
|
ceae4ff07d
|
packages updated
|
2022-08-01 13:58:12 +03:00 |
|
|
|
3c3234b6c2
|
Merge branch 'develop' into feature/fix-api
|
2022-08-01 13:51:05 +03:00 |
|
|
|
4559942c30
|
fix confrim links
|
2022-08-01 13:50:31 +03:00 |
|
|
|
d406e8deb5
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 13:14:47 +03:00 |
|
|
|
b03f8bc1dc
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 11:49:11 +03:00 |
|
mushka
|
f2112365b8
|
Merge branch 'develop' into feature/create-room
|
2022-08-01 09:59:21 +03:00 |
|
mushka
|
0173586cb4
|
component structure complete split and overlook + fixes
|
2022-08-01 09:56:25 +03:00 |
|
mushka
|
166ceb308a
|
moved data file
|
2022-08-01 09:55:36 +03:00 |
|
mushka
|
3277c49da3
|
added trans keys and changed file name
|
2022-08-01 09:55:16 +03:00 |
|
mushka
|
c79b1864f7
|
added edit room event and splitted dialog to 2 parts
|
2022-08-01 09:54:52 +03:00 |
|
mushka
|
97c83a1d30
|
added api calls for room editing
|
2022-08-01 09:51:55 +03:00 |
|
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
|
6fd385e026
|
Merge branch 'develop' into feature/docspace-backup
|
2022-07-29 11:13:42 +03:00 |
|
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
|
5651d3645e
|
Web: Refactoring.
|
2022-07-28 15:50:09 +03:00 |
|
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
ddcde5f7ed
|
Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection .
|
2022-07-27 18:29:27 +03:00 |
|
|
|
0c1ff6ffd7
|
union tests GetLink and ShareRoomByLink
|
2022-07-27 18:22:51 +03:00 |
|
|
|
12e167ca84
|
Files: fix archive folder for WebDav
|
2022-07-27 17:34:10 +03:00 |
|
mushka
|
0bfd5a321e
|
imported new translation keys
|
2022-07-26 20:34:26 +03:00 |
|
mushka
|
f93bf38f82
|
added translation keys and values on ru
|
2022-07-26 20:33:36 +03:00 |
|
mushka
|
d8fac9f0cc
|
disabled iconEditor
|
2022-07-26 19:49:24 +03:00 |
|
mushka
|
67020f4fbf
|
thirdparty dropdown can now go top direction automatically
|
2022-07-26 19:48:56 +03:00 |
|
mushka
|
f8067d87ff
|
enlarged height for dropdownon tablet and >
|
2022-07-26 19:47:51 +03:00 |
|
mushka
|
416bb477ef
|
added loader for creareRoomEvent
|
2022-07-26 19:46:24 +03:00 |
|
|
|
321e44cb94
|
fix SetFilterByTypes
|
2022-07-26 14:55:19 +03:00 |
|
|
|
9a8caeb951
|
backup: update thirdparty
|
2022-07-26 13:50:37 +03:00 |
|
