Commit Graph

542 Commits

Author SHA1 Message Date
4439425625 fix Bug 63942 2023-09-01 16:00:56 +03:00
6fce6a8a3c fix bug 63843 2023-08-28 16:43:16 +03:00
621bcb6bca Api: hidden methods 2023-08-18 14:33:48 +03:00
f2916f2121 bug 63601 2023-08-14 21:03:39 +03:00
c2e284f110 fix Bug 63538 2023-08-04 17:30:58 +03:00
c889ebed66 added api docs 1.1.1
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UrlShortenerFakeDbContext.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
2023-08-04 13:59:06 +03:00
df20e9e624 api: fix documentation 2023-08-01 11:53:00 +03:00
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2023-08-01 11:39:57 +03:00
9b32618dd2 added translations 2023-07-14 16:01:54 +03:00
057bccb801 added translations 2023-07-13 18:20:52 +03:00
dc59259fd0 Revert "added translations"
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.

# Conflicts:
#	build/install/OneClickInstall/install-Docker.sh
#	build/install/win/DocSpace.aip
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/ja-JP/Settings.json
#	packages/client/public/locales/lv/Settings.json
#	packages/client/public/locales/uk-UA/Settings.json
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
2023-07-13 13:02:08 +03:00
812010a8af added translations 2023-07-11 18:22:23 +03:00
f8406c9ba0 bug 63258 2023-07-04 17:07:08 +03:00
4305f16845 Build: Renamed profiles 2023-07-03 12:49:16 +04:00
9b36fe282b Server: Added publish profiles for "ASC.People", "ASC.Web.Studio" 2023-07-02 14:54:56 +03:00
c505c8dc2b added translations 2023-06-28 13:35:40 +03:00
3ba27cd577 added translations 2023-06-27 16:42:20 +03:00
986361b4a0 People: new filter AccountLoginType 2023-05-17 11:20:27 +03:00
4f10368a78 added translations 2023-05-11 19:12:10 +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
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
fa0456980c
Merge pull request #1404 from ONLYOFFICE/bugfix/62247
fix bug 62247
2023-05-04 18:34:56 +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
5f436ca28e fix bug 62247 2023-05-04 12:55:56 +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
NikitaVashchuk
30f001a4c0 fix periodic and welcome notifications 2023-04-26 20:47:06 +05: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
21212db8f9 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 2023-04-26 10:49:02 +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
edae98c73d fix Bug 62216 2023-04-21 12:27:41 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +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
18b5f9f697 fix documentation 2023-04-18 19:27:48 +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
f56b589749 some more fixes 2023-04-14 18:19:43 +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
a7de97e4ce fixed: user photo manager 2023-04-12 23:15:39 +03:00
abad7a0e15 user photo upload: fixed 2023-04-12 23:07:22 +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