Commit Graph

9760 Commits

Author SHA1 Message Date
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
Vladislav Makhov
31ec802664 Delete dialog: delete encrypted file bypassing recycle bin 2020-12-08 16:14:29 +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
Vladislav Makhov
42c6242d6c Add encrypted file icon 2020-12-08 15:01:52 +03:00
Diana
8e7e14bdca fix shared documents 2020-12-08 14:55:31 +03:00
Artem Tarasov
de11873bd4 Web: Components: group-buttons-menu: fixed display of disabled items 2020-12-08 14:54:39 +03:00
5e05907678 Web: Files: fixed getHeaderIndeterminate, getAccessedSelected selectors 2020-12-08 14:30:48 +03:00
Artem Tarasov
34d246deaf Web: Components/Files/People: z-index fix 2020-12-08 14:16:23 +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
Artem Tarasov
5446a6a24d Merge branch 'develop' into feature/version-hostory-redesign 2020-12-08 14:03:01 +03:00
Vladislav Makhov
fb465b3e05 Add security icon 2020-12-08 13:54:30 +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
Artem Tarasov
f632890cf2 web: common: bump version 2020-12-08 13:40:32 +03:00
d50349765f Web: Files: fixed the visibility of the frame in the sharing panel 2020-12-08 13:40:24 +03:00
Artem Tarasov
6af035a131 web: components: bump version 2020-12-08 13:40:18 +03:00
Artem Tarasov
31a8e30ee9 Web: Components: drop-down: refactoring 2020-12-08 13:40:12 +03:00
Artem Tarasov
52f0c1f96b Web: Components/Files: fix bugs, refactoring 2020-12-08 13:33:58 +03:00
TatianaLopaeva
34583dde7f Web: Common: Added logic for toasts that stack on top of each other and line up one after the other when clicked 2020-12-08 13:15:22 +03:00
Artem Tarasov
071f6c27c3 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-08 13:15:02 +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
Vladislav Makhov
c5cdb58682 Modified privacy folder context menu 2020-12-08 13:01:10 +03:00
Vladislav Makhov
24961eb732 Hide folder share button in private room 2020-12-08 12:54:19 +03:00
Vladislav Makhov
be238b41c2 Disable share button in private room, when only folders selected 2020-12-08 12:53:44 +03:00
Vladislav Makhov
5fd757073f Fix result toast text of shared encrypted file 2020-12-08 12:27:57 +03:00
Vladislav Makhov
3aff383486 Add saving encrypted file toast 2020-12-08 12:25:25 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Vladislav Makhov
b0aab4ddb9 Add sharing of encrypted file 2020-12-08 11:51:39 +03:00
Alexey Kostenko
60cc94c06d Web: Files: SharingPanel: Refactoring 2020-12-08 11:08:38 +03:00
Artem Tarasov
5a6469dffa Web: Components: backdrop: fixed collapse conditions dropdowns 2020-12-08 09:49:07 +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
Viktor Fomin
c2e133553a Web: Files: fixed filter closing 2020-12-07 21:02:27 +03:00
6847c21ae6
Merge pull request #147 from ONLYOFFICE/bugfix/wrong-import
Bugfix/wrong import
2020-12-07 20:58:48 +03:00
a60bbc97f4
Merge branch 'develop' into bugfix/wrong-import 2020-12-07 20:40:08 +03:00
Viktor Fomin
adf8c30470
Merge branch 'develop' into feature/floating-button 2020-12-07 20:22:20 +03:00
Viktor Fomin
70086c5cb7 Merge branch 'feature/floating-button' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 20:21:06 +03:00
c48b5783f1 People: search ignore case 2020-12-07 19:56:59 +03:00
TatianaLopaeva
47653a2999 web: common: bump version 2020-12-07 19:02:21 +03:00
TatianaLopaeva
f2a3355ae8 Web: Common: Changed import for selector getLanguage 2020-12-07 19:01:10 +03:00
Viktor Fomin
342a02d9b4 Web: Files: fixed filter closing 2020-12-07 18:52:22 +03:00
Alexey Kostenko
ac5b23f23a Web: Files: Fixed determining the file format 2020-12-07 18:07:45 +03:00
Vladislav Makhov
9c2238ad60 Comment out shouldComponentUpdate (temporary) 2020-12-07 17:33:01 +03:00