|
|
986361b4a0
|
People: new filter AccountLoginType
|
2023-05-17 11:20:27 +03:00 |
|
|
|
9b5d90ff6f
|
fix merge
|
2023-05-17 11:01:43 +03:00 |
|
|
|
5cbdfdef9b
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-17 11:01:32 +03:00 |
|
|
|
f5cb9d9e21
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
# Conflicts:
# common/services/ASC.AuditTrail/AuditReportResource.de.resx
# common/services/ASC.AuditTrail/AuditReportResource.tr.resx
# common/services/ASC.AuditTrail/AuditReportResource.uk-UA.resx
|
2023-05-16 21:53:23 +03:00 |
|
|
|
24081d3fdd
|
added translations
|
2023-05-16 18:43:39 +03:00 |
|
|
|
5521b925e8
|
Webhooks: added total for Webhooks journal
|
2023-05-16 12:22:53 +03:00 |
|
|
|
63b0370a07
|
Webhooks: fixed query
|
2023-05-16 11:51:02 +03:00 |
|
|
|
dc805b8cbd
|
Fix UselessModuleTranslationKeysTest issue (key: FreeStartupPlan)
|
2023-05-16 12:46:49 +04:00 |
|
|
|
e0f82c1a86
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
|
2023-05-16 11:25:26 +03:00 |
|
|
|
fd45e59e51
|
transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6)
|
2023-05-15 20:49:23 +03:00 |
|
|
|
0338a029e8
|
Payments: fixed price for eu
|
2023-05-15 19:30:14 +03:00 |
|
|
|
47a8b890da
|
added translations
|
2023-05-15 17:52:57 +03:00 |
|
|
|
4dc8faeea9
|
fixed RegionHelper
|
2023-05-13 21:37:04 +03:00 |
|
|
|
c65685b9ef
|
fix
|
2023-05-12 22:53:18 +03:00 |
|
|
|
7ca54ad440
|
fix translate tests
|
2023-05-12 22:49:19 +03:00 |
|
|
|
6efa64b91b
|
remove unused resources
|
2023-05-12 22:48:47 +03:00 |
|
|
|
163853751d
|
fix
|
2023-05-12 20:47:41 +03:00 |
|
|
|
2586edcef3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-12 18:18:45 +03:00 |
|
|
|
dbe48a260d
|
added translations
|
2023-05-12 18:18:10 +03:00 |
|
|
|
5a92a23467
|
remove crm resource
|
2023-05-12 17:36:47 +03:00 |
|
|
|
986545dc63
|
fix translate tests
|
2023-05-12 17:13:49 +03:00 |
|
|
|
cff0bed424
|
Bug 62544 - Settings:Restore: add elastic.json in ASC.Data.Backup.BackgroundTasks
|
2023-05-12 14:56:36 +03:00 |
|
|
|
bbfdd149a0
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-12 12:22:02 +03:00 |
|
|
|
aca3cf4e3b
|
fixed tests
|
2023-05-12 12:20:37 +03:00 |
|
|
|
0c5fa3ca49
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-11 19:12:33 +03:00 |
|
|
|
4f10368a78
|
added translations
|
2023-05-11 19:12:10 +03:00 |
|
|
|
9386b2ae09
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-11 16:20:33 +03:00 |
|
|
|
15b5aaaf83
|
Revert "removed products"
This reverts commit fee81e8a3b.
|
2023-05-11 11:26:28 +03:00 |
|
|
|
4817ccbfb3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 18:43:17 +03:00 |
|
|
|
a0293fee03
|
added translations
|
2023-05-10 18:42:42 +03:00 |
|
|
|
aa33f00c23
|
socket.io: fixed routes
|
2023-05-10 14:16:27 +03:00 |
|
|
|
18acde413b
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-10 13:57:30 +03:00 |
|
|
|
605e4376ce
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 13:23:15 +03:00 |
|
|
|
a0bbc7d40f
|
Core: RegionHelper: added null check
|
2023-05-10 13:22:57 +03:00 |
|
|
|
1da3a38513
|
Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
|
2023-05-10 13:07:24 +03:00 |
|
|
|
74ca3e7705
|
Api: removed support for xml and format filter
|
2023-05-10 11:29:22 +03:00 |
|
|
|
8f9e698b88
|
RegisterInstanceWorkerService: optimization
|
2023-05-10 10:58:33 +03:00 |
|
|
|
fee81e8a3b
|
removed products
|
2023-05-10 10:57:06 +03:00 |
|
|
|
322fb1aba3
|
fixed slow stopping service
|
2023-05-10 10:51:26 +03:00 |
|
|
|
3076d3d45d
|
Merge branch 'hotfix/v1.0.1' into bugfix/61992
|
2023-05-08 17:40:16 +03:00 |
|
|
|
3e451e54b6
|
fix
|
2023-05-08 17:37:53 +03:00 |
|
|
|
976c288d32
|
Merge branch 'hotfix/v1.0.1' into bugfix/61992
|
2023-05-08 17:30:29 +03:00 |
|
|
|
bede99f758
|
fixed price for current quota
|
2023-05-07 22:35:39 +03:00 |
|
|
|
950e867013
|
GeolocationHelper: fix
|
2023-05-06 22:08:40 +03:00 |
|
|
|
571932a4e0
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-06 21:39:54 +03:00 |
|
|
|
136d1a8715
|
fix
|
2023-05-06 21:39:34 +03:00 |
|
|
|
ca27ccb590
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-06 20:22:40 +03:00 |
|
|
|
1aa1a3db94
|
dbip: refactoring
|
2023-05-06 20:22:36 +03:00 |
|
|
|
64c176855c
|
Webhooks: optimization
|
2023-05-06 19:55:12 +03:00 |
|
|
|
9c9df73b96
|
backend: dbip_location rename to dbip_lookup. refactoring.
|
2023-05-06 14:48:36 +03:00 |
|
|
|
44c6178ebd
|
Bug 62403 - Settings:Restore. backup tenants_tariffrow
|
2023-05-06 00:02:00 +03:00 |
|
NikitaVashchuk
|
ea31657287
|
fix bug 61992
|
2023-05-05 21:44:35 +05:00 |
|
|
|
13a156bea9
|
added translations
|
2023-05-05 18:57:21 +03:00 |
|
|
|
633ed22763
|
fixed rabbitmq connection leak
|
2023-05-04 23:11:20 +03:00 |
|
|
|
fa1bfb8acd
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-04 19:21:08 +03:00 |
|
|
|
738ae4e38d
|
added translations
|
2023-05-04 19:20:39 +03:00 |
|
|
|
01f4b889a4
|
Merge pull request #1402 from ONLYOFFICE/bugfix/fix-client-proto
Bugfix/fix client proto
|
2023-05-04 18:04:13 +03:00 |
|
|
|
32053e0c05
|
Merge pull request #1399 from ONLYOFFICE/bugfix/aws
Bugfix/aws
|
2023-05-04 17:10:17 +03:00 |
|
|
|
e3594e3c54
|
Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests
|
2023-05-03 23:32:11 +03:00 |
|
|
|
d265fb4373
|
add Backend.Translations.Tests
|
2023-05-03 23:31:45 +03:00 |
|
|
|
c61c938729
|
removed x-rewriter-url
|
2023-05-03 20:25:50 +03:00 |
|
|
|
2742771897
|
added translations
|
2023-05-03 16:06:12 +03:00 |
|
NikitaVashchuk
|
78c75d355d
|
image only via attachment
|
2023-05-03 16:58:54 +05:00 |
|
|
|
7bed1e829c
|
edited Chinese
|
2023-05-02 15:14:05 +03:00 |
|
NikitaVashchuk
|
5fcbee4662
|
added attachments for AWSSender
|
2023-05-02 14:02:16 +05:00 |
|
|
|
2fb3c9f975
|
added translations
|
2023-04-28 16:24:46 +03:00 |
|
|
|
39c1824162
|
Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
|
2023-04-27 22:35:00 +03:00 |
|
|
|
8687b3ae99
|
edited translations
|
2023-04-27 17:42:34 +03:00 |
|
|
|
94ef7b3610
|
CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture
|
2023-04-27 13:15:42 +03:00 |
|
|
|
8b80702e07
|
fix Bug 62261
|
2023-04-26 19:04:34 +03:00 |
|
|
|
82c38be053
|
update migration
|
2023-04-26 15:23:55 +03:00 |
|
|
|
1f92c079e5
|
ExcludeFromMigrations
|
2023-04-26 15:23:46 +03:00 |
|
|
|
d76a2c1552
|
remove tenant
|
2023-04-26 11:25:15 +03:00 |
|
|
|
ca9662e45b
|
fix
|
2023-04-25 13:19:48 +03:00 |
|
|
|
e32880d4c5
|
fix
|
2023-04-25 12:57:32 +03:00 |
|
|
|
7e67ff2087
|
fix
|
2023-04-25 12:32:59 +03:00 |
|
|
|
7ccd0ed5e6
|
ignore when migration repeated models
|
2023-04-25 12:27:07 +03:00 |
|
Vladimir Khvan
|
d9418d7fef
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-25 12:26:46 +05:00 |
|
|
|
a389b0bca3
|
fix
|
2023-04-25 00:29:46 +03:00 |
|
|
|
146fc43d8a
|
add "AddDbTenant" and foreignkeys
|
2023-04-25 00:27:54 +03:00 |
|
|
|
4a1e1a88e7
|
add dbTenant in models and rename "tenant" to "tenantid"
|
2023-04-25 00:17:29 +03:00 |
|
|
|
93ec325611
|
backend: removed X-REWRITER-URL header
|
2023-04-24 16:23:42 +03:00 |
|
NikitaVashchuk
|
c1d97f1462
|
changed ICacheNotify to IEventBus
|
2023-04-24 15:52:56 +05:00 |
|
|
|
84328fc0f3
|
Merge branch 'hotfix/v1.0.1' into bugfix/bug-62137
|
2023-04-24 12:54:44 +03:00 |
|
|
|
f5d3372af2
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-24 11:33:58 +04:00 |
|
|
|
a0adeba2e4
|
fix audit report
|
2023-04-22 15:54:34 +03:00 |
|
NikitaVashchuk
|
242e147563
|
returned images via url for notifications
|
2023-04-22 00:17:20 +05:00 |
|
|
|
9f9806a013
|
fixed greenbutton text
|
2023-04-21 18:45:09 +03:00 |
|
|
|
5df60b3a8b
|
backend: using RemoteIpAddress method for get a client ip
|
2023-04-20 19:38:09 +03:00 |
|
|
|
1711004cfb
|
backend: using RemoteIpAddress method for get a client ip
|
2023-04-20 18:24:31 +03:00 |
|
|
|
0123128b50
|
setup ForwardedHeadersOptions via config
|
2023-04-20 18:15:48 +03:00 |
|
|
|
6a660938de
|
fix Bug 60605
|
2023-04-20 17:05:21 +03:00 |
|
NikitaVashchuk
|
f64450b6d9
|
fix bug 62197
|
2023-04-20 19:02:35 +05:00 |
|
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|
|
|
e2dfd71921
|
SSO: Fix error 500 (response: 14)
|
2023-04-19 16:11:42 +04:00 |
|
|
|
f1a6b53f74
|
SSO: re-written logger and it's usage
|
2023-04-19 16:10:38 +04:00 |
|
|
|
b0e4677897
|
SSO: FIX decodeData call
|
2023-04-19 13:58:41 +04:00 |
|
|
|
0aec0c4dcb
|
SSO: Extended logging
|
2023-04-19 12:46:14 +04:00 |
|
NikitaVashchuk
|
d2758f5659
|
BaseCommonLinkUtility: fix ServerRootPath
|
2023-04-18 17:31:12 +05:00 |
|
|
|
eded2ac313
|
fix Bug 62137
|
2023-04-18 14:17:51 +03:00 |
|
Vladimir Khvan
|
64f5f60de2
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-18 15:20:43 +05:00 |
|
NikitaVashchuk
|
828d4ca35c
|
fix groupStatus
|
2023-04-18 14:58:18 +05:00 |
|
|
|
aafc6ae03e
|
fix Bug 62113
|
2023-04-17 23:10:10 +03:00 |
|
|
|
239a117cdf
|
fixed bug 62100. created redis key with Invariant Culture
|
2023-04-17 16:48:45 +03:00 |
|
diana-vahomskaya
|
23c7b0d2ac
|
fix comments
|
2023-04-17 16:38:00 +03:00 |
|
|
|
100bddeb4a
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-17 11:38:48 +04:00 |
|
Vladimir Khvan
|
a1e5e3b7ed
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-16 15:24:17 +05:00 |
|
NikitaVashchuk
|
26c566e7d2
|
fix CreateWebhook, added query parameters for UpdateWebhook
|
2023-04-14 21:31:36 +05:00 |
|
|
|
2633233cf2
|
UserManager: fix cache
|
2023-04-14 18:42:23 +03:00 |
|
|
|
3e2e60e7b0
|
Translation: Tests: Fix spell check test
|
2023-04-14 18:21:48 +04:00 |
|
|
|
496085fa48
|
fix Bug 62023
|
2023-04-14 15:49:41 +03:00 |
|
|
|
acbbc78533
|
Translations: Tests: Added SpellCheck Common excludes
|
2023-04-14 13:29:31 +04:00 |
|
|
|
a017b42db1
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-13 18:53:25 +04:00 |
|
|
|
69d2ff0a24
|
Translations: Tests: Added tests exceptions for toasts headers
|
2023-04-13 18:53:15 +04:00 |
|
|
|
7e5c048415
|
logger: configure logStreamName in aws logger target on startup
|
2023-04-13 17:41:23 +03:00 |
|
|
|
5fcd3e166b
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-13 16:44:51 +04:00 |
|
|
|
2b17d2eed0
|
people: fixed generate thumbnails
|
2023-04-13 14:44:22 +03:00 |
|
|
|
bdbe009f01
|
add Authentication and ApiKey for elasticsearch
|
2023-04-13 14:14:14 +03:00 |
|
|
|
18bf4167f7
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-13 13:27:58 +04:00 |
|
|
|
4f12380445
|
people: update last_modified in core_user table after set user photo
|
2023-04-12 22:27:16 +03:00 |
|
|
|
44d75c6351
|
fix quota
|
2023-04-12 19:05:00 +03:00 |
|
|
|
c875bdc926
|
Tariff: fix cache
|
2023-04-12 18:11:29 +03:00 |
|
NikitaVashchuk
|
61533655d5
|
added log filter by eventId
|
2023-04-12 16:35:15 +05:00 |
|
|
|
990128748b
|
DI: fix startup
|
2023-04-12 14:07:37 +03:00 |
|
|
|
13ca42dcc0
|
Translations: Test: Add new NotTranslatedPropsTest
|
2023-04-12 14:30:22 +04:00 |
|
|
|
cab1cacba5
|
ApiSystem: fix
|
2023-04-12 11:20:46 +03:00 |
|
|
|
ed96fe2bdb
|
refresh quota
|
2023-04-11 18:58:44 +03:00 |
|
|
|
8ca2a24366
|
fixed NullReferenceException
|
2023-04-11 18:31:36 +03:00 |
|
|
|
42e8b739f3
|
fix Bug 61992
|
2023-04-11 17:52:39 +03:00 |
|
|
|
bfd7e78815
|
Translations: Tests: Added new WrongTranslationTagsTest
|
2023-04-11 14:59:08 +04:00 |
|
|
|
d7946d412d
|
fix quota
|
2023-04-11 13:21:16 +03:00 |
|
NikitaVashchuk
|
acff2c4439
|
fix ssl
|
2023-04-11 14:59:02 +05:00 |
|
|
|
d88fd2c2b2
|
fix merge
|
2023-04-10 23:20:16 +03:00 |
|
|
|
4dad1d6067
|
Merge branch 'develop' into feature/optimization-ef
|
2023-04-10 23:19:56 +03:00 |
|
|
|
df62b3862f
|
Merge branch 'release/v1.0.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
|
2023-04-10 17:24:09 +03:00 |
|
|
|
fed1eb60eb
|
fix Filters
|
2023-04-10 14:04:11 +03:00 |
|
|
|
dd2155e36d
|
fix MessagesRepository
|
2023-04-10 14:02:57 +03:00 |
|
|
|
9ea02d2c33
|
Merge pull request #1340 from ONLYOFFICE/fix/quota
Fix/quota
|
2023-04-10 12:21:35 +03:00 |
|
|
|
6ed8cebb5f
|
fix
|
2023-04-10 11:41:12 +03:00 |
|
|
|
40e7935d68
|
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
Feature/quota via websocket
|
2023-04-07 21:51:32 +04:00 |
|
|
|
0b929fe1d9
|
writer.WriteEntry outside ActionInvoker.Try
|
2023-04-07 17:57:56 +03:00 |
|
NikitaVashchuk
|
4bf565999b
|
fix change-quota-feature-value room for maxInt value
|
2023-04-07 19:35:32 +05:00 |
|
|
|
389c20bf67
|
fix quota
|
2023-04-07 17:02:53 +03:00 |
|
|
|
8d9b4404cf
|
fix Bug 61978
|
2023-04-07 16:53:30 +03:00 |
|
|
|
64c44bed2a
|
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
|
2023-04-07 16:14:11 +04:00 |
|
|
|
dc25ce1162
|
fix async
|
2023-04-07 11:42:03 +03:00 |
|
|
|
dec0d918d4
|
fix CachedQuotaService.cs
|
2023-04-07 11:06:18 +03:00 |
|
|
|
11f32720a6
|
GetTenantAsync
|
2023-04-07 10:39:28 +03:00 |
|
NikitaVashchuk
|
3fc877a422
|
GetJournal(HttpGet("webhooks/log"): added group status for webhooks as bit flag; added deliveryFrom, deliveryTo; added search by configId;
GetTenantWebhooks(HttpGet("webhook")): added status for last webhook;
UpdateWebhook([HttpPut("webhook")]): added ssl option;
Updated db migrations
|
2023-04-06 23:46:23 +05:00 |
|
|
|
ced642832e
|
fix merge
|
2023-04-06 18:18:00 +03:00 |
|
