Commit Graph

7661 Commits

Author SHA1 Message Date
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00
0771a54c47 Optimization 2021-12-09 20:23:06 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
58d84912dd fix 2021-11-25 11:23:35 +03:00
038cf92a91 ApiSystemHelper: fix check 2021-11-25 11:00:17 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
2c6e0d45bc Web: Fix wrong braces of variables inside translation files 2021-11-13 19:07:48 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
5ff07a8293 Web: Fix UselessTranslationKeysTest translation issues 2021-11-12 20:46:04 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
fc42416fea fix config 2021-11-12 10:57:12 +03:00
2ea63910a2 Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string ids 2021-11-11 15:37:23 +03:00
11769e8c9e Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language. 2021-11-10 19:59:03 +03:00
e917b4bb56 Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json 2021-11-10 15:52:36 +03:00
cd897aa8f1 Web: About: Fix DublicatesByContentTest translation issue 2021-11-08 15:33:27 +03:00
baccb134a6
Web: Refactoring asyn/promise calls 2021-11-03 18:35:15 +03:00
3ebff769b1 Web: Login: Fixed login function for desktop client 2021-11-03 12:19:28 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
dd89318a40 Web: People: Profile: Fixed serialized profile property 2021-11-02 18:12:15 +03:00
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
4e018d2d71 Web: Bump version to 1.0.1 2021-11-02 14:02:46 +03:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
3c25ee55b3 Auth: temp fix for plugin 2021-10-28 20:14:20 +03:00
Artem Tarasov
8c6a3f9fcd Web: Editor/Login: changed the way to save the link from sessionStorage to localStorage 2021-10-28 13:32:23 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
c0ea857dbf
Merge pull request #435 from ONLYOFFICE/bugfix/Bug-53050
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after l…
2021-10-27 18:54:08 +03:00
Artem Tarasov
82e136b0e0 Web: Login: fixed remove key from session storage 2021-10-27 18:09:46 +03:00
f5d5e92fb8 Web: Client: Added redirect to default page for personal 2021-10-27 17:13:03 +03:00
Artem Tarasov
e42b09d025 Web: Editor/Login: fixed bug 53050: fixed redirect to editors after login when following a direct link to editors 2021-10-27 16:48:09 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
09897ffc2b net6: warning SYSLIB0014 2021-10-25 14:03:14 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
7d511385bc removed unused references 2021-10-19 19:08:47 +03:00
5a5e299d98 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2021-10-19 18:30:59 +03:00
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
b6461e46f4 net6: replacing System.Drawing with ImageSharp 2021-10-18 14:24:05 +03:00
7c9980b475 Web: Removed index from remoteEntry url (disk cache issue) 2021-10-15 12:49:15 +03:00
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
6947adcfc8 Personal: fix quota 2021-10-14 13:47:12 +03:00