Commit Graph

868 Commits

Author SHA1 Message Date
5ec0001797 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-31 15:01:38 +03:00
701e61a6d1 Fix Bug 52188 - Client.Files. Fixed filter reset 2021-08-31 15:01:31 +03:00
e4c34e5068 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-30 16:24:22 +03:00
6e987786f4 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-30 16:24:16 +03:00
9236a83ab8 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-30 16:04:45 +03:00
880d73ae22 Fix Bug 52269 - Client. Files. Removed sorting by "Author" for personal 2021-08-30 16:04:35 +03:00
51c2341248 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-30 15:59:17 +03:00
e1f320c2f1 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-27 17:45:59 +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
2a872fe337 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-27 17:10:26 +03:00
45865753a2 Web: Components: Table: fixed onResize error 2021-08-27 14:18:13 +03:00
a4d12a2c75 Web: Files: removed console.log 2021-08-27 14:06:24 +03:00
f740b63fa5 Web: Components: fixed hasAccess 2021-08-26 17:50:27 +03:00
6bb9cb2235 Web: People: fixed user access for module People 2021-08-26 17:47:21 +03:00
833cd9553c Web: Files: fixed FilesTableRow after merge 2021-08-26 16:20:02 +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
c66268a9c2 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
1bda036a9f Merge branch 'develop' into bugfix/render-optimization 2021-08-26 10:32:32 +03:00
c81a28f48f Web: Common: fixed onError 2021-08-25 17:54:08 +03:00
e5c15cb7a7 Web: Files: Table: fixed drag styles 2021-08-25 16:53:26 +03:00
8727b504b7 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
2021-08-25 16:48:07 +03:00
248d70cbf9 Web: Components: group-button: Added alt text for component 2021-08-24 16:31:16 +03:00
91199a0de0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-24 15:50:17 +03:00
d223fb6406 Web: Components: Added application block visibility to article for tablet view. 2021-08-24 15:50:12 +03:00
b46a3ae6f0 Web: Common: PrivateRoute: fixed redirect to login 2021-08-24 11:47:00 +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
c295f1a77c Web: Files: fixed routing to the service folder 2021-08-20 13:23:53 +03:00
0870d65c20 Web: Common: added video loaded error 2021-08-20 12:06:00 +03:00
36987fb1f3 Web: Remove useless condition, defined display type of panels. 2021-08-19 18:35:04 +03:00
31bee632e0 Web: Common: fixed MediaViewer 2021-08-19 13:30:42 +03:00
b97e9d1fd7 Web: Common: added utils for load script 2021-08-19 13:30:15 +03:00
3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
dd3140129b Fix bug 51929: view tiff format 2021-08-19 05:23:50 +03:00
7cde8b26f1 Web: Common: MediaViewer refactoring 2021-08-19 04:10:32 +03:00
f53d7eb718 Web: Common: fixed article unpin 2021-08-18 17:17:45 +03:00
46a97efb52 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
2021-08-18 16:59:00 +03:00
b7df3903dd Web: Files: fixed the hiding of the article 2021-08-18 15:52:27 +03:00
34408c6e41 Web: Components: added style props for snackbar 2021-08-17 21:20:31 +03:00
88d18dd648 Web: Files: fixed row styles 2021-08-17 17:55:11 +03:00
b4d6beb1ae Web: Common: fixed main-snackbar style 2021-08-17 17:54:42 +03:00
48c6d35a20 Web: AuthStore: Removed useless code 2021-08-17 16:32:19 +03:00
93c2b06f06 Web: Files: removed unused code 2021-08-17 15:38:59 +03:00
6ebffc1784 Web: Components: fixed Link re-render 2021-08-17 15:19:33 +03:00
e8991a612b Fix bug Bug 51927: MediaViewer updateHammer TypeError 2021-08-17 01:00:07 +03:00
e634b5c72f Web: Editor: Fixed converting file when open in new tab. 2021-08-16 13:17:49 +03:00
fce37422f4 Web: Components: fixed styled, fixed isViewedSelected error 2021-08-16 12:15:36 +03:00
9715719994 Merge branch 'develop' into bugfix/canShare 2021-08-16 11:07:30 +03:00
f5e9e17e11 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-16 10:53:48 +03:00