TatianaLopaeva
|
51798123e6
|
Web: Components: textarea: Added theme into styles, added commonStyles, moved styles to a separate file.
|
2021-02-03 18:03:27 +03:00 |
|
TatianaLopaeva
|
ac018d14e5
|
Web: Components: link: Added theme into styles, added commonStyles, moved styles to a separate file.
|
2021-02-03 17:40:45 +03:00 |
|
TatianaLopaeva
|
66cf9c21f3
|
Web: Components: button: Added theme into styles, added commonStyles, moved styles to a separate file.
|
2021-02-03 16:47:01 +03:00 |
|
TatianaLopaeva
|
fc9224ef62
|
Web: Components: input-block: Added theme into styles, added styles into the globalColors file.
|
2021-02-03 15:07:31 +03:00 |
|
TatianaLopaeva
|
949343f5ce
|
Web: Components: password-input: Refactoring and connect the theme.
|
2021-02-03 14:51:10 +03:00 |
|
TatianaLopaeva
|
53884de5ce
|
Web: text-input: Splitting one file into several, adding a theme to styles, changing the globalColors file accordingly.
|
2021-02-03 14:43:38 +03:00 |
|
TatianaLopaeva
|
f07906ccb6
|
Web: Added Theme Provider.
|
2021-02-03 11:48:47 +03:00 |
|
TatianaLopaeva
|
1f0b4f63aa
|
Web: Added base and dark theme, globalColors.
|
2021-02-03 11:47:57 +03:00 |
|
|
|
652c7bd906
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/Layout/MobileLayout.js
# packages/asc-web-common/src/components/Layout/ScrollToTop.js
# packages/asc-web-common/src/components/Layout/context.js
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/NavMenu/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
# packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
# packages/asc-web-components/src/components/icons/svg/load.error.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
|
2021-01-29 16:39:00 +03:00 |
|
|
|
aa2c7f4588
|
Web: Components: Fixed Icons export
|
2021-01-27 10:30:21 +03:00 |
|
|
|
789b547ccf
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
|
2021-01-22 11:24:16 +03:00 |
|
|
|
889949eb95
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
|
2021-01-11 12:21:59 +03:00 |
|
|
|
c9293ac86d
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
|
2020-12-15 18:40:27 +03:00 |
|
|
|
5a41078c35
|
Build: Fixed error Command "start" not found.
|
2020-12-01 15:49:21 +03:00 |
|
|
|
b3b3b54851
|
Build: Fixed build
|
2020-12-01 14:49:17 +03:00 |
|
|
|
d78912fd32
|
Web: Client: Added NavMenu
|
2020-12-01 11:05:39 +03:00 |
|
|
|
172d93040b
|
Web: Client: init frame work
|
2020-11-30 11:35:50 +03:00 |
|
|
|
9b10672daf
|
Web: Client: init re-write to webpack 5
|
2020-11-27 20:40:38 +03:00 |
|
|
|
4482b3e265
|
web: components: fixed start login app
|
2020-11-24 13:47:02 +03:00 |
|
|
|
140459460c
|
Front-end: Added package.json into packages/
|
2020-11-24 13:19:33 +03:00 |
|
|
|
b2832468c4
|
Frontend: client's code re-organization
|
2020-11-24 13:18:23 +03:00 |
|
