0751f62c75
fixed tenantExtra method
2023-05-05 12:11:21 +03:00
678d1d4c03
smtp: status
2023-05-05 12:05:31 +03:00
c93374d10a
fix smtp
2023-05-05 11:53:01 +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
95eea07d41
Merge pull request #1401 from ONLYOFFICE/bugfix/daily-feed
...
fix 4000, 4006 actions(create, update docspace user)
2023-05-04 18:31:18 +03:00
fad4cc1dbe
add isdefaultSettings
2023-05-04 17:55:23 +03:00
NikitaVashchuk
b613e66cb7
Merge branch 'hotfix/v1.0.1' into bugfix/62369
...
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx
2023-05-04 19:24:15 +05:00
32053e0c05
Merge pull request #1399 from ONLYOFFICE/bugfix/aws
...
Bugfix/aws
2023-05-04 17:10:17 +03:00
0f0128e4d0
Merge pull request #1394 from ONLYOFFICE/bugfix/notifications
...
Bugfix/notifications
2023-05-04 17:02:55 +03:00
NikitaVashchuk
dc20e2cb2d
fix settings naming
2023-05-04 18:57:57 +05:00
NikitaVashchuk
9745e65d07
fix settings naming
2023-05-04 18:55:14 +05:00
4322eff660
fix smtp
2023-05-04 16:32:59 +03:00
a69bcf1cfc
SendJoinInviteMail didn't throw exceptions
2023-05-03 20:45:17 +03:00
fa77fc1dbf
added translations
2023-05-03 18:15:10 +03:00
1acb252c87
added translations
2023-05-03 17:42:43 +03:00
NikitaVashchuk
1c301b572a
fix 4000, 4006 actions(create, update docspace user)
2023-05-03 19:09:17 +05:00
686b37f1a2
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
2023-05-03 16:06:40 +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
5d55683496
tariff method now accepts "refresh" argument
2023-05-03 13:44:19 +03:00
f20eb2429c
edited Note in pattern_portal_rename
2023-05-03 12:01:40 +03:00
NikitaVashchuk
aa963d61b9
fix bug 62369
2023-05-03 08:53:46 +05:00
e3dfc1cd0a
edited pattern_portal_rename
2023-05-02 16:22:38 +03:00
7bed1e829c
edited Chinese
2023-05-02 15:14:05 +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
8687b3ae99
edited translations
2023-04-27 17:42:34 +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
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
a1f63b88ea
SSO: fixed redirect to login on error
2023-04-26 14:39:49 +03:00
b11696f70f
fixes
2023-04-26 12:27:45 +03:00
09b5f612c9
added translations
2023-04-26 12:23:34 +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
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
6574df323c
fix Bug 62255
2023-04-24 06:21:35 -07:00
00f96b5090
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
2023-04-24 13:47:22 +03:00
d46661eb85
edited translations
2023-04-24 13:46:53 +03:00
84328fc0f3
Merge branch 'hotfix/v1.0.1' into bugfix/bug-62137
2023-04-24 12:54:44 +03: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
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
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
29c37cbba5
fix namespaces for documentation
2023-04-19 16:39:50 +05:00
86e5725ec4
api: model to inDto param name
2023-04-19 13:31:12 +05:00
NikitaVashchuk
22fc47ecb1
do not send mail with confirmation email when registering by email link
2023-04-19 13:08:09 +05:00
NikitaVashchuk
a6bb9aac83
WhitelabelController: GetWhiteLabelLogos: removed notification field from response
2023-04-19 13:03:01 +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
18b5f9f697
fix documentation
2023-04-18 19:27:48 +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
61011b759d
fix Bug 62120
2023-04-17 12:27:56 +03:00
f56b589749
some more fixes
2023-04-14 18:19:43 +03:00
NikitaVashchuk
476cbb6f2b
fix bug 62015
2023-04-14 20:03:33 +05: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
41483c51be
add base-domain in api method "settings"
2023-04-14 10:49:00 +03:00
5ef5fbded9
UserPhotoManager: fixed problem with cache
2023-04-13 18:53: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
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
ed96fe2bdb
refresh quota
2023-04-11 18:58:44 +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
2a736e7c64
Settings: legalterms
2023-04-10 19:10:30 +03:00
NikitaVashchuk
9340e0432f
fixed invite notification format
2023-04-10 16:23:09 +05: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
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
8d6e51a16f
fix
2023-04-05 12:54:02 +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
32f5d3dc2f
fix
2023-04-04 14:35:22 +03:00
3e2de4cb75
add ZendeskKey and BookTrainingEmail in SettingsDto
2023-04-04 13:20:59 +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
5aacc82904
fixed room history
2023-03-30 18:36:22 +03:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
04f6fe5db4
api method "whitelabel/logos" AllowSuspended
2023-03-30 13:49:52 +03:00
ff8721a4b1
Hide documentation warnings ( 4dfeea2969)
2023-03-29 20:29:53 +05:00
6fc89c8112
GenerateDocumentationFile ( 0147a44476)
2023-03-29 20:29:48 +05:00
5e5a39d5c6
Hide smtp api documentation
2023-03-29 20:02:54 +05:00
7684a3e2fc
Hude modules api documentation
2023-03-29 20:02:41 +05:00
76b68d74f8
fix: hidden _usersInRoomFeature and fix portal/payment/quota
2023-03-29 17:48:52 +03:00
a4419d3194
Fix documentation warnings
2023-03-29 19:36:14 +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
fe91eae377
Fix documentation warnings
2023-03-29 19:25:20 +05:00
4bda4e2d79
revert 9b7c765f19
2023-03-29 15:19:32 +03:00
9b7c765f19
fix quota: ignore visible for api method payment/quota
2023-03-29 12:20:31 +03:00
a79c5420b6
fixed user deleting
2023-03-29 09:43:09 +03:00
f882861bc6
fixes
2023-03-28 18:29:50 +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
cab3582bcf
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
...
Bugfix/notification image format
2023-03-24 12:39:32 +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
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03: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
20e5829e13
Merge pull request #1311 from ONLYOFFICE/feature/payment-notify
...
Feature/payment notify
2023-03-20 13:52:15 +03:00
c547e4af1a
fixed the path to the payment page
2023-03-20 11:54:19 +03:00
69165762db
Web.Api: renamed room to context
2023-03-20 10:36:54 +03:00
9175233546
payment emails added
2023-03-19 12:25:31 +03:00
939efe37d5
Web.Api: added audit context
2023-03-17 14:34:43 +03:00
734fda9329
fixes
2023-03-17 11:44:04 +03:00
f771315c7c
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
...
backup chunk-size
2023-03-15 11:58:32 +03:00
e223b54a63
Web.Api: fixed getting audit
2023-03-15 11:45: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
434ece42ed
Web.Api: added room in dto
2023-03-13 18:53:49 +03:00
f357b70edc
white label settings: added api descriptions
2023-03-13 18:18:57 +03:00
b4c27ea1b5
webhook settings: added api descriptions
2023-03-13 15:55:56 +03:00
5ac9beb01d
version settings: added api descriptions
2023-03-13 12:45:48 +03:00
a99353273b
tips settings: added api descriptions
2023-03-13 12:41:40 +03:00
bc604cbeac
TFA settings: added api descriptions
2023-03-13 12:33:22 +03:00
9762e4eaca
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-13 11:45:30 +03:00
2fee97df3d
Added 'AllowNotPayment'.
2023-03-13 11:43:58 +03:00
03a0ed298e
fix Bug 61558
2023-03-13 10:47:39 +03:00
633c6d122a
Quota: fix title
2023-03-12 18:46:58 +03:00
ff2786ff6c
storage: added api descriptions
2023-03-10 18:52:54 +03:00
51d26ffa9d
sso settings: added api descriptions
2023-03-10 18:35:46 +03:00
bf5ab933a9
settings: added api descriptions
2023-03-10 18:31:08 +03:00
e84356411d
fix
2023-03-10 18:30:34 +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
152bacc80b
security settings: added api descriptions
2023-03-10 12:55:08 +03:00
e5f733c771
fix Bug 61076
2023-03-10 11:39:54 +03:00
Vashchuk Nikita
f3f1cd1adc
fix userName, added collaborator as portals Role resource
2023-03-09 20:57:21 +05:00
d9990dcff2
CardDav: added api descriptions
2023-03-09 18:08:21 +03:00
893bc5b229
Firebase: added api descriptions
2023-03-09 17:58:02 +03:00
eecef5b2e6
owner: added api descriptions
2023-03-09 17:29:51 +03:00
b6528d8605
message settings: added api descriptions
2023-03-09 15:59:40 +03:00
4d0ed3d7db
Merge pull request #1284 from ONLYOFFICE/bugfix/61465
...
Bugfix/61465
2023-03-09 15:36:31 +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
db1d432a6a
license: added api descriptions
2023-03-09 11:28:57 +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
431247d9fc
ldap: added api descriptions
2023-03-07 16:17:02 +03:00
ac8ae77170
ip restrictions: added api descriptions
2023-03-07 11:06:59 +03:00
b642b67908
greeting settings: added api descriptions
2023-03-07 10:59:39 +03:00
ef1030cb2f
custom schemas: added api descriptions
2023-03-07 10:11:02 +03: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
84d102c1af
fix Bug 61465 - Accounts. Two-factor authentication.
2023-03-04 00:57:15 +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
f4c56ae706
base and custom navigation settings: added api descriptions
2023-03-02 18:19:48 +03:00
21d95de876
thirdparty: added api descriptions
2023-03-02 18:06:15 +03:00
2f488e75b5
smtp settings: added api descriptions
2023-03-02 13:58:42 +03:00
0d6afbc65d
security: added api descriptions
2023-03-02 13:38:38 +03:00
19971fc908
added the Payment category
2023-03-01 18:27:08 +03:00
e4f71a771b
portal: added api descriptions
2023-03-01 18:25:35 +03:00
Vashchuk Nikita
082c5f968c
fix mentions letter format, added roomsNotificationSettings check
2023-03-01 19:15:35 +05:00
c32964e466
payment: added api descriptions
2023-03-01 16:18:05 +03:00
308802eeb6
optional size in api method /people/${profileId}/photo/thumbnails.json
2023-03-01 14:46:26 +03:00
968899b7c2
modules: added api descriptions
2023-03-01 13:03:11 +03:00
4da39aeb95
feed: added api descriptions
2023-03-01 11:45:10 +03:00
420d9ffab0
security: added api descriptions
2023-02-28 17:34:38 +03:00
5ad213d018
capabilities: added api descriptions
2023-02-28 17:19:45 +03:00
245465dce8
authentication: added api descriptions
2023-02-28 16:35:06 +03:00
c932d935fa
Merge branch 'develop' into feature/colloborator
2023-02-28 13:48:08 +04:00
78a2e20edb
refactoring
2023-02-27 18:38:01 +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
