Commit Graph

2647 Commits

Author SHA1 Message Date
Timofey
e5f06b932d Merge branch 'develop' into feature/dark-theme 2022-01-20 21:18:30 +08: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
6e2a990c58 Fixed Bug 54484 - People. Added redirect to people list after deleting user profile 2022-01-14 11:20:15 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
cacb889ee2 analizators/U2U1100 2022-01-13 15:04:28 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
ee71dbb2cd Web: updated icons of modules 2022-01-12 15:51:36 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
0246f10380 Web: People: fixed mobx warning 2022-01-11 12:35:53 +03:00
3565666fd2 Web: Table: fixed default columns size, fixed styles 2022-01-11 12:34:54 +03:00
3df4bc8c67 Web: People: added badges for people table 2022-01-10 17:28:22 +03:00
901d48b4f0 Web: People: fixed the user position cell 2022-01-10 15:56:38 +03:00
efffe7feb3 Fixed Bug 54482 - People. User profile is not removed from the context menu 2022-01-10 10:55:29 +03:00
b9ae9b7335 analizators/s2583 2021-12-30 15:12:44 +03:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
895e888ad3 analizators/s4144 2021-12-28 17:04:52 +03:00
4c5ba66857 Web: People: fixed table cell styles 2021-12-28 16:47:57 +03:00
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
190e3eed1e Web:People:Section: add fill for send clock icon in dark-theme 2021-12-28 16:43:22 +08:00
148acc38c9 Web:People:Dialogs: add support dark-theme 2021-12-28 15:35:41 +08:00
76595827fa Web:People:HOCs: add support dark-theme 2021-12-28 15:20:56 +08:00
3259cf4db4 Web:People:PeopleSelector: add support dark-theme 2021-12-28 15:13:37 +08:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
c899f4db3a Web: People: Fix selectedLanguage == undefined 2021-12-23 13:10:35 +03:00
919092e6c6 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
3c26c6cdfd edit az, vi, uk 2021-12-23 11:24:00 +03:00
cd56b02c8e Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 19:10:45 +03:00
e28744d69a Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
48aa091786 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:12:12 +03:00
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
36c692f9da Web:People:ProfileAction: add support dark-theme 2021-12-15 17:28:02 +08:00
bc62c12e9e Web:People:Profile: add support dark-theme 2021-12-15 17:27:45 +08:00
7b21c03357 Web:People:GroupAction: add support dark-theme 2021-12-14 18:52:28 +08:00
07942f600c Web:People:Section: add support dark-theme 2021-12-14 18:52:14 +08:00
49f3955e07 edit translations 2021-12-14 13:17:23 +03:00
b7e80bc96e Web:People:ArticleBody: add support dark-theme 2021-12-14 16:04:06 +08:00
4eee5b49a2 add lo 2021-12-13 14:55:33 +03:00
65a7ae3df4 add translations el 2021-12-13 12:26:37 +03:00
fce12af277 add translations 2021-12-10 13:34:21 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
02a57ac53e Web: People: Added dropDownMaxHeight 2021-12-09 19:48:03 +03:00
afe25e3bc4 Fix issues of WrongTranslationVariablesTest 2021-12-09 19:47:18 +03:00
372ba52d94 add translations 2021-12-09 14:07:51 +03:00
489ecb1b26 add translations 2021-12-08 15:18:22 +03:00
ddbaee09e4 add translations 2021-12-08 12:23:52 +03:00
e2899e57e4 add translations 2021-12-07 17:17:56 +03:00
dba7e2afd6 edit lo 2021-12-07 16:59:36 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
b6a963c712 add ko 2021-12-07 16:24:37 +03:00
06a478a499 add translations 2021-12-07 16:07:55 +03:00
c95aa3e29a add sl 2021-12-07 15:29:28 +03:00
c44f580681 Fix issues of UselessModuleTranslationKeysTest 2021-12-07 13:04:06 +03:00
f9cf10afc5 edit files 2021-12-07 12:35:01 +03:00
2074c2f94d edit ja 2021-12-07 11:49:18 +03:00
78e36309e0 edit ja 2021-12-07 11:23:03 +03:00
83874a0eb8 edit cs 2021-12-07 11:19:20 +03:00
ac4e23553e add it 2021-12-07 11:08:55 +03:00
3b11d8fa30 edit translations 2021-12-06 13:05:00 +03:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
c010fa4e69 update lo 2021-12-02 15:54:57 +03:00
bc322380b6 update lo 2021-12-02 13:19:51 +03:00
c59c6edd66 add az 2021-12-02 12:55:41 +03:00
a012038f3b Merge branch 'develop' into feature/catalog 2021-12-02 14:59:31 +08:00
7f5bf2f65c add tr 2021-12-01 14:26:28 +03:00
5320d4cdf1 add pt-PT 2021-12-01 14:21:54 +03:00
9298919311 edit pt-PT 2021-12-01 14:20:48 +03:00
554235abcc add vi 2021-12-01 14:18:08 +03:00
b2a646177c add sl 2021-12-01 13:57:12 +03:00
9143e6af43 add sk 2021-12-01 13:44:20 +03:00
b517eac78c edit Translation 2021-12-01 13:35:20 +03:00
920cad4f70 add pt 2021-12-01 13:30:16 +03:00
bc232e937e add pl 2021-12-01 12:43:45 +03:00
160479aa27 add nl 2021-12-01 12:35:25 +03:00
f6efa27440 add lv 2021-12-01 12:24:03 +03:00
2c51644c9c add ko 2021-12-01 12:07:49 +03:00
22d5a4ef01 add fi 2021-12-01 12:05:52 +03:00
71a5a3cb1a add cs 2021-12-01 12:01:30 +03:00
002af23d9b add ja 2021-12-01 11:26:35 +03:00
685fb5f196 edit fr 2021-12-01 11:16:28 +03:00
4c3845934f edit it 2021-12-01 10:55:33 +03:00
6ca4abf360 edit de 2021-12-01 10:51:35 +03:00
02e5ef9bdc edit ro 2021-11-30 17:23:28 +03:00
db1d482fbc edit ru 2021-11-30 16:22:24 +03:00
3eb2ee20a8 add bg 2021-11-30 16:16:44 +03:00
40d6fcbf3b add uk 2021-11-30 16:15:55 +03:00
a9dc2a08da add zh-CN 2021-11-30 16:14:32 +03:00
7e2b2463ef add es 2021-11-30 12:36:57 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +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
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
73d3b00c07 Web: added missing classNames for autotests 2021-11-25 12:11:22 +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
4b5af5912c Web: People: fixed row-checkbox styles 2021-11-23 12:30:55 +03:00
89e7b494c4 Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language 2021-11-23 12:24:24 +03:00
470fd7ffcb Web: People: MainButton: Added missing actions 2021-11-22 11:21:58 +03:00
1004ed5dfb Fixed Bug 53415. Fixed save button 2021-11-22 11:20:01 +03:00
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:40:24 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +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
56ecbc95ea Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:18:13 +03:00
4b095ecdd6 Web: People: MainButton: Reworked data model for button items 2021-11-19 18:01:47 +03:00
50fb593b39 Web: People: Changed Email Dialog according to layouts. 2021-11-19 16:09:41 +03:00
9608cabeb0 Web: People: Forced download of translations. 2021-11-19 16:08:17 +03:00
7a2e48d066 Web: People: fix translations 2021-11-18 19:10:51 +03:00
ac09d3691d Web: People: fix translations 2021-11-18 19:03:24 +03:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
e0f297bf0a Web: People: add translations 2021-11-16 18:24:02 +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
17e3e5cb98 bump version to 1.1.1 2021-11-12 15:21:25 +03:00
3809273075 bump version to 1.1.0 2021-11-12 15:19:40 +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
d37aa52f09 Merge branch 'develop' into feature/catalog 2021-11-02 21:04:46 +08: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