|
|
8ba2f0c694
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2021-10-25 11:02:42 +03:00 |
|
|
|
5005e0a6c0
|
Web: Icons: Fixed old checkbox icons, change header plus icon
|
2021-10-14 13:09:54 +03:00 |
|
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
|
1648777ffa
|
Web: Components: Table: fixed columns resize
|
2021-07-30 10:02:30 +03:00 |
|
|
|
bd2a5070a2
|
Web: Components: fixed checkbox onChange event
|
2021-07-29 18:13:57 +03:00 |
|
|
|
5ed5adbb9b
|
Web: Components: Table: added settings, fixed table group menu header
|
2021-07-19 14:09:09 +03:00 |
|
|
|
f9feb35afc
|
Merge branch 'develop' into feature/backup
|
2021-05-30 20:57:01 +03:00 |
|
|
|
14719ed698
|
Web: Components: fixed checkbox icons style
|
2021-04-27 14:31:05 +03:00 |
|
TatianaLopaeva
|
1f8039f1b7
|
Web: Added storages to the Manual page.
|
2021-04-22 19:26:35 +03:00 |
|
|
|
5936640ce2
|
Web: fixed selection
|
2021-04-13 12:43:17 +03:00 |
|
Artem Tarasov
|
c8d614a3ba
|
Web: Components: refactoring stories, add public/images to components for storybook
|
2021-03-07 14:57:26 +03:00 |
|
Artem Tarasov
|
96da41faa1
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# package.json
# packages/asc-web-components/package.json
# yarn.lock
|
2021-03-03 12:00:23 +03:00 |
|
Artem Tarasov
|
2f09bab8e5
|
Web: Components: added story of Combobox
|
2021-03-03 10:56:54 +03:00 |
|
TatianaLopaeva
|
ccc45a8d74
|
Web: Components: checkbox: Fix displaying indeterminate color.
|
2021-03-02 20:15:27 +03:00 |
|
Artem Tarasov
|
9ae9d7132e
|
Web: Components: added story of Checkbox, fix passing props
|
2021-03-02 17:20:16 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|
