Artem Tarasov
|
d73bb73dab
|
Web: Components: rewrited component SwitchButton to ViewSelector
|
2021-06-29 15:27:46 +03:00 |
|
|
b0f64ca924
|
Merge branch 'develop' into feature/personal
|
2021-06-29 14:50:51 +03:00 |
|
Artem Tarasov
|
d98954d921
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-25 15:41:12 +03:00 |
|
|
9462cd7bdd
|
Web: Storybook: Update package.json
|
2021-06-25 14:19:42 +03:00 |
|
Artem Tarasov
|
2d9c33a8c6
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
|
2021-06-22 23:46:35 +03:00 |
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
|
8963df11c3
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-06-22 13:41:22 +03:00 |
|
|
b1662e7ac6
|
Web: Init maintenance displaying
|
2021-06-22 13:41:11 +03:00 |
|
|
a55544454a
|
Web: Common: added support scroll to selectbox, fixed styles
|
2021-06-18 17:17:59 +03:00 |
|
Artem Tarasov
|
83549b62cd
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-06-18 12:02:10 +03:00 |
|
|
b7ce849e32
|
Web: Components: Theme: Fixed line height for ComboBox component
|
2021-06-18 09:57:02 +03:00 |
|
|
b088c925d6
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-17 15:47:33 +03:00 |
|
Artem Tarasov
|
a8fe50142c
|
Web: Tree: fixed position of scrollbar on tablet
|
2021-06-17 15:01:35 +03:00 |
|
|
65378cc089
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
|
2021-06-15 11:49:39 +03:00 |
|
Artem Tarasov
|
ee4760e899
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
|
2021-06-11 18:30:44 +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 |
|
|
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
|
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 |
|
|
60a7e84f60
|
Web: ProfileAction : Added locale usage for DateInput
|
2021-06-02 12:04:26 +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 |
|
|
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 |
|
|
757e90ee7a
|
Web: Components: fixed help-button iconName path
|
2021-05-26 17:16:32 +03:00 |
|
|
7e19a25b0c
|
Web: fixed text styles
|
2021-05-24 14:30:11 +03:00 |
|
Alexey Kostenko
|
fbbec464d7
|
Web: Components: Updated ToggleButton (Added animation - framer-motion, and isLoading prop)
|
2021-05-20 19:11:44 +03:00 |
|
|
16d6db9054
|
Web: Files: fixed context-menu drag
|
2021-05-20 12:54:16 +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 |
|
Alexey Kostenko
|
f25eb00494
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-05-19 18:05:19 +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 |
|
|
6c51f15d28
|
Web: Components: fixed toggle-button styles
|
2021-05-18 17:58:45 +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 |
|
Alexey Kostenko
|
1d036e33d6
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-05-14 13:13:34 +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 |
|
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 |
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
14719ed698
|
Web: Components: fixed checkbox icons style
|
2021-04-27 14:31:05 +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 |
|
|
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 |
|
|
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
|
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
|
691e7d5498
|
Merge branch 'develop' into feature/oauth2.0
|
2021-04-21 15:04:26 +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 |
|
|
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 |
|
|
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
|
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 |
|
TatianaLopaeva
|
297e4f42e9
|
Merge branch 'develop' into feature/team-template
|
2021-04-16 09:25:43 +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 |
|
|
13d083f01c
|
Web: GroupMenu: Fix wrong items title displaying
|
2021-04-15 10:54:12 +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 |
|
|
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 |
|
|
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 |
|
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 |
|
Artem Tarasov
|
3ee7541e54
|
Web: Components/People: fixed translation in PasswordInput
|
2021-04-07 14:41:46 +03:00 |
|
Artem Tarasov
|
6eb9f8eeaa
|
Web: Components: fixed size of sharing icon in the context menu
|
2021-04-06 18:51:11 +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
|
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 |
|
Ilya Oleshko
|
3c4cd300a3
|
Web: Components: ContextMenuButton: Added to boolean for isMobile
|
2021-04-02 19:33:17 +03:00 |
|