Commit Graph

97 Commits

Author SHA1 Message Date
50becafef7 Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox 2021-09-24 15:07:44 +03:00
d702b47502 Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox 2021-09-21 14:01:06 +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
ff7f3926ce Merge branch 'develop' into feature/table-view
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	public/locales/de/Common.json
#	public/locales/it/Common.json
#	public/locales/lo/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
26c5d2ed90 Web: Common: PageLayout: moved isArticlePinned to settingsStore 2021-08-26 15:07:29 +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
b4d6beb1ae Web: Common: fixed main-snackbar style 2021-08-17 17:54:42 +03:00
2abbd580c2 Merge branch 'develop' into feature/table-view
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-07-28 16:53:23 +03:00
d86605e2da Web: Files: added drag and drop for table 2021-07-23 18:13:06 +03:00
ee453f8111 Web: Common: fixed main-bar style 2021-07-21 12:51:03 +03:00
c92d8318f1 Web: Files: fixed header sorting, removed unused code 2021-07-21 12:16:46 +03:00
0297620036 Fix SnackBar usage 2021-07-09 17:25:20 +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
a31dc583c1 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
69889cab4c Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/constants.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +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
50556cb428 Web: Thumbnails: deleted unnecessary code, refactoring 2021-06-25 14:30:14 +03:00
c8184e9dc0 Web: Files: fixed privacy bugs 2021-06-23 15:39:43 +03:00
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
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
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
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
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
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
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
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