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 |
|
|
4355430ccd
|
Merge branch 'develop' into feature/accessRightSelect
|
2022-01-27 12:09:53 +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 |
|
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 |
|
|
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 |
|
|
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 |
|
|
51103c96ba
|
Fix Bug 54525 - Client.Profile: Remove fake context-menu button
|
2021-12-15 11:56:44 +03:00 |
|
|
87fe0892a4
|
Web:Files:Badges:Returned the frame on hover badge version.
|
2021-12-08 18:56:15 +03:00 |
|
|
ac5edf13cb
|
Web:Files:Badges:Edited badges styles.
|
2021-12-08 15:43:12 +03:00 |
|
|
8360da9806
|
Web:Components:Added rest to IconButton
|
2021-12-07 15:27:42 +03:00 |
|
|
2de54722d6
|
Web: Files: added TitleShowActions and TitleShowFolderActions translations, added row and tile context menu titles
|
2021-12-01 17:17:12 +05:00 |
|
|
2b7bc7fc1c
|
Web: Files: added ButtonShareAccess translation, added share and row checkbox tooltip
|
2021-11-30 15:11:59 +05:00 |
|
|
4c977206c9
|
Web: Files: added switchToThumbnails and SwitchViewToCompact translation, added view selector tooltip
|
2021-11-30 14:28:01 +05:00 |
|
|
6db5c386e3
|
Web: Files: added group menu title
|
2021-11-29 18:40:00 +05:00 |
|
|
def7e82cc2
|
Web: Files: added TitleSelectFile translation, added group combo box title
|
2021-11-29 17:56:37 +05:00 |
|
|
c9b58cacd8
|
Web: Files: added MainHeaderSelectAll translation, added group menu checkbox title
|
2021-11-29 16:57:14 +05:00 |
|
|
4dac8e9ce6
|
Web: Components: changed expander-down.react.svg, fixed styles
|
2021-11-29 13:11:01 +03:00 |
|
|
99c71148d8
|
Web: Files: fixed SharingPanel styles
|
2021-11-29 12:58:21 +03:00 |
|
|
4586cb45d9
|
Web: Components: fixed CloseButton styles
|
2021-11-29 11:58:54 +03:00 |
|
|
af95e8aacc
|
Web: Components: added border-radius to modal-dialog
|
2021-11-26 17:37:27 +03:00 |
|
|
a046e5ac8d
|
Web: Files: added icon button title prop, added connect tooltip
|
2021-11-25 18:47:09 +05:00 |
|
|
2f21f2246a
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-22 16:39:22 +03:00 |
|
|
16b564a86c
|
Web: Components: fixed empty-screen styles
|
2021-11-22 15:37:30 +03:00 |
|
|
3417cb28f4
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:25:49 +03:00 |
|
|
b632f3a623
|
Web: Fixed styles according layouts, renaming.
|
2021-11-22 10:15: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 |
|
|
96759f10f1
|
Web: Components: Fixed tests warnings
|
2021-11-20 00:40:25 +03:00 |
|
|
c10944f8fa
|
Web: Components: ContextMenu: Refactoring
|
2021-11-20 00:17:25 +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 |
|
|
50db047ca8
|
Web: Components: MainButton: Reworked MainButton component
|
2021-11-19 17:59:58 +03:00 |
|
|
8ecdc5bdf5
|
Web: Components: ContextMenu: Added property`s for creating menu by component
|
2021-11-19 17:59:10 +03:00 |
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
4f7f76b07e
|
Web: Files: Fixed styles of modal and aside dialogues.
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
|
2021-11-19 16:09:13 +03:00 |
|