|
|
cfb0c957e9
|
Quota: user quota storage core_user -> webstudio_settings
|
2022-09-15 15:38:31 +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 |
|
|
|
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 |
|
|
|
c8a8ef11d6
|
refactoring
|
2022-09-09 15:26:37 +03:00 |
|
|
|
549854c579
|
add DemandPermissions
|
2022-09-09 15:20:51 +03:00 |
|
|
|
e8d3169af4
|
fix
|
2022-09-09 13:51:03 +03:00 |
|
|
|
27a7c54368
|
branding for current user
|
2022-09-06 17:22:50 +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 |
|
|
|
7bc95a826a
|
Web.Core: changed user profile url
|
2022-09-05 13:13:37 +03:00 |
|
|
|
21fc9de84a
|
Web.Api: updated doc
|
2022-09-05 10:56:13 +03:00 |
|
|
|
d4677adffa
|
Web.Api: removed unnecessary
|
2022-09-05 10:43:41 +03:00 |
|
|
|
23e24dc9e8
|
Web.Api: added module to feed filter
|
2022-09-02 18:57:36 +03:00 |
|
|
|
56102771ee
|
Quota: check recalculate quota
|
2022-09-02 11:25:27 +03:00 |
|
|
|
88e38e82e2
|
Merge branch 'develop' into feature/rooms-feed
|
2022-09-01 20:25:11 +03:00 |
|
|
|
50175aad40
|
Web.Api: added id, withRelated for feed filter
|
2022-09-01 20:22:59 +03:00 |
|
|
|
7c3af54718
|
Web.Api: fix
|
2022-09-01 19:38:26 +03:00 |
|
|
|
bf4a27def5
|
Web.Api: added feed api
|
2022-09-01 18:22:40 +03:00 |
|
|
|
120c9b3bdb
|
Quota: error processing
|
2022-09-01 17:04:02 +03:00 |
|
|
|
77657329a6
|
Quota: fix recalculate quota
|
2022-09-01 13:45:48 +03:00 |
|
|
|
1cdb6bbb20
|
Quota: recalculate quota
|
2022-09-01 11:37:15 +03:00 |
|
|
|
b96dc2425c
|
Api: fixed delete method
|
2022-08-31 22:27:30 +03:00 |
|
|
|
3ba02c3e2a
|
Quota: recalculate quota
|
2022-08-31 17:42:00 +03:00 |
|
|
|
54ff8de78b
|
Quota: moved UserQuotaSettings
|
2022-08-30 16:03:14 +03:00 |
|
|
|
bf7f4f04da
|
Merge branch 'develop' into feature/user-quota
|
2022-08-30 11:04:49 +03:00 |
|
|
|
701a1ba4ef
|
Quota: save the default user quota setting
|
2022-08-30 02:26:54 +03:00 |
|
|
|
8e5fcfc3c8
|
Quota: errors
|
2022-08-29 23:35:25 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
|
|
ed5f62a877
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-26 18:48:20 +03:00 |
|
TimofeyBoyko
|
3803163ff3
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-26 13:26:41 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
4dcd9be041
|
fix: removed IOptionsSnapshot
|
2022-08-25 13:29:08 +03:00 |
|
|
|
9523560b16
|
Push: fix api
|
2022-08-24 14:26:45 +03:00 |
|
|
|
1ae7d3b11d
|
Api: push controller. Removed projects
|
2022-08-23 18:03:00 +03:00 |
|
|
|
32e3ec6af2
|
Settings: Added plugins config
|
2022-08-23 17:51:06 +03:00 |
|
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
|
d75edd14d6
|
Merge branch 'develop' into feature/settings-common
# Conflicts:
# config/appsettings.json
|
2022-08-22 15:07:55 +03:00 |
|
|
|
b761071b7e
|
Merge branch 'develop' into feature/webhook-fix
|
2022-08-22 14:15:14 +03:00 |
|
|
|
4870031c1a
|
Api: webhooks retry
|
2022-08-22 14:00:57 +03:00 |
|
|
|
22213a25a7
|
Webhook: filter
|
2022-08-22 11:00:55 +03:00 |
|
|
|
907b793c30
|
Settings: communityserver version
|
2022-08-19 16:49:33 +03:00 |
|
|
|
2e85702127
|
Settings: version. CommunityServer replaced with DocSpace
|
2022-08-19 16:34:39 +03:00 |
|
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
|
|
585a9f8d00
|
Webhooks: fix
|
2022-08-18 22:06:51 +03:00 |
|
|
|
5b8374daa0
|
refactoring
|
2022-08-18 19:00:22 +03:00 |
|
|
|
753284b312
|
Webhook: added name. renamed config_id
|
2022-08-18 16:41:53 +03:00 |
|
|
|
1bcd0c524c
|
Webhoks: added automapper
|
2022-08-18 12:34:48 +03:00 |
|
|
|
d26f045e8e
|
Webhooks: added enabled and delivery columns
|
2022-08-18 12:03:13 +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 |
|
