Artem Tarasov
|
1430dace28
|
Web: fix after merdge
|
2021-06-23 00:00: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 |
|
|
|
e27cee4535
|
Web: Common: fixed selection
|
2021-06-22 09:56:48 +03:00 |
|
|
|
a55544454a
|
Web: Common: added support scroll to selectbox, fixed styles
|
2021-06-18 17:17:59 +03:00 |
|
|
|
0005169b2b
|
Web: Common: fixed dragCondition
|
2021-06-18 14:10:20 +03:00 |
|
|
|
7905b07c0c
|
Web: Files: added dragCondition to Selecto
|
2021-06-18 13:53:32 +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 |
|
|
|
249af955d1
|
Web: Files: added onSelect function for selectbox
|
2021-06-17 18:46:22 +03:00 |
|
|
|
df70473ce5
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-17 17:19:17 +03:00 |
|
Artem Tarasov
|
a8fe50142c
|
Web: Tree: fixed position of scrollbar on tablet
|
2021-06-17 15:01:35 +03:00 |
|
|
|
741de9f2f7
|
Web: Files: added react-selecto library
|
2021-06-17 14:36:45 +03:00 |
|
|
|
0aa2eb3e85
|
Web: Files: removed react-selectable-fast library
|
2021-06-17 14:27:41 +03:00 |
|
Artem Tarasov
|
f8e28e5952
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
|
2021-06-15 14:06:29 +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 |
|
|
|
5db2e8a868
|
Merge branch 'develop' into feature/restore-files-convertation
|
2021-06-11 17:50:28 +03:00 |
|
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 |
|
|
|
59bab6a085
|
Web: Files: fixed conversion progress
|
2021-06-09 13:28:22 +03:00 |
|
|
|
4d9c26545e
|
Web: Files: added conversion progress
|
2021-06-07 16:20:18 +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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
1b940de5e2
|
Web: Common: removed I18nextProvider from PageLayout
|
2021-05-24 16:24:23 +03:00 |
|
|
|
389ee969a2
|
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
|
2021-05-21 17:19:00 +03:00 |
|
|
|
cda77e1234
|
Merge branch 'develop' into bugfix/context-actions
|
2021-05-20 13:24:18 +03:00 |
|
|
|
fc822e5ad5
|
Web: Fix setModuleInfo usage
|
2021-05-20 11:27:50 +03:00 |
|
Artem Tarasov
|
5996b3f74f
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-05-20 01:00:36 +03:00 |
|
|
|
d55c953805
|
Web: Files: fixed MediaViewer propTypes
|
2021-05-19 13:45:37 +03:00 |
|
|
|
07934f6cd9
|
Web: Common: fixed firefox header
|
2021-05-18 17:59:34 +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
|
f7c880c56e
|
Web: Common: PageLayout: fixed position scrollbar in article
|
2021-05-16 00:49:10 +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 |
|
|
|
0d98b05210
|
Web: Files: fixed icons clickability
|
2021-05-13 16:57:10 +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 |
|
|
|
9ea5a131e8
|
Web: Files: fixed MediaViewer crash
|
2021-05-12 11:55:34 +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 |
|
|
|
71e1468835
|
Web: Common: fixed MediaViewer styles
|
2021-05-06 12:52:19 +03:00 |
|
|
|
605f7d749e
|
Web: Components: FloatingButton: Added rotation on percent === 0
|
2021-05-04 22:14:42 +03:00 |
|
|
|
d55b39a653
|
Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog
|
2021-04-30 14:02:58 +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 |
|
|
|
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 |
|
|
|
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 |
|
