Commit Graph

9039 Commits

Author SHA1 Message Date
be497b0f3a web: common: bump version 2020-12-10 18:38:49 +03:00
b85faae56b Web: Common: fixed filter update 2020-12-10 18:41:42 +03:00
4c9db8c0cb Web: Files: COMMENTED conversation functional 2020-12-10 18:24:19 +03:00
Viktor Fomin
d7d14b1bd2 Web: Common: show alert if convert error 2020-12-10 16:14:28 +03:00
74b3777fe7 Config: Added url to local DocumentServer 2020-12-09 21:43:57 +03:00
Viktor Fomin
60f11e4a18 Web: Files: fixed fileId 2020-12-09 19:38:00 +03:00
Viktor Fomin
ba06aaf913 Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation 2020-12-09 18:39:54 +03:00
09ce302b57 Web: Files: Init new conversation process 2020-12-09 18:37:24 +03:00
Viktor Fomin
240d9acadd Web: Files: fix 2020-12-09 16:53:05 +03:00
Viktor Fomin
f66e091b42 Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation 2020-12-09 16:48:58 +03:00
2e0762b2c3 Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-09 16:19:03 +03:00
4903bb4c91 Web: Files: Fixed uploading additional files when the upload has already started 2020-12-09 15:57:56 +03:00
Viktor Fomin
07d7fd70df Web: Files: fixed loading 2020-12-09 15:40:44 +03:00
bd18aa1415 Web: Files: Re-written uploading process to async controlled chain calls 2020-12-09 13:54:04 +03:00
254b03032f Web: Common: Fixed status of undefined 2020-12-09 13:52:47 +03:00
Viktor Fomin
c4cad309b3 Web: Files: fixed 2020-12-09 10:57:00 +03:00
76465323ff
Merge pull request #146 from ONLYOFFICE/bugfix/sharing-settings
Bugfix/sharing settings
2020-12-08 19:35:31 +03:00
4d88b2fc28 Update yarn.lock files 2020-12-08 18:37:19 +03:00
e4a43ff558 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 18:26:11 +03:00
Alexey Kostenko
3c6639c9c9 web: components: bump version 2020-12-08 18:26:47 +03:00
Alexey Kostenko
06d6994b34 web: common: bump version 2020-12-08 18:26:38 +03:00
Alexey Kostenko
0e2db11c9d Web: Files: SharingPanel: Added new access option - "FilterEditing" 2020-12-08 18:26:27 +03:00
Alexey Kostenko
b0903aa99b Web: Common: added CustomFilter constant 2020-12-08 18:25:17 +03:00
Alexey Kostenko
3a94023ba7 Web: Components: Added custom filter icon 2020-12-08 18:24:04 +03:00
ce4a3e3338 Update yarn.lock files 2020-12-08 18:17:46 +03:00
c8f7555017 Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2020-12-08 18:06:31 +03:00
Alexey Kostenko
bc5b17367c Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 17:45:40 +03:00
Alexey Kostenko
74fb9dc052 web: components: bump version 2020-12-08 17:45:19 +03:00
Alexey Kostenko
96e946491a web: common: bump version 2020-12-08 17:45:08 +03:00
Alexey Kostenko
66e82c9206 Web: Files: Updated selector 2020-12-08 17:35:22 +03:00
Alexey Kostenko
92dfd37737 Web: Files: SharingPanel: Fixed possible access types of file 2020-12-08 17:31:01 +03:00
973bc1e955
Merge pull request #127 from ONLYOFFICE/feature/floating-button
Feature/floating button
2020-12-08 17:12:25 +03:00
Viktor Fomin
ad2075c62e Web: Files: fixed folder jump 2020-12-08 16:25:21 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
9f778af8bd web: common: bump version 2020-12-08 15:13:29 +03:00
42bfa9a3a6 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 15:12:42 +03:00
694daae135 Fixed redirection to default page if already logged-in 2020-12-08 15:12:33 +03:00
5e05907678 Web: Files: fixed getHeaderIndeterminate, getAccessedSelected selectors 2020-12-08 14:30:48 +03:00
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Ilya Oleshko
bd13067d0b Web: Added fast-deep-equal 2020-12-08 14:08:26 +03:00
a23909df51 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 13:53:31 +03:00
d50349765f Web: Files: fixed the visibility of the frame in the sharing panel 2020-12-08 13:40:24 +03:00
47fb514642 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
2020-12-08 13:12:22 +03:00
f0d2e61f68 Web: Files: Refactoring 2020-12-08 13:11:19 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Alexey Kostenko
60cc94c06d Web: Files: SharingPanel: Refactoring 2020-12-08 11:08:38 +03:00
Viktor Fomin
e1947368bf Web: Files: fixed filter closing 2020-12-07 21:42:22 +03:00
Viktor Fomin
39e5119080 Web: Files: fixed filter closing 2020-12-07 21:16:53 +03:00
Viktor Fomin
b1088ad547 Merge branch 'feature/floating-button' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:36 +03:00
Viktor Fomin
d9e95dabab Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:07 +03:00