Commit Graph

63 Commits

Author SHA1 Message Date
2f8804653a Web: SectionBody: Deleted useless code. 2021-10-21 11:11:14 +03:00
5a3b7fdc6c Web: Common: PageLayout: Refactoring, deleted useless code. 2021-10-19 13:58:55 +03:00
b82dc5bf91 Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles. 2021-10-19 13:41:52 +03:00
30dc2623ba Web: Common: Fixed styles for body list without scroll. 2021-10-19 12:18:07 +03:00
52dfeaa6e7 Web: Disabled body selection for macOS (for touchpad). 2021-09-14 12:28:13 +03:00
019deb54ab Web: Common: fixed article scroll 2021-09-07 16:41:10 +03:00
7d69053fc1 Fixed Bug 52088 - Client.Files. Restricted the file selection for the select box 2021-09-02 18:03:42 +03:00
ccd7532161 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
ea31c0f258 Web: Files: Fixed article height for tablet view, deleted useless styles. 2021-08-26 15:05:21 +03:00
d223fb6406 Web: Components: Added application block visibility to article for tablet view. 2021-08-24 15:50:12 +03:00
0cfb70d9e2 Error 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-23 13:50:21 +03:00
b7df3903dd Web: Files: fixed the hiding of the article 2021-08-18 15:52:27 +03:00
3556497de6 Merge branch 'develop' into feature/personal 2021-07-08 14:38:26 +03:00
db7ea5c88f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-07-06 11:38:02 +03:00
1083fd8416 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
dae7215376 Web: Common: fixed article max width 2021-06-30 13:57:48 +03:00
0a82baea4c WebL Common: fixed article max width 2021-06-30 13:38:53 +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
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
249af955d1 Web: Files: added onSelect function for selectbox 2021-06-17 18:46:22 +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
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
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
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
389ee969a2 Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json" 2021-05-21 17:19:00 +03:00
Artem Tarasov
5996b3f74f Merge branch 'develop' into bugfix/fixed-styles 2021-05-20 01:00:36 +03:00
07934f6cd9 Web: Common: fixed firefox header 2021-05-18 17:59:34 +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
0d98b05210 Web: Files: fixed icons clickability 2021-05-13 16:57:10 +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
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
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
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
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
c324404767 Web: fixed firefox frame 2021-04-13 14:07:44 +03:00
c7017920e8 Web: fixed selection for mobile devices 2021-04-13 12:56:03 +03:00
5936640ce2 Web: fixed selection 2021-04-13 12:43:17 +03:00
8cfd5eb644 Web: Added SelectedFrame 2021-04-13 09:35:07 +03:00
TatianaLopaeva
6b7bc650da Web: components: Added margin-bottom for fixed height of article. 2021-04-06 17:23:32 +03:00