Commit Graph

15223 Commits

Author SHA1 Message Date
fde636c586 net 6: update packages 2021-11-25 16:41:24 +03:00
58d84912dd fix 2021-11-25 11:23:35 +03:00
038cf92a91 ApiSystemHelper: fix check 2021-11-25 11:00:17 +03:00
1d7d29039f Store updated 2021-11-25 10:29:27 +03:00
4273c519e0 Files: dispose custom ResponseStream 2021-11-25 10:02:52 +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
d94ea502df Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2021-11-21 16:47:25 +03:00
643c1ce6f1 fixed build.bat 2021-11-21 16:46:09 +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
366db9d885
Merge pull request #464 from ONLYOFFICE/hotfix/v1.0.1
Hotfix/v1.0.1
2021-11-21 12:36:32 +03:00
fb197315f9 fix buildAndDeploy.bat 2021-11-19 18:21:21 +03:00
Sergey Kirichenko
2d0bdb0646
Add an additional tag for docker images in push hook script (#462)
* Add tag for hook push sript

* Modify pash hook

* Modify pash hook

* Modify pash hook

* Modify pash hook

* Modify pash hook
2021-11-19 14:19:30 +03:00
9ad5e54c1d Files: optimization 2021-11-18 18:32:12 +03:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
62403e127a refactoring build script 2021-11-16 16:14:21 +03:00
f0cfeb1b42 refactoring build script 2021-11-16 16:13:13 +03:00
7db57b3696 Web: Components: SearchInput: Fixed default color for icon inside search input. Added color property at component. 2021-11-16 13:17:45 +03:00
d77a2f4541 Web: Components: ViewSelector: Added loading container for svg 2021-11-16 10:56:30 +03:00
d235288370 refactoring build script 2021-11-15 19:36:09 +03:00
d403fa1dcd Web: People: removed log 2021-11-15 18:37:29 +03:00
7ca1a18a37 Web: People: added translations for column position 2021-11-15 18:35:08 +03:00
adbb316dd2 Web: moved "Owner" translation to Common 2021-11-15 18:33:32 +03:00
13fdab9e1f Web: Files: fixed markAsRead action 2021-11-15 17:55:02 +03:00
afdda8eba0 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-15 17:44:27 +03:00
b72760c789 Web: People: fixed Paging tReady 2021-11-15 17:44:21 +03:00
39c3d57781 Web: Common: AuthStore: Added reset auth-store after login with app code 2021-11-15 14:29:02 +03:00
5ed03e0351 Web: People: Fix displaying error on Avatar save 2021-11-13 20:31:43 +03:00
f06283bb1a Fix displayName of current user after creation/update if user's display name with diacritics 2021-11-13 20:18:58 +03:00
d6836cc3d3
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
2021-11-13 20:04:11 +03:00
cd21a4013d Web: Restored missing translations 2021-11-13 19:15:50 +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
478ca3215b Web: Restored missing translations 2021-11-12 21:53:28 +03:00
9eb6c04a5a Web: Removed useless translation keys 2021-11-12 21:52:47 +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
d45f863f64 Web: Files: Fix showing success operation toast on empty trash 2021-11-12 20:45:31 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
7ed1143b36 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-12 19:20:30 +03:00
1b6c02352b Web: Fixed icons for docxf and oform file formats 2021-11-12 19:20:14 +03:00
Sergey Kirichenko
48cf953913 Add cache for locales *.json 2021-11-12 19:17:09 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
04b54a968f
Update README.md 2021-11-12 18:15:35 +03:00
ac929df060 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-12 17:22:27 +03:00
400612f9ff Web: Files: fixed checkUpdateNode 2021-11-12 17:22:17 +03:00
1e1df5b5c9 Web: Fixed icons for docxf and oform file formats 2021-11-12 17:17:28 +03:00
63aee3fd73
Merge pull request #456 from ONLYOFFICE/bugfix/fixed-tree-menu-class-list
Web: Files: moved the tree id from classname to dataset
2021-11-12 16:44:50 +03:00