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 |
|
|
|
bfdfd371cf
|
fix
|
2022-10-06 14:57:50 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ab5de603c1
|
nlog: fixed config
|
2022-09-15 18:17:23 +03:00 |
|
|
|
ee27ad4437
|
nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property
|
2022-09-15 17:44: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 |
|
|
|
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 |
|
