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
36eb80dadb
Payment: fixed
2023-05-15 14:28:13 +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
3bb1ca7969
Billing: fixed upload license
2023-05-12 18:58:53 +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
437e2d4aa5
fix smtp delete
2023-05-10 13:23:38 +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
006b58e405
LicenceReader: fixed int parsing
2023-05-05 10:57:53 +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
4322eff660
fix smtp
2023-05-04 16:32:59 +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
8b80702e07
fix Bug 62261
2023-04-26 19:04:34 +03:00
9071c95d4d
generate documentation
2023-04-26 18:34:39 +03:00
07521657ad
Merge branch 'feature/api-descriptions' of https://github.com/ONLYOFFICE/DocSpace into feature/api-descriptions
2023-04-26 18:03:19 +03:00
ded955da05
fixed quotes
2023-04-26 18:02:22 +03:00
f55f05a1ac
Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-descriptions
2023-04-26 15:08:20 +03:00
b11696f70f
fixes
2023-04-26 12:27:45 +03:00
8dba4f6290
generate documentation ( 963bcb67f1)
2023-04-26 11:08:10 +03:00
21212db8f9
Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
2023-04-26 10:49:02 +03:00
df43e14678
Merge branch 'feature/api-descriptions' of https://github.com/ONLYOFFICE/DocSpace into feature/api-descriptions
2023-04-25 19:24:45 +03:00
aa708c8877
added more descriptions and data types
2023-04-25 19:23:54 +03:00
93ec325611
backend: removed X-REWRITER-URL header
2023-04-24 16:23:42 +03:00
84328fc0f3
Merge branch 'hotfix/v1.0.1' into bugfix/bug-62137
2023-04-24 12:54:44 +03: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
2819a82c86
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
2023-04-20 12:11:10 +05:00
a388bb678d
generate documentation
2023-04-19 17:26:51 +05: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
29c37cbba5
fix namespaces for documentation
2023-04-19 16:39:50 +05: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
963bcb67f1
generate documentation
2023-04-19 13:39:32 +05:00
6c1a8d122f
Fix documentation
2023-04-18 19:46:22 +05:00
4af951856f
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.People/Server/Api/PhotoController.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/ApiModels/RequestDto/LinkAccountRequestDto.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-04-18 18:08:59 +05: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
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
2633233cf2
UserManager: fix cache
2023-04-14 18:42:23 +03:00
f56b589749
some more fixes
2023-04-14 18:19:43 +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
2b17d2eed0
people: fixed generate thumbnails
2023-04-13 14:44:22 +03:00
24e3a3ec30
Merge branch 'feature/api-descriptions' of https://github.com/ONLYOFFICE/DocSpace into feature/api-descriptions
2023-04-13 12:44:33 +03:00
50c3f5805a
fixes for api docs
2023-04-13 12:43:54 +03: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
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
1c55a0acff
fixes for People and Backup api docs
2023-04-11 13:15:59 +03:00
9ea02d2c33
Merge pull request #1340 from ONLYOFFICE/fix/quota
...
Fix/quota
2023-04-10 12:21:35 +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
e62ba6633f
Quota: fix
2023-04-06 18:15:54 +03:00
1ac20fd57e
fix checking quota
2023-04-06 11:47:56 +03:00
37b28738ae
Quota: fix
2023-04-05 19:05:46 +03:00
298dee8269
Hide documentation warnings
2023-04-05 20:41:04 +05:00
dbde524070
GenerateDocumentationFile
2023-04-05 20:35:59 +05:00
a1cb32ce36
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
2023-04-05 20:07:30 +05:00
NikitaVashchuk
69230b5dc6
added change-quota-feature-value for CountRoomFeature and FreeFeature
2023-04-05 19:30:59 +05:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
edefc8e959
fix
2023-04-04 20:01:33 +03:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
f1e0730e0f
fix GetScheduledBackupRecords
2023-03-30 23:17:56 +03:00
5aacc82904
fixed room history
2023-03-30 18:36:22 +03:00
663423bbe6
backup: added api descriptions
2023-03-30 18:29:14 +03:00
c44297cba7
fix
2023-03-30 18:02:12 +03:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
ff8721a4b1
Hide documentation warnings ( 4dfeea2969)
2023-03-29 20:29:53 +05:00
76b68d74f8
fix: hidden _usersInRoomFeature and fix portal/payment/quota
2023-03-29 17:48:52 +03:00
043ea76aab
Hide documentation warnings
2023-03-29 19:36:22 +05:00
aa1b712131
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
2023-03-29 19:28:15 +05:00
4dfeea2969
Hide documentation warnings
2023-03-29 19:25:28 +05:00
fe91eae377
Fix documentation warnings
2023-03-29 19:25:20 +05:00
9e7bbf6492
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-29 13:47:12 +03:00
0af471a215
fixed history
2023-03-29 13:46:54 +03:00
08d4050143
fix backup s3: split stream
2023-03-29 12:19:35 +03:00
fdba9bec6c
Socket: Added changeQuotaUsedValue and changeQuotaFeatureValue
2023-03-28 22:27:15 +04:00
Timofey Boyko
bec19bb207
Add to test ignore images/nofifications folder
2023-03-24 15:53:55 +03:00
ba4059e8b0
fix quota
2023-03-24 15:07:08 +03:00
cab3582bcf
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
...
Bugfix/notification image format
2023-03-24 12:39:32 +03:00
Vashchuk Nikita
bce9c8029d
attachment as inline
2023-03-24 13:10:00 +05:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
d1213f7b04
fix Bug 61712
2023-03-22 23:52:59 +03:00
Vashchuk Nikita
2b94d5dfa5
changed notification image format to png,
...
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
2023-03-23 00:25:15 +05:00
5e11ff91eb
fix
2023-03-21 14:47:14 +03:00
b96030c0b2
Quota: fix
2023-03-20 15:39:35 +03:00
9175233546
payment emails added
2023-03-19 12:25:31 +03:00
a2c35b0a40
backend: ldap/s3: removed check mono
2023-03-17 18:02:19 +03:00
f35425cb87
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-17 14:37:41 +03:00
bafbe2c81b
fixed notification
2023-03-17 14:37:06 +03:00
b735e3415a
MessaginSystem: added root folder title in notification info
2023-03-17 14:34:22 +03:00
9656931ee7
AuditTrail: added context
2023-03-17 14:33:43 +03:00
f866617acd
AuditTrail: added message text for trash emptied action
2023-03-17 14:32:06 +03:00
2032329753
fix quota
2023-03-17 13:55:21 +03:00
046deda226
fix
2023-03-16 13:47:56 +03:00
8ebdf69654
ResourceManager: fix
2023-03-16 12:27:13 +03:00
5de3a26365
Quota: contentsearch
2023-03-16 12:24:56 +03:00
f67aec6a78
update MySQL from 8.0.31 => 8.0.32.1
2023-03-15 22:15:02 +03:00
3553cfe733
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-15 12:13:12 +03:00
df2d288119
AuditTrail: added rooms module in resource
2023-03-15 12:12:59 +03:00
f771315c7c
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
...
backup chunk-size
2023-03-15 11:58:32 +03:00
cad10c140b
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-13 19:16:26 +03:00
4d929ef43e
Core: added new action audit messages
2023-03-13 18:57:14 +03:00
3aaaf4eafe
AuditTrail: added new actions
2023-03-13 18:55:44 +03:00
32e3769176
Search: exception handling
2023-03-13 14:51:32 +03:00
cff8d0d797
Fix NotTranslatedToastsTest issue
2023-03-13 13:14:44 +04:00
7a5d007858
fixed migration
2023-03-10 23:13:19 +03:00
f053663499
fixed DeleteExpiredService
2023-03-10 22:32:30 +03:00
47e14d50fb
async/await: added new instance dbcontext
2023-03-10 19:49:46 +03:00
132bc6792b
Merge pull request #1297 from ONLYOFFICE/feature/notifications
...
Feature/notifications
2023-03-10 17:06:55 +03:00
722df36493
async: fixed
2023-03-10 16:09:32 +03:00
Vashchuk Nikita
2d92da7c0c
Merge branch 'release/v1.0.0' into feature/notifications
...
# Conflicts:
# web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
bd54c11a81
Merge branch 'develop' into feature/notifications
2023-03-10 14:27:34 +03:00
d2d67f5060
fix
2023-03-09 20:18:18 +03:00
92539449c4
backup chunk-size
2023-03-09 15:34:47 +03:00
05571943dc
backend: refactoring. replace sync methods to async within ExecutionStrategy block
2023-03-09 14:42:18 +03:00
Vashchuk Nikita
8bbdeffa46
changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName
2023-03-09 16:40:36 +05:00
e18282c496
Merge branch 'develop' into release/v1.0.0
2023-03-09 12:14:12 +04:00
34b3fe715c
Fix frontend tests running
2023-03-09 12:12:31 +04:00
Vashchuk Nikita
5860c24c84
enable RoomsActivity subscription for all new users
2023-03-08 21:01:44 +05:00
13a82767ac
DbQuotaService: optimization work
2023-03-08 14:27:19 +03:00
30dc57380e
fix Bug 60163
2023-03-07 20:53:31 +03:00
Vashchuk Nikita
4d95d7c848
added roomRemoved as instant action
2023-03-07 19:37:04 +05:00
