|
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 |
|
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 |
|
|
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 |
|
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 |
|
Alexey Kostenko
|
10183ff90b
|
Web: Files: Style fix, small refactoring
|
2020-12-07 16:58:02 +03:00 |
|
Alexey Kostenko
|
eb4f5c2085
|
Web: Files: Removed link highlighting on click
|
2020-12-07 15:36:50 +03:00 |
|
Viktor Fomin
|
982ce4e12c
|
Merge branch 'develop' into feature/floating-button
|
2020-12-07 14:50:49 +03:00 |
|
Viktor Fomin
|
2be2085655
|
Update yarn.lock files
|
2020-12-07 14:48:09 +03:00 |
|
Viktor Fomin
|
04a009543d
|
Web: Common: fixed folder id
|
2020-12-07 14:43:00 +03:00 |
|
Alexey Kostenko
|
bc8efccf1b
|
Web: Files: SharingPanel: Style fix
|
2020-12-07 14:34:41 +03:00 |
|
Alexey Kostenko
|
d873db91ca
|
web: common: bump version
|
2020-12-07 14:13:31 +03:00 |
|
Alexey Kostenko
|
b1373ddef7
|
web: components: bump version
|
2020-12-07 14:13:21 +03:00 |
|
Alexey Kostenko
|
98e1d94ea7
|
Web: Files: Fixed header style
|
2020-12-07 13:52:57 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
|
dbc30ff4ce
|
Merge pull request #145 from ONLYOFFICE/bugfix/login-fix
Bugfix/login fix
|
2020-12-07 13:42:42 +03:00 |
|
|
a2f1bada5e
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 13:26:55 +03:00 |
|
Viktor Fomin
|
f8dcb6c59e
|
Web: Files: fixed uploading files, added refresh files
|
2020-12-07 13:20:07 +03:00 |
|