|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# 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
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
ee71dbb2cd
|
Web: updated icons of modules
|
2022-01-12 15:51:36 +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 |
|
|
ff7b6fc432
|
Web: init e2e tests
|
2021-12-21 15:59:11 +08:00 |
|
|
49f3955e07
|
edit translations
|
2021-12-14 13:17:23 +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 |
|
|
372ba52d94
|
add translations
|
2021-12-09 14:07:51 +03:00 |
|
|
489ecb1b26
|
add translations
|
2021-12-08 15:18:22 +03:00 |
|
|
300a45a172
|
add translations
|
2021-12-08 12:23:12 +03:00 |
|
|
b6a963c712
|
add ko
|
2021-12-07 16:24:37 +03:00 |
|
|
06a478a499
|
add translations
|
2021-12-07 16:07:55 +03:00 |
|
|
dcdd1a5dc8
|
add sl
|
2021-12-07 15:27:11 +03:00 |
|
|
40692b3052
|
add zh_CN
|
2021-12-07 11:06:36 +03:00 |
|
|
1b0b978c97
|
add ja
|
2021-12-07 11:04:28 +03:00 |
|
|
d8d36608ee
|
update translation (ro)
|
2021-11-30 12:04:10 +03:00 |
|
|
b2c123d6f4
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-11-30 11:46:22 +03:00 |
|
|
d3071bcfb0
|
update translations
|
2021-11-29 12:53:44 +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 |
|
|
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 |
|
|
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 |
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
|
31570e57d7
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-07 17:47:54 +03:00 |
|
|
335c580d78
|
Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue)
|
2021-10-07 17:32:32 +03:00 |
|
|
55cb1e875e
|
Web: fixed header height
|
2021-10-06 12:22:28 +03:00 |
|
|
6e926eceb9
|
Web: Removed browserslist (loading bundle issues)
|
2021-10-05 09:48:08 +03:00 |
|
|
6591080403
|
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
|
2021-09-27 16:04:37 +03:00 |
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
fe6014a440
|
Web: Update webpack to v5.52.1
|
2021-09-13 15:08:48 +03:00 |
|
|
f06e3c076b
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
|
2021-09-13 12:54:59 +03:00 |
|
|
c7ad040293
|
Web: Sorted all "package.json" files by vscode-sort-package-json
|
2021-09-13 12:36:07 +03:00 |
|
|
38242e83c1
|
Web: Moved other common dependencies to sharedDependencies.js
|
2021-09-13 12:29:44 +03:00 |
|
|
a47c73b5ce
|
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
|
2021-09-10 16:50:23 +03:00 |
|
|
956c9b3467
|
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
|
2021-09-10 15:57:14 +03:00 |
|
|
d2f3c93c14
|
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
|
2021-09-10 15:15:51 +03:00 |
|
|
46161eef95
|
Web: Moved axios to sharedDependencies.js
|
2021-09-10 14:49:20 +03:00 |
|
|
f0c7a09a6c
|
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
|
2021-09-10 14:20:19 +03:00 |
|
|
f7c46a70fa
|
Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
|
2021-09-10 11:30:27 +03:00 |
|
|
15dab2adaa
|
Web: Updated copy-webpack-plugin package
|
2021-09-09 13:17:27 +03:00 |
|
|
5b880d5b6a
|
Web: Updated clean-webpack-plugin package
|
2021-09-09 12:58:49 +03:00 |
|
|
d4bd4dcb50
|
Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1
|
2021-09-09 11:28:52 +03:00 |
|
|
18718aab93
|
Web: Updated babel packages
|
2021-09-08 17:40:31 +03:00 |
|
|
bfb85fd05f
|
Web: Removed duplicated dependency declaration (attr-accept)
|
2021-09-08 17:17:57 +03:00 |
|