6a9bef4707
Files: Security: added message for brut force exception
2023-04-28 16:24:58 +03: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
a097e5659e
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room
2023-04-27 19:44: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
8864f289e6
fix Bug 62246
2023-04-26 20:30:23 +03:00
NikitaVashchuk
30f001a4c0
fix periodic and welcome notifications
2023-04-26 20:47:06 +05:00
6d13c4bc32
added translations
2023-04-26 18:20:27 +03:00
a1f63b88ea
SSO: fixed redirect to login on error
2023-04-26 14:39:49 +03:00
09b5f612c9
added translations
2023-04-26 12:23:34 +03:00
d76a2c1552
remove tenant
2023-04-26 11:25:15 +03:00
21212db8f9
Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
2023-04-26 10:49:02 +03:00
6445ccb0ac
Core: CookiesManager: added new cookie types, added item id support
2023-04-25 19:28:34 +03:00
4e8404c574
Web: BrutForce: added increment/decrement
2023-04-25 19:25:25 +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
4a1e1a88e7
add dbTenant in models and rename "tenant" to "tenantid"
2023-04-25 00:17:29 +03:00
cf05348934
Merge pull request #1382 from ONLYOFFICE/bugfix/bug-62137
...
Bugfix/bug 62137
2023-04-24 16:29:34 +03:00
93ec325611
backend: removed X-REWRITER-URL header
2023-04-24 16:23:42 +03:00
d46661eb85
edited translations
2023-04-24 13:46:53 +03:00
f5d3372af2
Merge branch 'release/v1.0.0' into develop
2023-04-24 11:33:58 +04:00
NikitaVashchuk
9712466c98
png images for notifications
2023-04-22 16:21:35 +05:00
d25e10bf2c
added translations
2023-04-21 23:34:13 +03:00
NikitaVashchuk
242e147563
returned images via url for notifications
2023-04-22 00:17:20 +05:00
d34663eb9f
fixed quota description
2023-04-21 21:03:40 +03:00
9f9806a013
fixed greenbutton text
2023-04-21 18:45:09 +03:00
d1d2d2f87c
fixed admin activation message
2023-04-21 18:04:04 +03:00
69e5f40bc8
added translations
2023-04-21 17:21:38 +03:00
f0a6679ba8
added translations
2023-04-21 15:19:59 +03:00
48f9073302
Merge branch 'release/v1.0.0' into develop
2023-04-20 12:31:46 +04:00
2819a82c86
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
2023-04-20 12:11:10 +05:00
f35671c7dc
SSO: fixed a re-login
2023-04-19 17:55:09 +03:00
NikitaVashchuk
22fc47ecb1
do not send mail with confirmation email when registering by email link
2023-04-19 13:08:09 +05:00
6c1a8d122f
Fix documentation
2023-04-18 19:46:22 +05:00
e872505280
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
2023-04-18 19:27:56 +05:00
3639f97217
fixed warnings
2023-04-18 16:49:42 +03: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
cbe2e24efe
edited lang-s indexes
2023-04-18 15:10:44 +03:00
78e6688211
added translations
2023-04-18 14:30:55 +03:00
e6c2f39e39
fix translations
2023-04-18 09:58:41 +03:00
3b4c396391
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 18:26:09 +03:00
03acba483c
added translations
2023-04-17 18:25:51 +03:00
265a27a320
fixed notify pattern resource
2023-04-17 17:40:44 +03:00
232c6bbdf1
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 15:20:10 +03:00
95ca8e7811
added bg
2023-04-17 15:19:46 +03:00
759fe5624a
fix
2023-04-17 14:24:59 +03:00
7ba38a4a4e
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 14:18:44 +03:00
177c79fc79
added az
2023-04-17 14:18:22 +03:00
e54aafd480
Merge branch 'release/v1.0.0' into develop
2023-04-17 13:49:15 +04:00
61011b759d
fix Bug 62120
2023-04-17 12:27:56 +03:00
100bddeb4a
Merge branch 'release/v1.0.0' into develop
2023-04-17 11:38:48 +04:00
97c82bf732
rename UrlShortenerFakeDbContext
2023-04-14 23:16:18 +03:00
NikitaVashchuk
476cbb6f2b
fix bug 62015
2023-04-14 20:03:33 +05:00
c0bcc09493
migrate and fix urlShortener
...
random generate short link
2023-04-14 17:41:15 +03:00
496085fa48
fix Bug 62023
2023-04-14 15:49:41 +03:00
7df9ee8f8b
Merge pull request #1358 from ONLYOFFICE/bugfix/notifications
...
Bugfix/notifications
2023-04-14 15:27:09 +03:00
5ef5fbded9
UserPhotoManager: fixed problem with cache
2023-04-13 18:53: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
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
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
c85caa5651
people: fixed response for POST {userid}/photo/thumbnails method
2023-04-12 19:18:40 +03:00
1458715cb2
ApiSystem: hack
2023-04-12 16:39:19 +03:00
42e8b739f3
fix Bug 61992
2023-04-11 17:52:39 +03:00
NikitaVashchuk
336f340cd0
fix bug 62015(expired link)
2023-04-11 17:29:35 +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
2a736e7c64
Settings: legalterms
2023-04-10 19:10:30 +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
e2dc7c8381
create CustomSynchronizationContext in UserPhotoManager
2023-04-10 14:25:43 +03:00
NikitaVashchuk
9340e0432f
fixed invite notification format
2023-04-10 16:23:09 +05:00
6ed8cebb5f
fix
2023-04-10 11:41:12 +03:00
64c44bed2a
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-07 16:14:11 +04:00
7b1101b50c
add "documentation-email" in config
2023-04-07 14:18:22 +03:00
bcb12080fa
fix async
2023-04-07 10:33:06 +03:00
6780c7da49
translations
2023-04-06 21:32:15 +03:00
b1e7c1d0e6
fix merge
2023-04-06 17:24:14 +03:00
07d847fdd1
Merge branch 'develop' into feature/optimization-ef
2023-04-06 17:24:05 +03:00
138544c86c
remove CreateExecutionStrategy
2023-04-05 19:30:35 +03:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05:00
3e2de4cb75
add ZendeskKey and BookTrainingEmail in SettingsDto
2023-04-04 13:20:59 +03:00
a733c29c2b
Merge branch 'develop' into refactoring/generic-classes
2023-04-04 12:33:26 +03:00
91373783c2
fix thirdparty
2023-04-04 12:10:20 +03:00
Vashchuk Nikita
91606f1962
small fix
2023-04-03 16:38:23 +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
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
6309d9530c
fix async
2023-03-30 15:11:45 +03:00
a79c5420b6
fixed user deleting
2023-03-29 09:43:09 +03:00
27c7804aba
fix methods with task and without async
2023-03-28 13:49:31 +03:00
e1b01e2d81
fix methods with task and without async
2023-03-28 13:13:13 +03:00
aac1896a0f
remove CreateDbContextAsync and fix ExecuteAsync
2023-03-28 00:25:55 +03:00
d39c28046c
add CustomSynchronizationContext
2023-03-27 15:04:50 +03:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
7504e20f63
Merge pull request #1316 from ONLYOFFICE/feature/notification-fixes
...
Feature/notification fixes
2023-03-24 14:41:20 +03:00
240d60c8b6
guest welcome letter changed (Bug 60658)
2023-03-24 14:14:17 +03:00
6bafdc2343
user welcome letter changed
2023-03-24 13:28:55 +03:00
1324f349a1
docs tips letter changed
2023-03-24 12:36:31 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +03:00
Vashchuk Nikita
a9284faf1d
added logo.png as embedded resource
2023-03-23 21:33:33 +05:00
Vashchuk Nikita
7d7f537317
added converting from png, jpg
2023-03-23 20:18:37 +05:00
Vashchuk Nikita
ca6e1d1553
returned old images
2023-03-23 02:26:07 +05: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
fc78a0508d
TenantDbContext -async part2
2023-03-22 11:27:01 +03:00
18cc3d09c6
fix async
2023-03-21 17:28:06 +03:00
a3800de721
TenantDbContext -async part1
2023-03-20 19:16:00 +03:00
c547e4af1a
fixed the path to the payment page
2023-03-20 11:54:19 +03:00
9175233546
payment emails added
2023-03-19 12:25:31 +03:00
603fc8cc0f
MessagesContext - async
2023-03-16 18:23:59 +03:00
e4acd2776c
FeedDbContext - async
2023-03-15 13:04:34 +03:00
e98784fd42
CustomDbContext - async
2023-03-15 12:22:30 +03:00
f771315c7c
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
...
backup chunk-size
2023-03-15 11:58:32 +03:00
405ed839bb
CoreDbContext -async
2023-03-14 23:44:44 +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
Vashchuk Nikita
473cecc4db
cleaning up resources, refactoring
2023-03-10 16:16:58 +05:00
Vashchuk Nikita
f3f1cd1adc
fix userName, added collaborator as portals Role resource
2023-03-09 20:57:21 +05: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
Vashchuk Nikita
4d95d7c848
added roomRemoved as instant action
2023-03-07 19:37:04 +05:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
f95c56198e
thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring
2023-03-03 22:49:36 +03:00
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
Vashchuk Nikita
082c5f968c
fix mentions letter format, added roomsNotificationSettings check
2023-03-01 19:15:35 +05:00
308802eeb6
optional size in api method /people/${profileId}/photo/thumbnails.json
2023-03-01 14:46:26 +03:00
Timofey Boyko
8e59451b4a
Merge branch 'develop' into feature/colloborator
2023-02-27 15:22:21 +03:00
Vashchuk Nikita
f5918e9772
fix roomsNotificationSettings after merge with develop
2023-02-27 12:40:46 +05:00
ead94f371e
Merge branch 'develop' into feature/notifications
2023-02-27 10:29:50 +03:00
03a4dc89dc
Settings: refactoring
2023-02-24 17:19:10 +03:00
068be391cd
Web.Core: fixed invite
2023-02-21 19:00:12 +03:00
94062792d5
People: added collaborator, refactor
2023-02-21 16:35:57 +03:00
Vashchuk Nikita
9e0a5e91cb
fix letter format, mute attribute, tags counter
2023-02-21 14:19:26 +05:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
c1e3d9fb95
Web.Core: refactor
2023-02-20 11:16:03 +03:00
53b3a580fd
Web: added count of collaborators, refactor
2023-02-20 11:11:16 +03:00
b0b3e6df71
Web: refactor
2023-02-17 17:53:41 +03:00
13fbd58dc8
Web: added collaborator, refactor
2023-02-17 17:51:55 +03:00
ca2906ebee
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
f52f32a6af
Merge branch 'develop' into feature/asc.apicache
...
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
Vashchuk Nikita
a8a633c2e8
small fix
2023-02-06 17:42:11 +05:00
Vashchuk Nikita
b928966550
added settings for configure RoomsNotification, added mute field for files and folders
2023-02-06 16:15:51 +05:00
Vashchuk Nikita
ab7f24a68b
Merge branch 'release/rc-v1.2.0' into feature/notifications
2023-02-02 18:48:48 +05:00
Vashchuk Nikita
f6ca8e3c78
added methods for configuring notifications
2023-01-26 19:12:12 +05:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
...
Feature/dotnet7
2023-01-19 22:00:57 +03:00
4ddf7d521c
update external dependency
2023-01-19 19:05:07 +03:00
9937ecccee
fix
2023-01-19 18:32:37 +03:00
fccdbed5a8
fix 60659
2023-01-19 18:20:50 +03:00
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
bff2128b5f
Resources renamed
2023-01-18 18:53:09 +03:00
0090561fb6
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
2023-01-10 14:47:27 +03:00
44804e34db
fixed cache room logo/user photo
2022-12-29 11:31:22 +03:00
9f198ef31d
fixed user avatar/room logo cache
2022-12-27 18:20:05 +03:00
5c828d4124
upload .ico for favicon
2022-12-27 13:49:07 +03:00
846aa53583
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
2022-12-26 12:19:54 +03:00
1ae54147ce
Files: added warning message, added demotion on invitation
2022-12-26 12:19:37 +03:00
0d4000df46
fixed warning
2022-12-25 20:11:06 +03:00
00b32e638a
fix Bug 60214
2022-12-23 21:00:05 +03:00
d35120e501
fix SendToApiAsync
2022-12-21 11:16:11 +03:00
0cf90e45be
Poeple: simplified time cutting
2022-12-14 10:10:46 +03:00
905fae583f
Web.Core: fix pattern
2022-12-13 17:55:12 +03:00
6c75f8be0f
Web.Core: added rounding to seconds
2022-12-13 16:06:06 +03:00
426a11d080
Merge branch 'develop' into release/rc-v1.2.0
2022-12-12 19:33:41 +03:00
965867e3f5
Merge branch 'develop' into feature/fix-whitelable
2022-12-12 17:22:03 +03:00
6e45bc5aa8
removed unused variables
2022-12-09 16:34:00 +03:00
a03b50bd7c
Merge branch 'develop' into release/rc-v1.2.0
2022-12-07 16:20:29 +03:00
61f7765a4f
Merge branch 'develop' into feature/api-origin
2022-12-06 21:47:56 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
...
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
42b376dd8d
Web.Core: changed permissions validation logic
2022-12-06 01:58:15 +03:00
5fd4bded2f
Web.Core: added unique name for invited user
2022-12-05 14:07:46 +03:00
b693486b46
merge from develop
2022-12-01 14:52:46 +03:00
eee9c05d9a
ASC.Web.Core: Notify: fix email templates
2022-11-30 18:40:01 +03:00
1a565b559e
ASC.Web.Core: Notify: added missing email templates
2022-11-30 17:28:38 +03:00
00c782fcb3
Web.Core: removed unnecessary check, changed validation
2022-11-29 12:11:13 +03:00
Viktor Fomin
366d92abb2
Merge branch 'develop' into feature/fix-whitelable
2022-11-28 12:09:11 +03:00
3ef3ffb617
fixed telegram resources
2022-11-25 20:37:48 +03:00
903227ba7d
Whitelabel: fix
2022-11-24 11:08:53 +03:00
Viktor Fomin
1fb1228dbd
Merge branch 'develop' into feature/fix-whitelable
2022-11-24 02:33:13 +05:00
c3e32fac2f
WhiteLabel: fix async
2022-11-23 17:23:46 +03:00
236583718c
Whitelabel: fix
2022-11-23 13:59:48 +03:00
60ee6a9d49
WhiteLabel: fixed support img types
2022-11-23 12:59:47 +03:00
4b180094e8
Whitelabel: rename
2022-11-22 18:03:59 +03:00
ffe0fbde97
Cors: fix
2022-11-21 12:44:28 +03:00
9bcaf62b9a
temp
2022-11-18 21:54:05 +03:00
ebd4cd6293
CustomColorThemesSettings: removed black and grey theme
2022-11-18 19:27:23 +03:00
1a3b5d9a2f
fix cookie name
2022-11-18 18:40:56 +03:00
35e22fe8c8
Merge branch 'develop' into feature/fix-whitelable
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-11-18 16:48:19 +03:00
76b644d9e8
logging
2022-11-18 15:12:36 +03:00
34d7f58dbb
Core: cookie for origin
2022-11-18 13:20:50 +03:00
999e892b7e
Merge branch 'develop' into feature/custom-theme
2022-11-17 17:30:46 +03:00
0fb1e343a5
fix
2022-11-16 11:34:21 +03:00
ea946ccfea
union whitelabel/logos with whitelabel/sizes
2022-11-15 17:01:47 +03:00
3785ce3b9d
fix whitelabel
2022-11-15 16:46:08 +03:00
f77f042741
add check CanBeDark
2022-11-15 16:22:12 +03:00
636aedd1d6
refactoring
2022-11-15 15:24:08 +03:00
