Vladislav Makhov
|
7ff435e5be
|
Fix circular dependencies
|
2020-12-07 17:32:00 +03:00 |
|
Alexey Kostenko
|
10183ff90b
|
Web: Files: Style fix, small refactoring
|
2020-12-07 16:58:02 +03:00 |
|
Vladislav Makhov
|
2c1c8dedb0
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
|
2020-12-07 16:03:47 +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 |
|
Vladislav Makhov
|
c94ff1ab41
|
Add sharing encrypted file options
|
2020-12-07 14:14:04 +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 |
|
Ilya Oleshko
|
40687cf093
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-07 13:55:05 +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 |
|
Ilya Oleshko
|
32c0c6fb85
|
Merge branch 'bugfix/login-fix' into develop
|
2020-12-07 13:44:41 +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 |
|
Viktor Fomin
|
b693cbdd4f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 13:19:32 +03:00 |
|
Ilya Oleshko
|
4147d2f31a
|
Web: Fixed temp loaders
|
2020-12-07 11:11:04 +03:00 |
|
|
|
9b559a6df0
|
Files: fix get share info
|
2020-12-07 11:02:37 +03:00 |
|
Alexey Kostenko
|
4264345556
|
Web: Files: Fixed styles in EmbeddingPanel
|
2020-12-07 10:40:59 +03:00 |
|
Alexey Kostenko
|
3c2c0140c4
|
Web: Components: Added prop "color" to TextArea component
|
2020-12-07 10:40:18 +03:00 |
|
Ilya Oleshko
|
830fbfb6a3
|
web: common: bump version
|
2020-12-07 09:52:39 +03:00 |
|
Ilya Oleshko
|
049f7971f1
|
web: components: bump version
|
2020-12-07 09:52:29 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +03:00 |
|
Ilya Oleshko
|
cd100eba85
|
Web: Client: Fixed redirect after actions
|
2020-12-07 09:43:40 +03:00 |
|
Alexey Kostenko
|
b822342387
|
Web: Files: SharingPanel: Fixed clickable area in combo button in peopleSelector/groupSelector
|
2020-12-07 09:33:16 +03:00 |
|
|
|
2baf8cbc76
|
Fixed confirm link user creation
|
2020-12-04 17:15:00 +03:00 |
|
Alexey Kostenko
|
744898d94d
|
Web: Files: Style fix
|
2020-12-04 16:54:13 +03:00 |
|
|
|
c764812d3a
|
Common: refactoring
|
2020-12-04 16:48:54 +03:00 |
|
Alexey Kostenko
|
e6483213d5
|
Web: Files: Removed dropdown in internal link icon, style fix
|
2020-12-04 15:56:39 +03:00 |
|
Artem Tarasov
|
93da24a63a
|
Web: Common/Files/People: fixed z-index
|
2020-12-04 14:58:37 +03:00 |
|
Artem Tarasov
|
089e398fed
|
Web: Components: drop-down: fixed passing props style
|
2020-12-04 14:58:05 +03:00 |
|
|
|
0784453daf
|
Fix errors on login and logout
|
2020-12-04 14:21:51 +03:00 |
|
Alexey Kostenko
|
ab71a6dd33
|
Web: Files/Common: Refactoring, changing access type to external share link
|
2020-12-04 14:09:31 +03:00 |
|
|
|
d39c2524c3
|
Files: refactoring
|
2020-12-04 13:52:07 +03:00 |
|
Vladislav Makhov
|
a3bd0823c6
|
Refactoring
|
2020-12-04 12:59:48 +03:00 |
|
Vladislav Makhov
|
18bec4ee4b
|
fix updateFileStream
|
2020-12-04 12:59:16 +03:00 |
|
Vladislav Makhov
|
d7fd6aecdb
|
Remove unused code
|
2020-12-04 12:57:32 +03:00 |
|
Vladislav Makhov
|
72b9a10e82
|
Fix dispatch error
|
2020-12-04 12:13:51 +03:00 |
|
Ilya Oleshko
|
c32fc83399
|
Web: Client: Fixed property name, added missing property
|
2020-12-04 11:58:15 +03:00 |
|
Artem Tarasov
|
55928c4207
|
web: common: bump version
|
2020-12-04 11:52:40 +03:00 |
|
Artem Tarasov
|
4a8ba1493f
|
web: components: bump version
|
2020-12-04 11:52:31 +03:00 |
|
Artem Tarasov
|
1ea04f44bb
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-04 11:51:31 +03:00 |
|
Artem Tarasov
|
ffcfc11587
|
Web: Components: Backdrop: fixed backdrop overlay
|
2020-12-04 11:50:21 +03:00 |
|
Artem Tarasov
|
06c132777a
|
Web: Common/Components: removed binding to id, added passing and binding className
|
2020-12-04 11:41:56 +03:00 |
|
Ilya Oleshko
|
d03584fcdd
|
Web: Fixed isAuthenticated logic
|
2020-12-04 11:38:15 +03:00 |
|
Ilya Oleshko
|
0f1c50a765
|
Merge pull request #143 from ONLYOFFICE/bugfix/new-files-panel-fix
Bugfix/new files panel fix
|
2020-12-04 11:06:34 +03:00 |
|
|
|
5291c2b11c
|
Merge branch 'develop' into bugfix/new-files-panel-fix
|
2020-12-04 10:58:05 +03:00 |
|
