|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +03:00 |
|
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03:00 |
|
|
|
88a2934409
|
Web: Components: fix display table after merge
|
2022-02-22 11:34:13 +03:00 |
|
|
|
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 |
|
|
|
356e00ceed
|
Web: Components: Calendar: fixed disabled months
|
2022-02-18 11:30:47 +03:00 |
|
|
|
ebd51f3f6b
|
Web: Components: DropDown: Disable linter warnings
|
2022-02-17 14:38:07 +03:00 |
|
|
|
c8790b2cc6
|
Web: Components: ComboBox: Added manualWidth property for DropDown component
|
2022-02-17 14:37:32 +03:00 |
|
|
|
cdf18cbcf7
|
Web: Components: corrected the display of calendar months
|
2022-02-17 11:44:13 +03:00 |
|
|
|
d634d82050
|
Web: Components: Added enableToggle for <ToggleContent />
|
2022-02-16 21:30:52 +03:00 |
|
|
|
15830a9fe0
|
Fix bug 53339: open banner link in new tab
|
2022-02-16 18:03:21 +03:00 |
|
|
|
80f97ef50d
|
Web: Components: ContextMenu: Added left padding for arrow icon
|
2022-02-16 15:22:46 +03:00 |
|
|
|
e6731ec23d
|
Web: Components: TableHeader: Added property for hiding sort icon and disable sort actions
|
2022-02-16 13:57:59 +03:00 |
|
|
|
264b3a8764
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 14:10:44 +03:00 |
|
|
|
ce048a9646
|
Web: Components: fix avatar resize
|
2022-02-15 14:10:28 +03:00 |
|
|
|
2f5feb4041
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 14:03:41 +03:00 |
|
|
|
c710545bdd
|
Fixed Bug 55331 - Added default cursor for modal dialog.
|
2022-02-15 14:02:52 +03:00 |
|
|
|
b9f6ec6615
|
Web: Components: fix banner loader
|
2022-02-15 11:58:12 +03:00 |
|
|
|
01f8f95556
|
Fixed Bug 55058 - Client.Profile. Fixed broken images in "Sample title" when zooming in on a profile picture in the "Edit Photo" window.
|
2022-02-14 15:54:38 +03:00 |
|
|
|
78fb372dcd
|
Web: e2e-tests: Fix create user test
|
2022-02-08 18:05:45 +03:00 |
|
Yaroslavna Gaivoronyuk
|
e068a183d1
|
update README.md
|
2022-01-27 17:29:39 +03:00 |
|
Yaroslavna Gaivoronyuk
|
73c6bcb4f8
|
upd
|
2022-01-27 16:45:02 +03:00 |
|
Yaroslavna Gaivoronyuk
|
bb6c826b74
|
Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect
|
2022-01-27 15:59:32 +03:00 |
|
Yaroslavna Gaivoronyuk
|
ee375307fb
|
change props, upd story
|
2022-01-27 15:58:56 +03:00 |
|
|
|
45313ba07f
|
Web: Files: Fixed the length of the row separators according to the layout.
|
2022-01-27 13:54:33 +03:00 |
|
|
|
133bd65938
|
Web: Files: Removed state of begin scrolling.
|
2022-01-27 12:18:59 +03:00 |
|
|
|
4355430ccd
|
Merge branch 'develop' into feature/accessRightSelect
|
2022-01-27 12:09:53 +03:00 |
|
|
|
a9bbbbabdc
|
Fixed Bug53161 - Client.Files.Fixed table view header length.
|
2022-01-27 10:35:36 +03:00 |
|
Yaroslavna Gaivoronyuk
|
6a7515eec6
|
upd access-right-select
|
2022-01-25 11:17:38 +03:00 |
|
Dmitry Kulak
|
1e7981be55
|
Web: Components: Badge: Added isHovered and noHover props
|
2022-01-24 14:48:38 +03:00 |
|
|
|
7f707428f2
|
Web: Files: Added auto-focus when entering a password with an error.
|
2022-01-24 12:09:26 +03:00 |
|
Yaroslavna Gaivoronyuk
|
1057cfa6a0
|
access-right-select, upd link-with-dropdown
|
2022-01-24 11:16:45 +03:00 |
|
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
|
|
525439ff72
|
Web: Renamed translations key switchToThumbnails to SwitchToThumbnails
|
2022-01-20 18:21:01 +03:00 |
|
|
|
99105f5d73
|
Merge branch 'develop' into component-tooltips
# Conflicts:
# packages/asc-web-components/icon-button/index.js
# products/ASC.Files/Client/public/locales/de/Article.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Article.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/fr/Article.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/Article.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/pt-BR/Article.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Article.json
# products/ASC.Files/Client/public/locales/ro/Translations.json
# products/ASC.Files/Client/public/locales/ru/Article.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/sk/Article.json
# products/ASC.Files/Client/public/locales/sk/Translations.json
|
2022-01-20 15:45:24 +03:00 |
|
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03:00 |
|
|
|
d8adf99040
|
Web: Components: ViewSelector: Added default values of width and height for svg container
|
2022-01-20 12:42:32 +03:00 |
|
|
|
3565666fd2
|
Web: Table: fixed default columns size, fixed styles
|
2022-01-11 12:34:54 +03:00 |
|
|
|
3793c5ae43
|
Web:Components:Tree-Menu:Added props lineHeight for the badge in index.js for the tree-menu component.
|
2022-01-10 16:30:23 +03:00 |
|
|
|
b1c7ef68e7
|
Web:Components:Row:Changed the render to ContentElement.
|
2021-12-30 18:54:41 +03:00 |
|
|
|
1645386669
|
Fix after merge
|
2021-12-29 18:30:05 +03:00 |
|
|
|
df6a18db6a
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-29 14:11:44 +03: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 |
|
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +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 |
|
|
|
50cb570eff
|
Web:Components:Fix the style of the table header.
|
2021-12-24 15:17:33 +03:00 |
|
|
|
d7faf84a44
|
Web:Files:Badges:Changed the default lineHeight for the Badge component.
|
2021-12-24 12:02:15 +03:00 |
|
|
|
dc3c7b5e30
|
Fix Bug 54679 - Client.Profile. Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported
|
2021-12-23 16:48:54 +03:00 |
|
|
|
ef853d5d2f
|
Web:Files:Removed the Icons and SimpleRowContent components.
|
2021-12-22 18:50:25 +03:00 |
|
|
|
6163f8427b
|
Web:Files:Badges: Added new props lineHeight, textAlign to Badge styles. Added new conditions for resizing badges to the Badges and QuickButtons components. Added new props sectionWidth to HOCs withBadges and withQuickButtons. Styling badges.
|
2021-12-20 15:14:32 +03:00 |
|
