|
|
d54a5a0656
|
Added reqDesktop on DocEditor page
|
2020-12-29 18:43:12 +03:00 |
|
|
|
7b4dc42620
|
Fix displaying header pre-loader on Desktop
|
2020-12-29 17:19:02 +03:00 |
|
Vladislav Makhov
|
e6cf51575a
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 16:08:08 +03:00 |
|
|
|
1e69a3a416
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-29 16:05:02 +03:00 |
|
|
|
43bd3f6541
|
Files: openedit. EncryptionKeys
|
2020-12-29 16:04:50 +03:00 |
|
|
|
39a0cb99de
|
Update yarn.lock files
|
2020-12-29 14:03:05 +03:00 |
|
Vladislav Makhov
|
a4c4637453
|
Fix notification
|
2020-12-29 13:20:25 +03:00 |
|
Vladislav Makhov
|
7dfdae8a72
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 09:33:55 +03:00 |
|
|
|
f18d535cb1
|
Merge branch 'develop' into feature/upgrade-dependencies
|
2020-12-28 18:30:50 +03:00 |
|
Vladislav Makhov
|
d840506715
|
Fix desktop styles
|
2020-12-28 16:49:01 +03:00 |
|
|
|
e6943a4544
|
Merge branch 'develop' into feature/11.0.2
|
2020-12-28 16:28:26 +03:00 |
|
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
Vladislav Makhov
|
737605b01e
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
|
2020-12-28 11:34:26 +03:00 |
|
|
|
a21fff2ab1
|
Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0".
|
2020-12-28 11:04:34 +03:00 |
|
Vladislav Makhov
|
2ff0b2471d
|
Add isEditor param to regDesktop
|
2020-12-28 10:40:50 +03:00 |
|
|
|
16b312b7fb
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-28 09:28:38 +03:00 |
|
|
|
2fdcbee8ef
|
Files: pass CallbackUrl. Fix trackedit.
|
2020-12-25 23:25:37 +03:00 |
|
|
|
2be04b3bc0
|
Update package.json and yarn.lock files
|
2020-12-25 17:48:11 +03:00 |
|
|
|
d09bc13b93
|
Web: Files: fixed share translations
|
2020-12-25 17:00:09 +03:00 |
|
|
|
9f8ff83084
|
Update yarn.lock files
|
2020-12-25 16:24:26 +03:00 |
|
|
|
2b08c711dc
|
Update Create-react-app to v4.0.1
|
2020-12-25 16:01:04 +03:00 |
|
Vladislav Makhov
|
497b725a59
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/store/auth/reducer.js
|
2020-12-25 12:58:30 +03:00 |
|
|
|
25817f24ae
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-25 12:38:03 +03:00 |
|
|
|
20900eeb72
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-12-25 12:09:52 +03:00 |
|
|
|
d0ce5585a5
|
Files: fixed query
|
2020-12-24 22:05:39 +03:00 |
|
|
|
644142b952
|
Web: Files: fixed link for Twitter and Facebook
|
2020-12-24 14:06:32 +03:00 |
|
|
|
9350f1189e
|
Bump version to v0.0.5
|
2020-12-24 12:22:48 +03:00 |
|
|
|
1e234ed4aa
|
Web: Files: moved getAccessIcon to selectors
|
2020-12-24 11:28:34 +03:00 |
|
Artem Tarasov
|
e4ae387718
|
Web: Files: VersionHistory: refactoring
|
2020-12-24 10:52:34 +03:00 |
|
|
|
9fbf5a5be5
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
|
2020-12-24 10:52:01 +03:00 |
|
Vladislav Makhov
|
79989f7bf4
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-24 10:21:02 +03:00 |
|
Artem Tarasov
|
5df8b7cc5b
|
Web: Files: VersionHistory: Ver. added to translation
|
2020-12-24 10:15:50 +03:00 |
|
Artem Tarasov
|
465765338c
|
Web: Files: versionHistory: fix after merge
|
2020-12-24 10:05:26 +03:00 |
|
Artem Tarasov
|
d756354ece
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# web/ASC.Web.Common/package.json
|
2020-12-24 09:47:22 +03:00 |
|
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
Artem Tarasov
|
ae1a0cd8c1
|
Web: Files: versionHistory: applied new actions, removed unnecessary api requests
|
2020-12-23 19:29:05 +03:00 |
|
Artem Tarasov
|
4576f13c9e
|
Web: Files: versionHistory: fix actions
|
2020-12-23 18:53:09 +03:00 |
|
Vladislav Makhov
|
87ffdf40ad
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-12-23 17:56:44 +03:00 |
|
Vladislav Makhov
|
248e032e10
|
web: files: fix paging combo box
|
2020-12-23 17:55:58 +03:00 |
|
Artem Tarasov
|
8b4762b9a7
|
Web: Files: versionHistory: added action updateCommentVersion
|
2020-12-23 17:46:27 +03:00 |
|
Artem Tarasov
|
b15e6db9cc
|
Web: Files: versionHistory: added action restoreVersion
|
2020-12-23 16:54:12 +03:00 |
|
|
|
f3a45738a1
|
Web: Files: fix merge
|
2020-12-23 16:13:12 +03:00 |
|
Artem Tarasov
|
6498cd542e
|
Web: Files: versionHistory: added action markAsVersion
|
2020-12-23 15:40:07 +03:00 |
|
Ilya Oleshko
|
b77a6c987f
|
Web: Files : Fixed displaying version actions if not full access
|
2020-12-23 14:12:05 +03:00 |
|
Ilya Oleshko
|
b0edb012c8
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-23 13:38:33 +03:00 |
|
Artem Tarasov
|
274b147a3c
|
Web: Files: VersionHistory: added action fetchFileVersions
|
2020-12-23 13:38:10 +03:00 |
|
Ilya Oleshko
|
6162918d5c
|
Web: Files : Fixed context actions for visitors. Added open action to folder
|
2020-12-23 13:36:29 +03:00 |
|
|
|
14aef6259f
|
Web: Files: fixed display of conversion in the download as dialog
|
2020-12-23 13:33:23 +03:00 |
|
Vladislav Makhov
|
3cbf601f8d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 12:58:11 +03:00 |
|
|
|
7803696e01
|
Update yarn.lock files
|
2020-12-23 12:43:27 +03:00 |
|
