Commit Graph

2425 Commits

Author SHA1 Message Date
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
50a7bd6856 analizators/s3265 2022-01-20 11:40:21 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
cacb889ee2 analizators/U2U1100 2022-01-13 15:04:28 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
b9ae9b7335 analizators/s2583 2021-12-30 15:12:44 +03:00
895e888ad3 analizators/s4144 2021-12-28 17:04:52 +03:00
653642e1b1
Merge branch 'develop' into feature/add-table-version 2021-11-26 18:23:49 +03:00
fb637b43f1 Web: added version for table 2021-11-25 17:38:09 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +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
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +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
b72760c789 Web: People: fixed Paging tReady 2021-11-15 17:44:21 +03:00
5ed03e0351 Web: People: Fix displaying error on Avatar save 2021-11-13 20:31:43 +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
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
3363cb4111 Web: added className to MainButton 2021-11-12 14:17:20 +03:00
9b6d9dac6f Web: People: added classNames for MainButton items 2021-11-12 14:13:47 +03:00
6b299a48e3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-10 21:25:08 +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
cab7603f5b Fixed Bug 53415: Fixed save avatar click 2021-11-10 18:33:21 +03:00
09520f60fb Web: People: fixed styles 2021-11-10 13:59:34 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
2bafe9c7c0 Web: People: Profile: Fixed serialized profile property 2021-11-02 18:13:39 +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
89391ab385
Merge branch 'develop' into bugfix/tooltip 2021-11-01 15:02:25 +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
6aa8281ea7 Web: People: add space in tooltip translate 2021-10-29 16:44:48 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +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
f715d15473 Merge branch 'develop' into feature/net6 2021-10-25 14:03:31 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
72d972d8fb Web: People: Changed styles to match layouts. 2021-10-22 14:19:57 +03:00
5bd9c06c1a Merge branch 'develop' into table-group-menu
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-10-22 12:20:20 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
f35ea7d172 Web: People: delete useless 2021-10-20 11:21:28 +03:00
f04a1a5403 Web: People: fixed table group menu, added new icons 2021-10-19 17:36:47 +03:00