97c82bf732
rename UrlShortenerFakeDbContext
2023-04-14 23:16:18 +03:00
c0bcc09493
migrate and fix urlShortener
...
random generate short link
2023-04-14 17:41:15 +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
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
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
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
6780c7da49
translations
2023-04-06 21:32:15 +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
a79c5420b6
fixed user deleting
2023-03-29 09:43:09 +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
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
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
f771315c7c
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
...
backup chunk-size
2023-03-15 11:58:32 +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
