Artem Tarasov
d44f1bee0f
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
2021-06-11 16:57:17 +03:00
e074c0cf93
Web: Files: changed color of conversion
2021-06-11 16:56:43 +03:00
ef59a2ac47
Web: Files: added hideConfirmConvert setting
2021-06-11 15:49:32 +03:00
e0d076a7bc
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
Artem Tarasov
1073da9d58
Web: deleted unnecessary code
2021-06-11 14:55:53 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
Vladislav Makhov
87c8da2355
web:components: change config
2021-06-10 18:06:25 +03:00
Vladislav Makhov
98d9881ef1
web: components: add snackbar
2021-06-10 17:20:09 +03:00
59bab6a085
Web: Files: fixed conversion progress
2021-06-09 13:28:22 +03:00
93c2f7fb07
Web: Component: added tooltipColor for help button
2021-06-09 04:02:58 +03:00
6fcddbcefa
Web: Components: added color for tooltip
2021-06-09 04:02:28 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +03:00
41ef020616
Web: Common: added backupCodes in tfa store
2021-06-08 14:19:36 +03:00
4d9c26545e
Web: Files: added conversion progress
2021-06-07 16:20:18 +03:00
Artem Tarasov
7db667108b
Web: added font-family Opne-Sans to /public, added import fonts to custom.scss
2021-06-06 23:35:56 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
Vladislav Makhov
0af3acb46b
web: common: add redirect from root in personal
2021-06-03 16:30:56 +03:00
Vladislav Makhov
61abe6a2fc
web: common: fix default page
2021-06-03 15:52:07 +03:00
Vladislav Makhov
4a3b61dda8
web: common: fix default page
2021-06-03 15:48:19 +03:00
Vladislav Makhov
889bba78b1
web: common: fix default value
2021-06-03 10:32:33 +03:00
Vladislav Makhov
2ae98f6cf4
web: common: rename isPersonal to personal according to settings api key
2021-06-03 10:30:09 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
Vladislav Makhov
1e8563ed2a
web: common: add isPersonal key
2021-06-02 16:42:59 +03:00
Artem Tarasov
d960ae6220
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
Artem Tarasov
fbab4041c9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
60a7e84f60
Web: ProfileAction : Added locale usage for DateInput
2021-06-02 12:04:26 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
49c77907bd
Web: Common: fixed error message
2021-05-30 22:48:04 +03:00
f993108d69
Web: Common: commentary changes
2021-05-30 17:26:30 +03:00
74064fc76d
Merge branch 'develop' into feature/translations
2021-05-29 21:59:02 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# 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-05-29 21:57:42 +03:00
d585c0a785
Web: Bumped version to 0.1.10
2021-05-29 21:26:13 +03:00
Artem Tarasov
e7a7aed6ec
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/index.js
2021-05-28 15:30:39 +03:00
792430a0c6
Web: Components: fixed combobox clickability
2021-05-27 14:50:23 +03:00
3ad8b7e1dc
Web: Components: fixed row checkbox clickability
2021-05-27 13:27:08 +03:00
25ac98e272
Merge branch 'develop' into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
Alexey Kostenko
727804180b
Revert "Web: Common: Added InfiniteLoader"
...
This reverts commit 09ff37ac0f
2021-05-27 10:38:06 +03:00
757e90ee7a
Web: Components: fixed help-button iconName path
2021-05-26 17:16:32 +03:00
1e954b15d7
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
2021-05-24 19:05:29 +03:00
1b940de5e2
Web: Common: removed I18nextProvider from PageLayout
2021-05-24 16:24:23 +03:00
Alexey Kostenko
09ff37ac0f
Web: Common: Added InfiniteLoader
2021-05-24 16:24:11 +03:00
7e19a25b0c
Web: fixed text styles
2021-05-24 14:30:11 +03:00
66b30360de
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-21 17:21:16 +03:00
389ee969a2
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
2021-05-21 17:19:00 +03:00
facf0a01cf
Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json"
2021-05-21 16:37:46 +03:00
14214f2ad8
Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter"
2021-05-21 15:00:30 +03:00
Alexey Kostenko
fbbec464d7
Web: Components: Updated ToggleButton (Added animation - framer-motion, and isLoading prop)
2021-05-20 19:11:44 +03:00
cda77e1234
Merge branch 'develop' into bugfix/context-actions
2021-05-20 13:24:18 +03:00
af2f24e4ac
Merge branch 'develop' into feature/translations
2021-05-20 13:11:13 +03:00
16d6db9054
Web: Files: fixed context-menu drag
2021-05-20 12:54:16 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
408f432be6
Web: Common: added urls on authenticator app
2021-05-20 06:37:56 +03:00
b2611343b6
Web: Common: get old backup codes
2021-05-20 01:44:03 +03:00
Artem Tarasov
5996b3f74f
Merge branch 'develop' into bugfix/fixed-styles
2021-05-20 01:00:36 +03:00
Artem Tarasov
80a09fdb31
Web: Client: NavMenu: fixed position version-box when change orientation or window size
2021-05-20 00:57:11 +03:00
4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
37267b624f
Web: Common: added method for login with code and cookie
2021-05-19 18:21:40 +03:00
Alexey Kostenko
f25eb00494
Merge branch 'develop' into feature/access-rights-admins
2021-05-19 18:05:19 +03:00
8785f6151a
Web: Common: fixed reloading login page
2021-05-19 17:17:07 +03:00
03a71ae131
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
3c6f831618
Web: Common: Api: Added removeShareFiles api method
2021-05-19 16:51:43 +03:00
2cd59d9014
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
2021-05-19 13:55:13 +03:00
d5ff576188
Web: Files: Store: Added mark read action, added remove from list and mark read icons
2021-05-19 13:54:45 +03:00
d55c953805
Web: Files: fixed MediaViewer propTypes
2021-05-19 13:45:37 +03:00
536c6c2f5e
Web: Moved custom.scss to @appserver/common
...
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
b1b6bdc516
Web: Common: refactoring tfa store
2021-05-19 03:48:13 +03:00
07934f6cd9
Web: Common: fixed firefox header
2021-05-18 17:59:34 +03:00
6c51f15d28
Web: Components: fixed toggle-button styles
2021-05-18 17:58:45 +03:00
20403e2c98
Web: Common: reset tfa app
2021-05-17 23:28:52 +03:00
e87e0272ae
Web: Common: get tfa backup codes
2021-05-17 17:32:12 +03:00
d34e1eeaa6
Web: Common: deleted console.log
2021-05-17 16:54:21 +03:00
cce7b94d5d
Web: Common: deleted console.log
2021-05-17 16:52:38 +03:00
fadd46112c
Web: Common: added login with tfa code method, fixed url
2021-05-17 16:33:01 +03:00
f5998b650a
Web: Common: added login with tfa code method
2021-05-17 16:32:40 +03:00
bb8124d1fa
Web: Common: added login with tfa code method
2021-05-17 16:32:22 +03:00
Artem Tarasov
9eb3b2a375
Web: Components/Client: fix tree loader, fix version badge
2021-05-17 12:40:46 +03:00
Artem Tarasov
d43493e787
Merge branch 'develop' into bugfix/fixed-styles
2021-05-16 00:50:21 +03:00
Artem Tarasov
31105f4eb8
Web: Components: TreeMenu: fixed badge hitting the name of an item in menu wit a large number of new notifications
2021-05-16 00:50:09 +03:00
Artem Tarasov
f7c880c56e
Web: Common: PageLayout: fixed position scrollbar in article
2021-05-16 00:49:10 +03:00
77f17d55b6
Web: Common: redirect on confirm page
2021-05-14 15:59:15 +03:00
9b54835996
Web: Common: get secret key and qr
2021-05-14 15:58:50 +03:00
Alexey Kostenko
1d036e33d6
Merge branch 'develop' into feature/access-rights-admins
2021-05-14 13:13:34 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
eb628d3703
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
2021-05-14 11:34:10 +03:00
1a58007fcd
Web: Common: removed custom selection frame
2021-05-14 11:21:59 +03:00
ef085ef7df
Web: Files: enable favorites and recent settings
2021-05-14 11:08:57 +03:00
0d98b05210
Web: Files: fixed icons clickability
2021-05-13 16:57:10 +03:00
Artem Tarasov
940dc60684
Web: Components: fix style of IconButton in PasswordInput Components
2021-05-13 00:00:55 +03:00
f05147eb29
Web: Common: fixed clickability for mobile devices
2021-05-12 16:53:40 +03:00
72ed5e031c
Web: Common: hide delete icon from MediaViewer for shared folder
2021-05-12 14:05:54 +03:00
e84fc5b5e3
Web: Common: redirect on confirm link
2021-05-12 12:10:08 +03:00
9ea5a131e8
Web: Files: fixed MediaViewer crash
2021-05-12 11:55:34 +03:00
Alexey Kostenko
f9c2eaefa6
Web: Components: Added prop - onClick anywhere in the row, except the checkbox and context menu
2021-05-11 14:54:30 +03:00
c857751572
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
...
# Conflicts:
# yarn.lock
2021-05-11 12:22:17 +03:00
Artem Tarasov
58a41faa4a
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# yarn.lock
2021-05-11 10:30:19 +03:00
Alexey Kostenko
62c789d68b
Merge branch 'develop' into feature/access-rights-admins
2021-05-11 10:19:31 +03:00
57a4b8a9b8
Upgrade lodash to version 4.17.21 (lodash vulnerability issue)
2021-05-07 21:12:25 +03:00
3ae370deed
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2021-05-07 18:54:42 +03:00
6c3244a3e9
Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy)
2021-05-07 18:54:25 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
7c2f36635b
Web: Common: refactoring
2021-05-07 14:32:00 +03:00
221edc5c33
Web: Common: get tfa settings
2021-05-07 14:22:21 +03:00
95c9c9d1a3
Merge branch 'develop' into feature/portal-modal-dialog
2021-05-06 16:30:31 +03:00
b7af18f636
v0.1.9
2021-05-06 14:57:01 +03:00
71e1468835
Web: Common: fixed MediaViewer styles
2021-05-06 12:52:19 +03:00
c50c65a1c5
Web: Components: moved ModalDialog to Portal
2021-05-06 12:49:53 +03:00
3365d1a1dc
Web: Client: added showCopyLink prop to password-input component, fixed displaying "copy email and password" link
2021-05-05 15:48:19 +03:00
daef594561
Web: Packages: added tfa store
2021-05-05 14:59:08 +03:00
605f7d749e
Web: Components: FloatingButton: Added rotation on percent === 0
2021-05-04 22:14:42 +03:00
35ef6c27bf
Web: Files: removed file format for unselected items
2021-05-04 17:42:06 +03:00
026306d7ca
Web: Login: Fix hard-coded list of trusted domains on registration
2021-05-04 15:35:09 +03:00
bdc681f94a
Web: Files: Fix favorite flag setup (thirdParty issue)
2021-05-04 11:18:24 +03:00
e61375c348
Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9
2021-04-30 17:25:32 +03:00
7ba67cf63a
Web: Fix click on webView link on ComingSoonPage (CRM, Projects, Mail, Calendar)
2021-04-30 17:25:26 +03:00
bec2690510
Web: fixed files productName
2021-04-30 16:47:47 +03:00
d55b39a653
Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog
2021-04-30 14:02:58 +03:00
Alexey Kostenko
17d4b0a4db
Merge branch 'develop' into feature/access-rights-admins
2021-04-29 15:11:50 +03:00
61695dfb5f
Web: Files: Hide Facebook share link (new FB SDK required)
2021-04-29 13:44:37 +03:00
9e40feb771
Added and applied Common.json for common translations (languages issue)
2021-04-29 10:14:47 +03:00
Alexey Kostenko
5f81e5a0ce
Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators
2021-04-29 09:40:55 +03:00
14719ed698
Web: Components: fixed checkbox icons style
2021-04-27 14:31:05 +03:00
2b6d536590
Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8
2021-04-27 13:48:38 +03:00
Artem Tarasov
5d2264d483
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-04-27 13:40:38 +03:00
c324693034
Merge branch 'develop' into release/v0.1.8
2021-04-27 12:11:36 +03:00
Alexey Kostenko
a550197bc5
Web: Common: Fixed getAuthProviders api url
2021-04-27 12:02:51 +03:00
c6a08a50f9
Web: Fixed language for users then not changed language at profile yet.
2021-04-27 11:39:16 +03:00
a46f8ed04a
Web: Common: Fix openEdit query param
2021-04-26 19:02:40 +03:00
f3610ce7f6
Web: Common: Fix openEdit query param
2021-04-26 19:02:16 +03:00
cad6ee216c
Web: Components: Badge: Fixed event propagation for Badge component
2021-04-26 10:25:45 +03:00
7c9e35d004
Web: Components: ContextMenuButton: Fixed out of event call for new menu item
2021-04-26 09:45:57 +03:00
d2588270cf
Merge branch 'master' into develop
2021-04-23 20:16:42 +03:00
838435bab5
Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7
2021-04-23 18:00:17 +03:00
cd699e37e2
Files: Fix opening of version
2021-04-23 18:00:05 +03:00
8159ae7b69
Web: Components: Row: Added new context-menu usage inside row
2021-04-23 17:58:06 +03:00
02bcb50e67
Web: Files: Fix ConnectedClouds context-options work
2021-04-23 15:02:57 +03:00
Alexey Kostenko
707f9bab50
Web: Common: Added proxy to OAuth login URL
2021-04-23 13:17:40 +03:00
Alexey Kostenko
b1ef3639c6
Fix
2021-04-22 16:13:02 +03:00
Alexey Kostenko
2d6083c972
Web: Components: Fixed warnings
2021-04-22 16:10:26 +03:00
Alexey Kostenko
8519fe4d60
Web: Components: SocialButton style fix
2021-04-22 14:54:06 +03:00
Alexey Kostenko
667a76b95f
Oauth: Refactoring
2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f
OAuth: Refactoring
2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
1658e0d60a
Web: Common: removed custom SelectedFrame, fixed frame styles
2021-04-21 11:48:50 +03:00
Artem Tarasov
7f4888d2a2
Web: Files: fix drag
2021-04-21 02:23:31 +03:00
TatianaLopaeva
0f3eb1350b
Merge branch 'develop' into feature/team-template
...
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
0b0dbb971f
Web: Settings: Fix enabledJoin setup
2021-04-19 18:39:00 +03:00
3734027f4f
Web: Files: fixed newItem styles
2021-04-19 14:16:42 +03:00
9b6e4ace8b
Web: Files: fixed badge for tree menu
2021-04-19 14:08:40 +03:00
Alexey Kostenko
d9860256ec
Web: Common/Components: FacebookButton style fix
2021-04-19 09:49:47 +03:00
e586d42d3b
Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile
2021-04-16 20:23:08 +03:00
TatianaLopaeva
ab10641b45
Web: Rename teamTemplate.
2021-04-16 17:10:37 +03:00
Alexey Kostenko
8cb74d14b4
Web: Client/Common: Added thirdParty signup api
2021-04-16 16:34:24 +03:00
7062c713ad
Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6
2021-04-16 16:05:01 +03:00
a289256846
Web: Files: added ConflictResolveDialog, refactoring files operations
2021-04-16 16:04:50 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
TatianaLopaeva
d4da2a8cbb
Web: Fixed width of input for horizontal orientation.
2021-04-16 14:38:17 +03:00
Alexey Kostenko
96ec652313
Merge branch 'develop' into feature/oauth2.0
2021-04-16 14:25:37 +03:00
Vladislav Makhov
c60d653bc1
web: fix hiding unpinned article when menu item clicked
2021-04-16 13:41:36 +03:00
TatianaLopaeva
297e4f42e9
Merge branch 'develop' into feature/team-template
2021-04-16 09:25:43 +03:00
TatianaLopaeva
e738cab4a2
Web: Added Error message & Added loader.
2021-04-15 19:51:59 +03:00
Artem Tarasov
54b96e8aa0
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
2021-04-15 15:05:15 +03:00
Artem Tarasov
f8c69fd939
Web: Common: Loaders: added loaders for tiles
2021-04-15 11:47:02 +03:00
13d083f01c
Web: GroupMenu: Fix wrong items title displaying
2021-04-15 10:54:12 +03:00
33f5a07c70
Web: Files: fixed search by subfolders
2021-04-15 10:27:23 +03:00
TatianaLopaeva
fc40487de0
Web: Added setCurrentShema and setCustomShema methods, added form validation.
2021-04-14 14:26:26 +03:00
Artem Tarasov
74a5bf33dc
Web: Files: fix drag, deleted console.log
2021-04-14 12:41:08 +03:00
Artem Tarasov
4be1db4c9a
Web: Files: added calling the context menu when right-clicking on a tile
2021-04-14 00:09:51 +03:00
TatianaLopaeva
39064cf4e2
Web: Settings: Added cancel and save button.
2021-04-13 22:51:43 +03:00
4b5c73b3e7
Web: fixed input user-select
2021-04-13 17:05:23 +03:00
a321619c98
Web: fixed input select
2021-04-13 15:18:33 +03:00
TatianaLopaeva
ff370259e9
Web: Added "learn more and help url for common setting.
2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51
Web: Settings: Added logic for team template, added getCustomSchema.
2021-04-13 14:34:04 +03:00
c324404767
Web: fixed firefox frame
2021-04-13 14:07:44 +03:00
Alexey Kostenko
e99f66267f
Style fix
2021-04-13 13:15:30 +03:00
c7017920e8
Web: fixed selection for mobile devices
2021-04-13 12:56:03 +03:00
5daf690ffb
Web: fixed selection
2021-04-13 12:49:37 +03:00
5936640ce2
Web: fixed selection
2021-04-13 12:43:17 +03:00
Alexey Kostenko
571b412d27
Web: Client/Components: Fixed facebook button styles/icon, fixed translations
2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1
Web: Client/Components: Style fix and added translations
2021-04-13 09:45:52 +03:00
8cfd5eb644
Web: Added SelectedFrame
2021-04-13 09:35:07 +03:00
Alexey Kostenko
cf7072a714
Refactoring
2021-04-12 10:57:21 +03:00
Alexey Kostenko
e187db767f
Web: Login: Updated field with buttons for login
2021-04-09 16:00:41 +03:00
Alexey Kostenko
b8354a98bf
Web: Components: Added FacebookButton component
2021-04-09 15:55:54 +03:00
Artem Tarasov
f8b36757ae
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/store/index.js
2021-04-09 11:51:39 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +03:00
96d67be68c
Web: Fix hashSettings setup
2021-04-08 10:24:06 +03:00
bcf350c1d9
Bump version to v0.1.1
2021-04-08 10:23:33 +03:00
c314b6e192
Web: Change bad language setup
2021-04-07 16:33:00 +03:00
559d7a9940
Web: Fixed export and import registerSW
2021-04-07 15:41:42 +03:00
4484d609a6
Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update
2021-04-07 15:27:51 +03:00
Artem Tarasov
902a44daf2
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 14:42:09 +03:00
Artem Tarasov
3ee7541e54
Web: Components/People: fixed translation in PasswordInput
2021-04-07 14:41:46 +03:00
TatianaLopaeva
8419167825
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 13:35:39 +03:00
TatianaLopaeva
cdef097fdd
Web: Fixed hiding header when switching group.
2021-04-07 13:35:32 +03:00
Alexey Kostenko
aad5255cd8
Web: Common: Fixed setting user culture
2021-04-07 12:19:12 +03:00
Artem Tarasov
40bfcc9dbe
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-06 18:51:50 +03:00
Artem Tarasov
6eb9f8eeaa
Web: Components: fixed size of sharing icon in the context menu
2021-04-06 18:51:11 +03:00
TatianaLopaeva
4c7cc32cc4
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-06 17:23:39 +03:00
TatianaLopaeva
6b7bc650da
Web: components: Added margin-bottom for fixed height of article.
2021-04-06 17:23:32 +03:00
424efc1e72
Web: Files: fixed treeFolders drag
2021-04-06 15:47:04 +03:00
Ilya Oleshko
b228e20cdb
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 18:10:35 +03:00
Ilya Oleshko
f6d8238602
Web: Files: Fixed empty elements inside context menu, added missing actions for deleted items
2021-04-05 18:10:26 +03:00
TatianaLopaeva
a75b57060d
Web: components: Fixed styles of icons.
2021-04-05 17:49:22 +03:00
Ilya Oleshko
018f3fad33
Web: Files: Added data-api for new ContextMenu
2021-04-05 16:44:55 +03:00
Artem Tarasov
e304af064b
Web: People: fixed group list query
2021-04-05 16:18:41 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +03:00
Alexey Kostenko
866a1bfa68
Web: People: Removed unused method
2021-04-05 13:36:04 +03:00
Artem Tarasov
43491f42a9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.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/store/InitFilesStore.js
2021-04-05 10:54:27 +03:00
Alexey Kostenko
e333e7e82d
Web: People: Clear interval if getter token window is closed (connecting providers)
2021-04-04 16:53:27 +03:00
Alexey Kostenko
df635f3bfd
Web: Login/Common: Clear interval if getter token window is closed
2021-04-04 16:39:35 +03:00
Ilya Oleshko
3c4cd300a3
Web: Components: ContextMenuButton: Added to boolean for isMobile
2021-04-02 19:33:17 +03:00
Ilya Oleshko
22cd73ddd2
Merge branch 'develop' into feature/contextmenu-refactoring
2021-04-02 18:21:20 +03:00
Ilya Oleshko
3ae0a4703f
Web: Components: Row: Removed unused test
2021-04-02 18:05:26 +03:00
Ilya Oleshko
5733a4d9ab
Web: Components: ContextMenu: Added hiding disabled items inside ContextMenu component
2021-04-02 17:54:52 +03:00
Ilya Oleshko
6c0918409f
Web: Components: Row: Fixed multi-open context menu on row
2021-04-02 17:31:36 +03:00
Vladislav Makhov
555bb28e47
web: common: remove unused imports
2021-04-02 15:36:40 +03:00
Vladislav Makhov
ff04684f53
web: remove unused code
2021-04-02 13:49:42 +03:00
Artem Tarasov
43b9301e90
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
2021-04-01 18:19:09 +03:00
Ilya Oleshko
3812af35ea
Merge branch 'develop' into feature/contextmenu-refactoring
2021-04-01 13:24:05 +03:00
Ilya Oleshko
04b8500a78
Web: Components: Apply ContextMenu at Row
2021-04-01 13:22:37 +03:00
Vladislav Makhov
cb10e850cd
web: common: switch to makeAutoObservable, add action setIsEncryptionSupport
2021-04-01 12:42:23 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room
2021-03-31 18:01:58 +03:00
Ilya Oleshko
4a66eda956
Merge branch 'develop' into feature/contextmenu-refactoring
2021-03-31 15:21:16 +03:00
Ilya Oleshko
81c18fcd49
Merge branch 'develop' into feature/contextmenu-refactoring
2021-03-31 13:52:08 +03:00
Ilya Oleshko
d75e0e7e1d
Web: Components: Fixed usage webkit-touch-callout at TextInput component only for desktop
2021-03-31 12:39:31 +03:00
Ilya Oleshko
b979b3324f
Web: Components: Added stopping webkit-touch-callout at GroupButtonsMenu component
2021-03-31 10:44:04 +03:00
Ilya Oleshko
d12a3460db
Web: Components: Added stopping webkit-touch-callout at TextInput component
2021-03-31 10:43:41 +03:00
Vladislav Makhov
1a66373c16
web: fix defaultPage
2021-03-30 15:01:25 +03:00
Vladislav Makhov
be3c97bce2
web: fix opening Files as default page, if desktop client uses
2021-03-30 13:05:52 +03:00
Alexey Kostenko
0f5e5cce3f
Web: Components/People/Login: Fixed warning ("React does not recognize prop")
2021-03-30 11:37:21 +03:00
Ilya Oleshko
9412f574ec
Web: Components: ContextMenu added base styling
2021-03-30 10:42:10 +03:00
Artem Tarasov
6fdf49742d
Web: Common: FilterInput: propTypes fix
2021-03-29 22:22:43 +03:00
845105e2f8
Web: Common: removed LayoutContextConsumer wrapper
2021-03-29 10:24:56 +03:00
14dcfb90c1
Web: Common: removed frame for mobile devices
2021-03-29 10:08:50 +03:00
Alexey Kostenko
7ff66e894a
Web: Login: Render only available providers for login
2021-03-26 17:19:26 +03:00
Alexey Kostenko
1546bacaf9
Web: Components: fixed socialButton event
2021-03-26 17:16:34 +03:00
Ilya Oleshko
53c0e36967
Web: Components: Reworked context-menu component
2021-03-26 16:03:51 +03:00
Ilya Oleshko
eef2e8f385
Web: Components: Added Portal component
2021-03-26 16:03:19 +03:00
Ilya Oleshko
10b27e532d
Web: Components: Utils: Added DOM helpers
2021-03-26 16:02:44 +03:00
Ilya Oleshko
f7b31231d0
Web: Components: Utils: Added object to JSX converter
2021-03-26 16:02:05 +03:00
Ilya Oleshko
983e689bbe
Web: Components: Utils: Added class name combiner
2021-03-26 16:01:22 +03:00
Alexey Kostenko
6fadc94b71
Web: Components/People: Fixed social-button styles
2021-03-25 18:06:48 +03:00
Alexey Kostenko
3e4424b67b
Web: People/Common: Refactoring
2021-03-25 16:10:10 +03:00
1955e4f141
Web: Files: fixed drag styles, added drag tooltip
2021-03-25 15:29:34 +03:00
Artem Tarasov
155b3e224f
Web: Common: FilterInput: added SwitchButton to ViewSelector
2021-03-25 12:55:27 +03:00
f9f560f351
Web: Common: fixed files selection
2021-03-25 11:27:03 +03:00
Alexey Kostenko
1e17f4c4ae
Web: Common: Added api for oauth login
2021-03-24 16:49:42 +03:00
Artem Tarasov
1d90de34ec
Web: Commponents: added SwitchButton component (from AppComponents)
2021-03-24 16:14:59 +03:00
Alexey Kostenko
34973b123a
Web: Common: Added api for linking providers and get available linked providers
2021-03-24 14:19:46 +03:00
9fcbb5c873
Web: Storybook issues fix:
...
+ Added copy public/images to static/images for publish
+ Fix checkbox click in theme-provider.stories.js
+ Added empty_screen_filter.png for EmptyScreenContainer
2021-03-24 13:55:50 +03:00
f732f5fba6
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
2021-03-24 11:45:58 +03:00
Alexey Kostenko
e1df253b22
Web: People/Components: Added login settings buttons to edit profile page, social button - style fix
2021-03-23 18:29:29 +03:00
TatianaLopaeva
cc707204d9
Web: Removed jumps of article when the page is loading.
2021-03-23 10:39:37 +03:00
fd704ab12a
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:58:06 +03:00
5dd30c9502
Web: Client: fixed owner change
2021-03-22 20:56:53 +03:00
0847693c55
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:02:03 +03:00
efcf36a1b0
Web: Common: Revert proxy.url
2021-03-22 20:01:28 +03:00
12af2890dc
Web: Files: fixed markAsRead
2021-03-22 19:21:36 +03:00
628f9c8d5c
Web: Common: fixed getShortenedLink
2021-03-22 19:18:30 +03:00
TatianaLopaeva
9baae539d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904
Web: Fixed displaying of shared files at aside & Deleted useless code.
2021-03-22 18:11:39 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
Alexey Kostenko
3524f3b6c6
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
2021-03-22 15:27:36 +03:00
e8f7a7eebd
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 00:34:35 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
Viktor Fomin
4d22ea8f44
Web: Components: fixed icons positions in avatar editor
2021-03-21 23:25:24 +03:00
a921bf3f71
Web: Fix elem == null in Settings
2021-03-21 11:51:19 +03:00
Viktor Fomin
4fe20bdca9
Web: Common: fixed article width
2021-03-20 16:20:51 +03:00
126bbda1b1
Web: Files: refactoring
2021-03-20 13:17:17 +03:00
75859212ab
Web: People: Fix conversation of Filter to URL and back
2021-03-20 13:16:45 +03:00
deafba32a7
Web: Files: Fix conversation of Filter to URL and back
2021-03-20 12:51:08 +03:00
f25d8adbea
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 22:17:04 +03:00
40557ccedc
Web: Files: fixed filter
2021-03-19 22:16:47 +03:00
e797d01bee
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 21:07:16 +03:00
Artem Tarasov
bd0ea45f19
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 20:54:19 +03:00
Artem Tarasov
117c9f4c0e
Web: Components: fix position and size icons in treeNode
2021-03-19 20:53:26 +03:00
6d29a82d26
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 20:46:06 +03:00
97ec05e8ff
Web: People: fixed filter
2021-03-19 20:45:57 +03:00
ec1fc00b90
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 19:02:50 +03:00
741fca254f
Web: Fixed usage of auth.settingsStore
2021-03-19 19:02:43 +03:00
Viktor Fomin
ab84569dcf
Web: Common: fixed article width
2021-03-19 18:46:05 +03:00
TatianaLopaeva
edb57b61d3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:08:41 +03:00
TatianaLopaeva
3105f31950
Web: components: Fixed backdrop.
2021-03-19 18:08:10 +03:00
02c147bd92
Web: Files: added select files on right click event
2021-03-19 18:07:16 +03:00
Ilya Oleshko
ac6f35db42
Web: Components: Row: Added onRowContextClick callback
2021-03-19 17:33:58 +03:00
Ilya Oleshko
d8be47b1d1
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 16:56:55 +03:00
Ilya Oleshko
ad7a9f6827
Web: Components: ContextMenuButton: Backdrop now open only on mobile
2021-03-19 16:56:46 +03:00
06621ca2cb
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 16:31:48 +03:00
e63fc30a2e
Web: People: Fixed move to direct link
2021-03-19 16:31:41 +03:00
TatianaLopaeva
eee9213cad
Web: Components: Fixed styles of action menu of people.
2021-03-19 14:05:51 +03:00
1e02f165ca
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
e1a477bc64
Web: Common: Restored Selectors in Filter
2021-03-19 10:50:28 +03:00
Artem Tarasov
dabf704485
Web: Client/Components: Wizard: layout fix
2021-03-18 22:55:15 +03:00
f9a062fd67
Web: Fix direct move to /wizard
2021-03-18 22:16:09 +03:00
f3f4037282
Web: Fixed Wizard
2021-03-18 21:54:03 +03:00
Ilya Oleshko
74fe0fc060
Web: Components: Row: Added context-menu position function. Fixed menu call on icon click
2021-03-18 18:54:33 +03:00
TatianaLopaeva
6e96c56916
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:09:34 +03:00
TatianaLopaeva
2e2292c84c
Web: components: backdrop: Fixed closing of modal-dialog.
2021-03-18 18:01:50 +03:00
Vladislav Makhov
12dc227d03
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 17:47:44 +03:00
TatianaLopaeva
473477733c
Web: Components:drop-down-item: Fixed disabled of header of filter.
2021-03-18 16:24:48 +03:00
Vladislav Makhov
325813bbd4
web: components: fix calendar icon color
2021-03-18 16:12:49 +03:00
TatianaLopaeva
131de36293
Web: Components: combobox: Fixed styles of icon.
2021-03-18 13:45:22 +03:00
TatianaLopaeva
a6e3349d9e
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 16:46:25 +03:00
TatianaLopaeva
5fc9376021
Web: Deleted useless exports.
2021-03-17 16:45:36 +03:00
86a63e6330
Web: Client: fixed createUser form
2021-03-17 16:35:45 +03:00
Artem Tarasov
1841730e20
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b
Web: moved PeopleSelector to People
2021-03-17 13:37:22 +03:00
Vladislav Makhov
7f89864990
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 13:05:51 +03:00
Vladislav Makhov
38f57bcf6c
web: people: group button menu fix
2021-03-17 13:05:40 +03:00
8e7cad9b3f
Web: Removed useless files
2021-03-17 12:36:14 +03:00
c08aad3ab1
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 22:47:49 +03:00
a25261f242
Web: Files: Fixed move from Folder to Settings and back
2021-03-16 22:47:41 +03:00
Ilya Oleshko
dcba414521
Web: Components: RowContainer: Fixed context-menu call on window, removed unused test
2021-03-16 16:47:16 +03:00
Alexey Kostenko
72aca76c12
Web: Files/Components: Fixed row styles
2021-03-16 16:17:50 +03:00
7b5a9ab80d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 14:10:29 +03:00
24a6d61205
Web: Added creation and run of service-worker to all client apps
2021-03-16 14:10:20 +03:00
Alexey Kostenko
25b136eada
Web: Components: Files: Fixed row styles
2021-03-16 11:26:49 +03:00
6ca82e9450
Web: Components: Drop-down: fixed mobile eventTypes
2021-03-15 16:21:28 +03:00
2074cbb0d0
Web: Common: fixed StyledSectionFilter
2021-03-15 16:02:26 +03:00
8279174355
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
2021-03-15 14:57:44 +03:00
9ba58855d4
Web: Files: fixed EmptyContainer
2021-03-15 14:51:23 +03:00
Vladislav Makhov
daa0d070d5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 10:34:30 +03:00
Vladislav Makhov
ccb38f6725
web: people: fix group button menu re-render
2021-03-15 10:34:03 +03:00
Artem Tarasov
454b1a4077
Web: Components: refactoring .storybook/main.js
2021-03-14 21:42:23 +03:00
Artem Tarasov
460b34a1a8
Web: Components: added themes for storybook
2021-03-14 21:10:16 +03:00
Artem Tarasov
0748514a43
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-14 03:42:24 +03:00
Artem Tarasov
122a0501d1
Web: Components: added all story
2021-03-14 03:32:12 +03:00
Artem Tarasov
585ccaf09c
Web: Components: added examples story
2021-03-14 03:17:30 +03:00
Artem Tarasov
bda09de462
Web: Components: added story for TreeMenu
2021-03-14 01:00:46 +03:00
b7a7be3d1f
Web: Refactoring
2021-03-13 18:33:43 +03:00
1cf7415db7
Web: Added changing of base href on page load
2021-03-13 18:29:26 +03:00
ad8d6d89d2
Web: Shell: Added virtualPath (proxy: /appserver)
2021-03-13 16:03:31 +03:00
372c06f911
Web: Fix Module not found: Error: Can't resolve 'people/GroupSelector'
2021-03-13 16:02:22 +03:00
8e1f5b30b5
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# 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.Components/yarn.lock
# yarn.lock
2021-03-13 16:01:41 +03:00
TatianaLopaeva
1675e77330
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 17:05:51 +03:00
TatianaLopaeva
71d1e79ea6
Web: Components:drop-down-item: Fix position of icons. (Ipad)
2021-03-12 17:05:18 +03:00
ca94ae28cd
Web: Files: fixed empty filter container
2021-03-12 16:30:36 +03:00
Ilya Oleshko
60d1408d0d
Web: Components: RowContainer: Fixed and added tests
2021-03-12 15:41:17 +03:00
Ilya Oleshko
fc2b9cff34
Web: Components: Row: Added tests
2021-03-12 15:40:49 +03:00
Ilya Oleshko
0a096a1304
Web: Components: Row: Removed unused property from PropTypes
2021-03-12 15:40:21 +03:00
e514fe1a57
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
TatianaLopaeva
06e2d54b86
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:52:42 +03:00
e8e78604f1
Web: Added products/apps dynamic loading
2021-03-12 13:52:30 +03:00
TatianaLopaeva
2d3b587286
Web: Components: main-button: Refactoring & Deleted useless import.
2021-03-12 13:52:14 +03:00
Ilya Oleshko
734675f559
Web: Components: ContextMenuButton: Returned click outside check
2021-03-12 13:42:16 +03:00
Ilya Oleshko
e673f48751
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:00:24 +03:00
Ilya Oleshko
4f7db87bb6
Web: Components: RowContainer: Fixed children mapping and removed context menu parent call
2021-03-12 12:59:32 +03:00
Ilya Oleshko
ba92cfa107
Web: Components: PageLayout: Fixed SelectedFrame value level
2021-03-12 12:58:28 +03:00
7de4fcc755
Web: Files: fixed main-button opening
2021-03-12 12:33:48 +03:00
Ilya Oleshko
466613b0c5
Web: Components: Row: Removed unused code
2021-03-12 11:48:57 +03:00
Ilya Oleshko
8364744cea
Web: Components: Row: Fixed action zone for contextMenu event
2021-03-12 11:36:31 +03:00
Ilya Oleshko
2795a89970
Web: Components: ContextMenuButton: Fixed render call on context call, added padding for inserted DropDown
2021-03-12 11:35:22 +03:00
Vladislav Makhov
e018a15087
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 10:18:18 +03:00
Vladislav Makhov
66daf1e21f
web: common: remove not needed import
2021-03-12 10:17:38 +03:00
Artem Tarasov
7846f41a06
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 10:12:12 +03:00
Vladislav Makhov
b890ee3296
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 09:10:24 +03:00
Vladislav Makhov
10763bd9a3
web: people: fix import
2021-03-12 09:10:09 +03:00
Artem Tarasov
22cf4012d1
Web: Component: added story for Tooltip
2021-03-12 02:34:57 +03:00
Artem Tarasov
998fbe3ee9
Web: Components: added story for ToggleContent
2021-03-12 01:51:58 +03:00
Artem Tarasov
5649398ad0
Web: Components: added story for ToggleButton
2021-03-12 00:17:02 +03:00
Artem Tarasov
63f1e788ad
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 21:14:21 +03:00
Artem Tarasov
23b4cd5380
Web: Components: added story for Toast
2021-03-11 19:03:17 +03:00
Alexey Kostenko
85fc7535bf
Web: Components/Files: Fixed rendering svg when change folder
2021-03-11 17:35:52 +03:00
Artem Tarasov
277f803f12
Web: Components: added story for ThemeProvider
2021-03-11 15:37:33 +03:00
Artem Tarasov
d3aa06dc99
Web: Component: added package react-json-pretty
2021-03-11 15:37:03 +03:00
Artem Tarasov
0eee8f6e45
Web: Components: added story for TextArea
2021-03-11 14:50:58 +03:00
Artem Tarasov
cd5fea0096
Web: Components: added story for TextInput
2021-03-11 14:33:32 +03:00
Artem Tarasov
96271b4dfb
Web: Components/Client: changed the way of passing elements to TabContainer component
2021-03-11 13:43:54 +03:00
Artem Tarasov
16fcfd6d36
Web: Components: added story for TabContainer
2021-03-11 12:48:03 +03:00
Viktor Fomin
4c28a12398
Web: Common: fixed icon position
2021-03-10 20:10:09 +03:00
7d62b4432c
Components: Fix test run
2021-03-10 19:51:44 +03:00
Artem Tarasov
85859b0974
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 17:22:02 +03:00
Artem Tarasov
8e948054db
Web: Components: added stories for SelectorAddButton,SocialButton
2021-03-10 17:21:32 +03:00
Artem Tarasov
4f94d5beae
Web: Components: added story for SelectedItem
2021-03-10 16:47:42 +03:00
Artem Tarasov
2132c9ce41
Web: Components: added story for SearchInput
2021-03-10 16:17:26 +03:00
Artem Tarasov
0c9db1621d
Web: Components: added story for Scrollbar
2021-03-10 14:43:48 +03:00
Artem Tarasov
961067581c
Web: Components: added story for SaveCancelButtons
2021-03-10 14:31:39 +03:00
Artem Tarasov
273d279202
Web: COmponents: added story for RowContent
2021-03-10 14:15:22 +03:00
Artem Tarasov
b6f0888987
Web: COmponents: added story for RowContainer
2021-03-10 13:44:54 +03:00
Artem Tarasov
4697f4ba87
Web: Components: added story for Row
2021-03-10 13:02:57 +03:00
Artem Tarasov
7bd692d239
Web: Components: added story for RequestLoader
2021-03-10 11:19:30 +03:00
Alexey Kostenko
e896a711c8
Web: Components: Fixed tests
2021-03-10 11:11:32 +03:00
Artem Tarasov
43dc4ec3a4
Web: Components: added story for RadioButtonGroup
2021-03-10 10:59:03 +03:00
Artem Tarasov
3f416709e7
Web: Components: Added story for ProgressBar
2021-03-10 10:58:21 +03:00
Artem Tarasov
dda9451a6c
Web: Components: added story for PasswordInput
2021-03-10 10:57:42 +03:00
Artem Tarasov
bfd690c6db
Web: Components: added story for Paging
2021-03-10 10:57:15 +03:00
Artem Tarasov
958db51408
Web: Components: added story for RadioButton
2021-03-10 10:55:16 +03:00
Alexey Kostenko
49bf5c339e
Web: Components: Fixed filter combo-button style
2021-03-09 10:54:03 +03:00
Artem Tarasov
782168d3d6
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/package.json
2021-03-08 23:21:56 +03:00
Artem Tarasov
f2045ab5f0
Web: Components: added stories (ModalDialog, MainButton, Loader, Link, LinkWithDropDown, Label, IconButton),fix HelpButton, Heading stories
2021-03-08 23:18:45 +03:00
Artem Tarasov
c8d614a3ba
Web: Components: refactoring stories, add public/images to components for storybook
2021-03-07 14:57:26 +03:00
2a5a78bc74
Web: Packages: stable versions
2021-03-06 21:46:04 +03:00
32b8c7f6fe
Web: Fixed login work
2021-03-05 17:41:55 +03:00
877016d8e3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 12:41:08 +03:00
7db261fea4
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 11:46:27 +03:00
25a2daeab5
Web: Files: moved editCompleteAction to store
2021-03-05 11:46:16 +03:00
TatianaLopaeva
e81d2c8bb7
Web: Common: Fixed logoUrl.
2021-03-05 11:01:49 +03:00
Artem Tarasov
2ba54c3bdb
Web: Components: added story of Avatar, Box, component refactoring to ensure storybook captures props
2021-03-05 02:52:14 +03:00
Artem Tarasov
93b5a55506
Web: Components: rewrited story of email-input to csf with mdx docs
2021-03-05 01:58:36 +03:00
82a6dafb0f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 19:09:58 +03:00
28a798c542
Web: Fixed work with translations + refactoring:
...
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
Alexey Kostenko
b0f3a4e426
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 17:32:09 +03:00
Alexey Kostenko
7cb59e3189
Web: Files/People: fixed direct link transition
2021-03-04 17:31:37 +03:00
TatianaLopaeva
5c826bcf29
Web: Added top loading indicator for desktop.
2021-03-04 14:36:31 +03:00
Alexey Kostenko
9e80a2010c
Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module)
2021-03-04 13:13:26 +03:00
Artem Tarasov
2aabae6644
Web: Components: added stories for EmptyScreenContainer, FieldContainer, FileInput, Grid
2021-03-04 02:59:49 +03:00
Artem Tarasov
84062c6d28
Web: Components: added story for EmailInput, added PropTypes, refactoring DropDown stories;
2021-03-04 00:30:41 +03:00
Artem Tarasov
569f7201cc
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# yarn.lock
2021-03-03 18:28:52 +03:00
Artem Tarasov
f6c9ff781b
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 18:11:22 +03:00
Artem Tarasov
f2870eca8e
Web: Components: Added stories for DatePicker, DragAndDrop, DropDown, DropDownItem, refactoring story of Backdrop, fixe passed props DropDown
2021-03-03 18:09:00 +03:00
47a030f5a1
Web: Restored process indication in Files
2021-03-03 17:58:56 +03:00
68930abdcb
Web: Move toastr function to Web Client (mf: "studio/toastr")
2021-03-03 16:46:04 +03:00
fe39c60633
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 16:19:09 +03:00
TatianaLopaeva
17ac53d015
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 15:42:58 +03:00
TatianaLopaeva
ada47512f1
Web: Moved PeopleSelector to the Web Client.
2021-03-03 15:41:28 +03:00
Artem Tarasov
7fb751c2cd
Web: Components: added story of DatePicker, refactoring stiries, fixes bug of input.js in styled-text-input.js
2021-03-03 14:57:14 +03:00
Vladislav Makhov
34c1816aa5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 14:54:37 +03:00
efaeaff894
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 14:46:45 +03:00
684c0e777f
Web: Refactoring
2021-03-03 14:46:37 +03:00
4db48870cf
Web: SettingsStore: Fixed warnings of mobx
2021-03-03 14:46:05 +03:00
3fecff3307
Web: Restored commented code
2021-03-03 14:09:52 +03:00
8da0cbcb63
Web: Fixed displaying login errors
2021-03-03 14:09:00 +03:00
Vladislav Makhov
1190d4c1ba
web: components: fix path
2021-03-03 13:54:41 +03:00
Artem Tarasov
5142456afa
Web: Components: added story of ContextMenuButton
2021-03-03 13:25:56 +03:00
238914e25e
Web: Files: refactoring
2021-03-03 13:22:50 +03:00
TatianaLopaeva
7b0faa4747
Web: Moved Main into the Web Client.
2021-03-03 13:02:56 +03:00
Artem Tarasov
b97118d72c
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 13:01:15 +03:00
TatianaLopaeva
1e643edd16
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 12:48:07 +03:00
TatianaLopaeva
d6cf286cd0
Web: Moved Layout to the Web Client.
2021-03-03 12:47:28 +03:00
Vladislav Makhov
1dbfd7f105
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 12:33:25 +03:00
TatianaLopaeva
90831adc31
Web: Moved GroupSelector to the People module.
2021-03-03 12:09:12 +03:00
Vladislav Makhov
d08b927084
web: fix warning
2021-03-03 12:05:23 +03:00
Vladislav Makhov
c2a5eea4be
web: people: refactoring
2021-03-03 12:05:08 +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
ef619676ad
Web: Components: added stories ContextMenu, ContextMenuButton, refactoring
2021-03-03 11:53:37 +03:00
TatianaLopaeva
988afe48fd
Web: Moved profile menu to the NavMenu.
2021-03-03 11:25:28 +03:00
TatianaLopaeva
5212633a8d
Web: Moved errors from Common to the Web Client.
2021-03-03 11:15:11 +03:00
Artem Tarasov
2f09bab8e5
Web: Components: added story of Combobox
2021-03-03 10:56:54 +03:00
TatianaLopaeva
0a97830634
Web: Common: Fix icon for menu.
2021-03-02 21:16:50 +03:00
TatianaLopaeva
ccc45a8d74
Web: Components: checkbox: Fix displaying indeterminate color.
2021-03-02 20:15:27 +03:00
bf7f680d08
Web: Moved NavMenu to Web Client
2021-03-02 18:25:20 +03:00
Artem Tarasov
9ae9d7132e
Web: Components: added story of Checkbox, fix passing props
2021-03-02 17:20:16 +03:00
Artem Tarasov
4b3e491e95
Web: Ccomponents: fixed source section in Stories, modified webpack.config.js
2021-03-02 16:27:45 +03:00
Artem Tarasov
843f3df500
Web: Components: added story of Calendar
2021-03-02 16:01:12 +03:00
Artem Tarasov
7edec73e54
Web: Components: Avatar: delete old story
2021-03-02 13:09:31 +03:00
Artem Tarasov
a25cd562cb
Web: Components: added story of AvatarEditor, fixed theme props
2021-03-02 13:08:26 +03:00
Alexey Kostenko
884e982896
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-02 11:26:47 +03:00
Alexey Kostenko
f0eef94f2a
Web: Components: Fixed jest config, fixed components, fixed tests, added package for test
2021-03-02 11:25:11 +03:00
Artem Tarasov
87f90ed4ac
Web: Components: added story of Avatar
2021-03-02 00:33:44 +03:00
Artem Tarasov
236e0892c8
Web: Components: added story of Badge
2021-03-02 00:32:59 +03:00
ab139d373a
Web: Changed opening @self profile without page refresh
2021-03-01 22:53:42 +03:00
Artem Tarasov
ebaa4e66e8
Web: Components: updated rules for upload svg
2021-03-01 22:09:08 +03:00
Artem Tarasov
54b672b0d0
Web: Components: added story of Button
2021-03-01 21:37:56 +03:00
Alexey Kostenko
73b65d6f6c
Web: Components: Reverted versions packages for tests, added configs
2021-03-01 19:07:06 +03:00
Alexey Kostenko
afda34a20a
Web: Components: Added packages for tests
2021-03-01 18:30:53 +03:00
8ee7563caf
Web: Client: fixed mobx warnings
2021-03-01 18:15:11 +03:00
Artem Tarasov
7f5c4e779b
Web: Components: added story of Backgrop
2021-03-01 17:58:42 +03:00
Artem Tarasov
909d3f70cc
Web: Components: init storybook 6
2021-03-01 17:35:38 +03:00
Alexey Kostenko
e0a51a7060
Web: Components: Added packages for tests
2021-03-01 17:28:37 +03:00
Alexey Kostenko
8179cbd0a4
Web: Components: Added part packages for tests
2021-03-01 17:08:35 +03:00
Vladislav Makhov
47004a1e1d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/input-block/index.js
2021-03-01 16:12:34 +03:00
Vladislav Makhov
f452b09ecd
web: fix icons
2021-03-01 16:11:45 +03:00
TatianaLopaeva
200049ccee
Web: Components: input-block: Fix icons displaying & added search.react icon.
2021-03-01 15:50:16 +03:00
Alexey Kostenko
29730b46e5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 15:12:40 +03:00
Vladislav Makhov
ea7697d461
web: common: fix import
2021-03-01 12:30:21 +03:00
Vladislav Makhov
23e77d4822
web: components: fix import
2021-03-01 12:29:59 +03:00
Vladislav Makhov
1695b9649d
web: common: fix title
2021-03-01 12:03:12 +03:00
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
Vladislav Makhov
4f8ad66cc3
web: common: fix svg import
2021-03-01 11:56:44 +03:00
Alexey Kostenko
1a1459d469
Web: Components: Added configs for testing, added command to package.json
2021-03-01 10:19:53 +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
TatianaLopaeva
6d70daa26a
Web: Headline: Fix headline color.
2021-02-26 15:46:02 +03:00
TatianaLopaeva
ca0c86f2d4
Web/Common: Fix active title of menu, fix transition without redirect.
2021-02-26 13:50:20 +03:00
Artem Tarasov
487fd2affc
Web: Components/Common: fix imports
2021-02-26 00:19:45 +03:00
Artem Tarasov
c35d0612f0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
2021-02-25 18:42:10 +03:00
Artem Tarasov
15602c3a8f
Web: Files: fix after merge
2021-02-25 18:41:06 +03:00
TatianaLopaeva
60ea0b189a
Web: Components: icon-button: Deleted default color.
2021-02-25 17:58:23 +03:00
TatianaLopaeva
dde6e2a78a
Web: Common: FilterInput: Deleted useless color.
2021-02-25 17:58:01 +03:00
Artem Tarasov
9b27d51ac5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
2021-02-25 17:57:32 +03:00
8b962cd88d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-02-25 17:20:19 +03:00
Artem Tarasov
48b3c6b445
Web: Common: fix after merge, fix imports and hierarchy
2021-02-25 17:20:11 +03:00
b4fa1b2bb1
Web: Files: fixed icons imports, fixed components imports, fixed files module
2021-02-25 17:20:06 +03:00
Artem Tarasov
69ed46e8ae
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
2021-02-25 15:27:36 +03:00
Artem Tarasov
989fba5ecc
Web: applied new import from appserver/common
2021-02-25 15:22:53 +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
TatianaLopaeva
4ed139caef
Web: Common: NavMenu: Fix styles of link and added history for transition without redirect.
2021-02-25 13:38:23 +03:00
TatianaLopaeva
65949fa1a9
Web: Common: Fix not displaying icons at nav and header.
2021-02-25 13:08:20 +03:00
89bc3bdd08
Web: Common: Fixed logout
2021-02-25 11:35:31 +03:00
Artem Tarasov
fe7cb5364d
Web: Common: chsnged component hierarchy
2021-02-25 11:04:22 +03:00
368b44071f
Web: Common: Added other props to routes
2021-02-25 10:10:39 +03:00
a84a0ae691
Web: Common: AuthStore: simplified init sub-stores
2021-02-25 10:09:50 +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
TatianaLopaeva
3e231d4920
Web: Components: drag-and-drop: Added theme support, moved styles to a separate file, update globalColors.
2021-02-10 10:29:18 +03:00
TatianaLopaeva
350ee86065
Web: Components: aside: Added theme support, moved styles to a separate file.
2021-02-10 10:09:26 +03:00
TatianaLopaeva
56f278641c
Web: Components: date-picker: Added theme support, moved styles to a separate file.
2021-02-09 19:00:54 +03:00
TatianaLopaeva
7f7a584399
Web: Components: badge: Added theme support, moved styles to a separate file.
2021-02-09 18:26:52 +03:00
TatianaLopaeva
37879c1fba
Web: Components: icon-button: Moved styles to a separate file.
2021-02-09 18:21:39 +03:00
TatianaLopaeva
3562b429d7
Web: Components: row-container: Moved styles to a separate file.
2021-02-09 17:50:25 +03:00
TatianaLopaeva
1e6e23f5a4
Web: Components: row: Added theme support, moved styles to a separate file.
2021-02-09 16:13:52 +03:00
TatianaLopaeva
67e908560c
Web: Components: request-loader: Added theme support, moved styles to a separate file, update globalColors.
2021-02-09 15:02:17 +03:00
TatianaLopaeva
60024bf11c
Web: Components: radio-button-group: Moved styles to a separate file.
2021-02-09 14:41:50 +03:00
TatianaLopaeva
1a8c63902c
Web: Components: radio-button: Added theme support, moved styles to a separate file, moved icons to svg folder.
2021-02-09 14:35:09 +03:00
TatianaLopaeva
d6c9244a81
Web: Components: progress-bar: Added theme support, moved styles to a separate file.
2021-02-09 13:44:12 +03:00
TatianaLopaeva
40e2d28a87
Web: Components: paging: Added theme support, moved styles to a separate file.
2021-02-09 13:18:59 +03:00
TatianaLopaeva
9f36a3ff5b
Web: Components: modal-dialog: Added theme support, moved styles to a separate file.
2021-02-09 11:56:15 +03:00
TatianaLopaeva
3dea889a98
Web: Components: main-button: Added theme support, moved styles to a separate file.
2021-02-09 11:13:52 +03:00
TatianaLopaeva
d61308f9a9
Web: input-block: Added import.
2021-02-08 18:02:21 +03:00
TatianaLopaeva
cb8e7013fe
Web: Components: link-with-dropdown: Added theme support, moved styles to a separate file.
2021-02-08 17:56:36 +03:00
TatianaLopaeva
bf9eb4aa48
Web: Components: input-block: Moved styles to a separate file.
2021-02-08 17:20:47 +03:00
TatianaLopaeva
a66047aeb4
Web: Components: save-cancel-buttons: Added theme support, moved styles to a separate file.
2021-02-08 11:04:27 +03:00
TatianaLopaeva
cca261bb5b
Web: Components: scrollbar: Added theme support, moved styles to a separate file.
2021-02-08 10:44:16 +03:00
TatianaLopaeva
6776aed153
Web: Components: search-input: Added theme support, moved styles to a separate file.
2021-02-08 10:27:42 +03:00
TatianaLopaeva
46f0d6f2c9
Web: Components: selected-item: Added theme support, moved styles to a separate file.
2021-02-08 10:18:03 +03:00
TatianaLopaeva
6d72708080
Web: Components: selector-add-button: Added theme provider, moved styles to a separate file.
2021-02-05 16:22:55 +03:00
TatianaLopaeva
cc4427e027
Web: Components: social-button: Added theme provider, moved styles to a separate file.
2021-02-05 16:05:09 +03:00
TatianaLopaeva
66e4516ffc
Web: Components: tabs-container: Added theme provider, moved styles to a separate file.
2021-02-05 15:27:29 +03:00
TatianaLopaeva
e6ef3f8c13
Web: Components: tooltip: Added theme support, moved styles to a separate file and rename components.
2021-02-05 14:10:15 +03:00
TatianaLopaeva
2ce881fbc0
Web: Components: context-menu-button: Added theme provider, moved styles to a separate file and rename components.
2021-02-05 13:51:26 +03:00
TatianaLopaeva
c54db2105c
Web: Components: combobox:combo-button: Added theme support for icons.
2021-02-05 13:10:03 +03:00
TatianaLopaeva
7ef82d9ead
Web: Components: heading: Added theme support and moved styles to a separate file.
2021-02-04 18:56:41 +03:00
TatianaLopaeva
ef3f027880
Web: Components: text: Added theme support and moved styles to a separate file.
2021-02-04 18:55:24 +03:00
TatianaLopaeva
1d0db2cf02
Web: Components: toggle-content: Added theme support and moved styles to a separate file.
2021-02-04 17:54:32 +03:00
TatianaLopaeva
e6a7ef7eda
Web: Components: toggle-button: Added theme support and moved styles to a separate file.
2021-02-04 16:52:53 +03:00
TatianaLopaeva
1b9669f393
Web: Components: combobox: Added theme into styles, moved styles to a separate file.
2021-02-04 13:28:48 +03:00
TatianaLopaeva
ec0d32df21
Web: Components: backdrop: Added theme into styles, added commonStyles, moved styles to a separate file.
2021-02-04 12:28:04 +03:00
TatianaLopaeva
668c10ddd0
Web: Components: avatar: Added theme into styles, added commonStyles, moved styles to a separate file.
2021-02-04 11:55:34 +03:00
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
TatianaLopaeva
af96aaf2b3
Web: Changed imports.
2021-02-01 16:10:02 +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
30ab7edfcf
Web: Fixed import errors
2021-01-27 10:29:15 +03:00
be63aecb39
Web: Changed logo link click to Link component
2021-01-26 10:20:31 +03:00
b9ed789746
Web: Applied WP:ModuleFederation best practices
2021-01-26 00:55:46 +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
ba86186c45
Web: Common: Fix displaying MenuIcon
2020-12-15 18:53:04 +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
7c51353970
Moved ModuleTile into Home page
2020-12-07 11:35:36 +03:00
1ed59c1694
Web: People: init People build and loading (Moved out from CRA)
2020-12-03 13:09:33 +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
d9d68b1633
Fixed import dependencies
2020-11-26 19:40:54 +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
afc3303301
web: components: Removed react-calendar-v2.13.2.tgz
2019-09-02 10:13:37 +03:00
79178a0edc
Changed folder for asc-web-components (npm-local/ -> packages/); Added react-calendar v2.13.2 (with important fix)
2019-08-19 13:30:18 +03:00
