Vladislav Makhov
|
7709a2c59f
|
web: components: return color declaration
|
2021-03-01 12:00:53 +03:00 |
|
Vladislav Makhov
|
c38fd63c75
|
web: components: fix import
|
2021-03-01 12:00:34 +03:00 |
|
Vladislav Makhov
|
db85598b4f
|
web: components: fix svg import
|
2021-03-01 11:59:45 +03:00 |
|
TatianaLopaeva
|
ee23adac7c
|
Web: Components: Deleted useless code.
|
2021-02-28 21:36:51 +03:00 |
|
Vladislav Makhov
|
7bf2a8e9b5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-26 18:33:28 +03:00 |
|
|
|
f357c8b78c
|
Web: fixed icons for files module
|
2021-02-26 16:29:50 +03:00 |
|
Vladislav Makhov
|
fc67abd6b5
|
web: components : return colors declaration
|
2021-02-26 15:53:59 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
TatianaLopaeva
|
60ea0b189a
|
Web: Components: icon-button: Deleted default color.
|
2021-02-25 17:58:23 +03:00 |
|
|
|
8b962cd88d
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 17:20:19 +03:00 |
|
|
|
b4fa1b2bb1
|
Web: Files: fixed icons imports, fixed components imports, fixed files module
|
2021-02-25 17:20:06 +03:00 |
|
Vladislav Makhov
|
ea3c558a33
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 15:17:15 +03:00 |
|
Vladislav Makhov
|
e91bb64d03
|
web: people: fix imports
|
2021-02-25 15:16:52 +03:00 |
|
TatianaLopaeva
|
89cefb6bd1
|
Web: Components: Fix styles for role icons.
|
2021-02-25 13:52:31 +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 |
|
|
|
507fadff55
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
|
2021-02-24 10:57:03 +03:00 |
|
|
|
34d9eed580
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/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/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/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.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/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.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/activateUser.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/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.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
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
|
2021-02-24 10:30:42 +03:00 |
|
TatianaLopaeva
|
782e069ffb
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-23 22:44:44 +03:00 |
|
TatianaLopaeva
|
2b6a0eb9a5
|
Web: Components: Deleted useless imports.
|
2021-02-23 22:43:25 +03:00 |
|
TatianaLopaeva
|
2ee7f60d4c
|
Web/Files: Refactoring.
|
2021-02-23 22:19:51 +03:00 |
|
TatianaLopaeva
|
3e3b079b5a
|
Web: Components: Deleted useless Icons component.
|
2021-02-23 22:14:42 +03:00 |
|
TatianaLopaeva
|
0a75c9240f
|
Web: Components: Refactoring.
|
2021-02-20 18:38:18 +03:00 |
|
TatianaLopaeva
|
5949865a45
|
Web: Components: Fix problem with click om icon, added size style.
|
2021-02-20 18:37:32 +03:00 |
|
TatianaLopaeva
|
1f8fd0a9db
|
Web: Added styles for icons. Added common icons styles.
|
2021-02-20 17:54:12 +03:00 |
|
TatianaLopaeva
|
5d26bd5670
|
Web: Downgrade rc-tree package.
|
2021-02-20 13:19:01 +03:00 |
|
TatianaLopaeva
|
7023cf5f3a
|
Web: Transferring icons from a shared folder to modules. Icons are displayed by url.
|
2021-02-20 11:46:32 +03:00 |
|
TatianaLopaeva
|
b9d0183bfc
|
Web: Components: Checkbox: Modified icons for support color.
|
2021-02-20 10:58:09 +03:00 |
|
TatianaLopaeva
|
80d457234e
|
Web: Components: Added theme support, added color support, moved styles iat another file.
|
2021-02-20 10:51:16 +03:00 |
|
Artem Tarasov
|
c5cac001c8
|
Web: LoginMobile: added validation of pass for registration-form
|
2021-02-20 02:56:59 +03:00 |
|
TatianaLopaeva
|
22d7bd6bd3
|
Web: Components: text: Fix text color for base/dark themes.
|
2021-02-15 19:15:27 +03:00 |
|
TatianaLopaeva
|
ea7e970182
|
Web: Components: utils: Added globalStyles file.
|
2021-02-15 19:08:51 +03:00 |
|
TatianaLopaeva
|
f00dc563ff
|
Web: Components: themes: Refactoring base theme.
|
2021-02-15 19:08:10 +03:00 |
|
TatianaLopaeva
|
175c42d8b8
|
Web: Components: Added styles for dark theme.
|
2021-02-15 19:07:28 +03:00 |
|
TatianaLopaeva
|
21e73c6db2
|
Web: Components: tree-menu: Added theme provider, update globalColors file.
|
2021-02-15 15:22:21 +03:00 |
|
TatianaLopaeva
|
64bd5aa964
|
Web: Components: theme-provider: Rename folder and files.
|
2021-02-15 12:33:07 +03:00 |
|
TatianaLopaeva
|
b3c2e21c93
|
Web: Components: password-input: Added theme support and moved styles to separate file.
|
2021-02-15 12:10:20 +03:00 |
|
TatianaLopaeva
|
978709d814
|
Web: Components: field-container: Added theme support and moved styles to separate file.
|
2021-02-15 10:23:36 +03:00 |
|
TatianaLopaeva
|
d5b3a37b3d
|
Web: Components: row-content: Added theme support and moved styles to separate file.
|
2021-02-15 09:46:40 +03:00 |
|
TatianaLopaeva
|
80cdc0dee6
|
Web: Components: file-input: Added theme support and moved styles to separate file.
|
2021-02-12 14:28:10 +03:00 |
|
TatianaLopaeva
|
a815dbb194
|
Web: Components: calendar: Added theme support, moved styles to separate file, deleted weekday file.
|
2021-02-12 13:34:27 +03:00 |
|
TatianaLopaeva
|
2ad00eff45
|
Web: Components: avatar-editor: Added theme support, moved styles to separate file.
|
2021-02-12 11:22:43 +03:00 |
|
TatianaLopaeva
|
ab251cb249
|
Web: Components: loader: Added theme support and moved styles to another file.
|
2021-02-12 10:06:52 +03:00 |
|
TatianaLopaeva
|
2d565f6591
|
Web: Components: group-buttons-menu: Added theme support, moved styles to a separate file.
|
2021-02-10 19:33:03 +03:00 |
|
TatianaLopaeva
|
d958a39e17
|
Web: Components: group-button: Added theme support, moved styles to a separate file.
|
2021-02-10 19:14:47 +03:00 |
|
TatianaLopaeva
|
d02485121f
|
Web: Components: toast: Added theme support, moved styles to a separate file.
|
2021-02-10 18:05:02 +03:00 |
|
TatianaLopaeva
|
f8e082d8cf
|
Web: Components: empty-screen-container: Moved styles to a separate file.
|
2021-02-10 14:36:35 +03:00 |
|
TatianaLopaeva
|
14d71c05ff
|
Web: Components: drop-down-item: Added theme support, moved styles to a separate file.
|
2021-02-10 14:32:42 +03:00 |
|
TatianaLopaeva
|
a774631c45
|
Web: Components: drop-down: Added theme support, moved styles to a separate file.
|
2021-02-10 13:45:26 +03:00 |
|
TatianaLopaeva
|
da8154cfd0
|
Web: Components: help-button: Added theme support, moved styles to a separate file.
|
2021-02-10 11:00:17 +03:00 |
|
