|
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 |
|
|
b88d418d41
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# 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/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-12-25 15:27:44 +03:00 |
|
|
62cd0a6af0
|
Test: fix test migrate, drop test db
|
2020-12-25 13:48: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 |
|
Diana
|
aa667a02ef
|
fix
|
2020-12-24 03:21:29 +03:00 |
|
Diana
|
e20b87447e
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-24 03:18:47 +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 |
|
|
21c96decdd
|
Filehandler: fix unhandled exception
|
2020-12-23 12:15:14 +03:00 |
|
Alexey Kostenko
|
ea8d5b471d
|
Web: Files: Fixed document type definitions in download us dialog
|
2020-12-23 12:09:30 +03:00 |
|
Alexey Kostenko
|
5f7f0b52f0
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-22 18:13:37 +03:00 |
|
Alexey Kostenko
|
ef079d932c
|
Web: Files: Disable button if only non-editable files or folders are selected
|
2020-12-22 18:13:28 +03:00 |
|
TatianaLopaeva
|
44a2303629
|
Web: Files: Fixed download video if the format is not supported by the player.
|
2020-12-22 18:05:46 +03:00 |
|
Vladislav Makhov
|
13cd456baf
|
web: files: fix notifications
|
2020-12-22 17:31:35 +03:00 |
|
Diana
|
9b338e0f78
|
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-22 15:37:10 +03:00 |
|
Vladislav Makhov
|
4252d27e4f
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-22 14:18:03 +03:00 |
|
Vladislav Makhov
|
f7c96b3d00
|
web: files: fix paging count view
|
2020-12-22 14:17:56 +03:00 |
|
Alexey Kostenko
|
30656f4256
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-22 13:04:11 +03:00 |
|
Alexey Kostenko
|
97a61b2f0d
|
Web: Files: Fixed share to twitter (Previously, only part of the link was shared)
|
2020-12-22 13:04:02 +03:00 |
|
Alexey Kostenko
|
fe682b1cf8
|
Web: Files: Fixed facebook share
|
2020-12-22 12:32:22 +03:00 |
|
|
06de1efbae
|
Update yarn.lock files
|
2020-12-22 11:59:57 +03:00 |
|
|
20c7ee108e
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-12-22 11:59:26 +03:00 |
|
|
1a48c54ec4
|
Web: Files: VersionHistory: fixed access to documents
|
2020-12-22 11:50:59 +03:00 |
|
Artem Tarasov
|
e6938def26
|
Web: Files VersionHistory: refactoring
|
2020-12-22 11:46:22 +03:00 |
|
Diana
|
589c17ac95
|
fix
|
2020-12-22 02:27:10 +03:00 |
|
Ilya Oleshko
|
7b671162b0
|
Web: Files : Added webm icon
|
2020-12-21 20:16:54 +03:00 |
|
Artem Tarasov
|
1e7008c031
|
Web: Files: fixed styles Loaders
|
2020-12-21 18:44:05 +03:00 |
|
Alexey Kostenko
|
c3fbf9fc93
|
Web: Files/People: Removed hover on mobile devices in page navigation buttons
|
2020-12-21 17:56:25 +03:00 |
|
Artem Tarasov
|
0a5619fd43
|
Web: Files: VersionHistory: refactoring
|
2020-12-21 17:01:36 +03:00 |
|
|
e197b05f07
|
Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4
|
2020-12-21 16:33:09 +03:00 |
|
|
62ce7a4c40
|
Web: Files: fixed download file
|
2020-12-21 16:32:59 +03:00 |
|
Artem Tarasov
|
17ac2f684d
|
Web: Files: VersionHistory: added redirect to PannelView when window is resized
|
2020-12-21 16:07:02 +03:00 |
|
Vladislav Makhov
|
c1d975e3ad
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-21 15:29:50 +03:00 |
|
Vladislav Makhov
|
54354ada3c
|
web: files: fix escape key press event
|
2020-12-21 15:29:28 +03:00 |
|
|
f4cd82f6f0
|
Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4
|
2020-12-21 15:28:43 +03:00 |
|
|
d90425af58
|
Web: Files: fixed create a file copy
|
2020-12-21 15:28:32 +03:00 |
|
Artem Tarasov
|
0a036a5343
|
Web: Files: VersionHistory: applied isTabletView flag, added redirect to a separate page if isTabletView = true
|
2020-12-21 15:22:23 +03:00 |
|
Vladislav Makhov
|
af6e67016d
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-21 14:18:44 +03:00 |
|
Vladislav Makhov
|
89f8195ab6
|
web: files: add notification, if create item with empty title
|
2020-12-21 14:18:32 +03:00 |
|
|
7c9a75a481
|
Files: fixed bunch query
|
2020-12-21 14:09:19 +03:00 |
|
Alexey Kostenko
|
551454683b
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-21 14:05:23 +03:00 |
|
Alexey Kostenko
|
cc4b91393a
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-21 14:04:57 +03:00 |
|
Alexey Kostenko
|
c949b160f9
|
Web: Files: DocEditor: Added meta data (favicon, title). Adding "*" when data is not saved. Changing title in DocEditor when changing filename
|
2020-12-21 14:04:40 +03:00 |
|
Vladislav Makhov
|
c8f6e4e5c8
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-21 14:02:24 +03:00 |
|
Vladislav Makhov
|
12758544c0
|
web: files: add handle special chars typing
|
2020-12-21 14:01:33 +03:00 |
|
|
60a4e56871
|
Web: Files: folders uploading is hidden on mobile devices
|
2020-12-21 13:50:40 +03:00 |
|
Alexey Kostenko
|
2183b6853b
|
Web: Files: DocEditor: Fixed page height detection
|
2020-12-21 13:40:55 +03:00 |
|
Artem Tarasov
|
5f87b4555d
|
Web: Files: VersionHistory: fix after merge develop
|
2020-12-21 13:27:13 +03:00 |
|
Artem Tarasov
|
bfd11ede79
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
|
2020-12-21 13:15:43 +03:00 |
|
|
7c1b44e394
|
Web: Files: Added redirect to login on opening internal file link without cookie
|
2020-12-21 12:14:35 +03:00 |
|
Vladislav Makhov
|
32449024b4
|
web: files: set original title, if item rename was canceled.
|
2020-12-21 10:10:02 +03:00 |
|
Vladislav Makhov
|
75164013f2
|
web: files: remove ability to save document title with a whitespace
|
2020-12-21 10:04:05 +03:00 |
|
Vladislav Makhov
|
ac9666918e
|
web: files: fix bug with selection
|
2020-12-18 19:13:49 +03:00 |
|
Alexey Kostenko
|
c4b1dfa3f5
|
Web: Files: Fixed internal media files link (on pages other than 1), and remove "preview" parameter from url after opening media viewer
|
2020-12-18 18:05:59 +03:00 |
|
Artem Tarasov
|
614d24b549
|
Web: Files: Settings: refactoring, fix firstLoad
|
2020-12-18 17:09:11 +03:00 |
|
Alexey Kostenko
|
61d2f93c48
|
Web: Files: Fixed a error when opening a media file by link
|
2020-12-18 16:24:25 +03:00 |
|
Artem Tarasov
|
8c8a3d60f1
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 15:37:44 +03:00 |
|
Artem Tarasov
|
7d8a523caa
|
Web: Files: Setiings: hidden settings connected clouds, fixed bug with getting settings
|
2020-12-18 15:37:31 +03:00 |
|
Vladislav Makhov
|
dda45f3282
|
web: files: Hide header menu in favorites dir, when selected file removed from favorites
|
2020-12-18 14:24:28 +03:00 |
|
Vladislav Makhov
|
ee1eaf22ae
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 13:40:23 +03:00 |
|
Vladislav Makhov
|
eadac50389
|
web: files: added toasts for move/copy operations
|
2020-12-18 13:39:56 +03:00 |
|
Vladislav Makhov
|
f1bd691ed6
|
web: files: add translations for move/copy operations
|
2020-12-18 13:31:26 +03:00 |
|
Vladislav Makhov
|
3ab85035a0
|
web: files: fix icon of progress bar
|
2020-12-18 13:30:12 +03:00 |
|
Vladislav Makhov
|
d94c01cdd8
|
web: files: remove unused translations
|
2020-12-18 13:29:04 +03:00 |
|
Alexey Kostenko
|
c4a5bad014
|
Web: Files: SharingSettings: Added internal link for folder
|
2020-12-18 11:55:03 +03:00 |
|