|
|
95f0d03e11
|
Fix open new document on desktop
|
2020-12-30 17:56:38 +03:00 |
|
Vladislav Makhov
|
d47f53c775
|
Fix share button in private room
|
2020-12-30 17:34:23 +03:00 |
|
Vladislav Makhov
|
97837afaa6
|
Fix delete button in private room
|
2020-12-30 17:33:19 +03:00 |
|
Vladislav Makhov
|
44ba6f350f
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 16:20:47 +03:00 |
|
Vladislav Makhov
|
8cec798da7
|
Remove unused code
|
2020-12-30 16:17:09 +03:00 |
|
|
|
3bdd023006
|
Merge branch 'master' into develop
|
2020-12-30 14:54:44 +03:00 |
|
Vladislav Makhov
|
5bc3704ca5
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# 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
|
2020-12-30 13:11:54 +03:00 |
|
Ilya Oleshko
|
365596cb8c
|
Web: Files : Fixed styles of new-files-panel for mobile
|
2020-12-30 12:37:48 +03:00 |
|
|
|
4dfd88daca
|
Files: EncryptionKeysConfig->CryptoEngineId
|
2020-12-30 12:24:49 +03:00 |
|
Artem Tarasov
|
b2317b3a06
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:16:05 +03:00 |
|
Artem Tarasov
|
3d7eada1a6
|
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
|
2020-12-30 12:15:50 +03:00 |
|
Vladislav Makhov
|
e2b7fecba5
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:09:55 +03:00 |
|
Vladislav Makhov
|
27783eaee4
|
web: files: fix paging
|
2020-12-30 12:09:28 +03:00 |
|
|
|
8c8acc089a
|
Web: Files: fixed dropdown in DownloadDialog
|
2020-12-30 12:07:55 +03:00 |
|
|
|
74aa0abca8
|
Bump version to v0.0.6
|
2020-12-29 19:43:37 +03:00 |
|
|
|
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 |
|
|
|
058d905286
|
Merge branch 'develop' into feature/change-owner-panel
|
2020-12-29 16:27:43 +03:00 |
|
|
|
32d9331c7d
|
Web: Files: fixed isCanShare selector
|
2020-12-29 16:22:24 +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 |
|
|
|
f5d9aca8c7
|
Merge branch 'develop' into feature/change-owner-panel
|
2020-12-29 15:41:56 +03:00 |
|
|
|
eeb0ab8779
|
Web: Files: fixed access selectors
|
2020-12-29 15:37:38 +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 |
|
|
|
e550726db8
|
Web: Files: added change owner to context menu
|
2020-12-29 09:42:41 +03:00 |
|
|
|
9d802dd929
|
Web: Files: update change owner panel styles
|
2020-12-29 09:41:29 +03:00 |
|
|
|
5a40792e9d
|
Web: Files: added change owner panel actions, added import
|
2020-12-29 09:40:22 +03:00 |
|
|
|
6e58a4caa6
|
Web: Files: updated getFilesContextOptions selector
|
2020-12-29 09:36:40 +03:00 |
|
|
|
ceaf1c230a
|
Web: Files: added ChangeOwnerPanel
|
2020-12-29 09:34:51 +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 |
|
