Vladislav Makhov
|
b8b454a438
|
Modified header menu for Private Room
|
2020-12-03 15:54:29 +03:00 |
|
Alexey Kostenko
|
5fe44c3976
|
Web: Files/Common: Change access type to external link, refactoring, applied prettier style fix
|
2020-12-03 15:18:38 +03:00 |
|
Vladislav Makhov
|
f240c8da00
|
Modified context menu for Private Room
|
2020-12-03 14:23:08 +03:00 |
|
Viktor Fomin
|
2482f12e3e
|
Web: Files: fixed uploading files
|
2020-12-03 14:17:40 +03:00 |
|
Vladislav Makhov
|
f188489c06
|
Refactoring
|
2020-12-03 12:12:14 +03:00 |
|
Vladislav Makhov
|
3064eb302b
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# web/ASC.Web.Common/src/pages/login/index.js
|
2020-12-03 09:59:20 +03:00 |
|
Vladislav Makhov
|
e911caf665
|
Creating encrypted file in desktop
|
2020-12-02 16:45:09 +03:00 |
|
Vladislav Makhov
|
95c13950cb
|
Refactoring
|
2020-12-02 16:42:10 +03:00 |
|
Vladislav Makhov
|
293d545175
|
rename getEncryptionSupport to getIsEncryptionSupport
|
2020-12-02 16:41:52 +03:00 |
|
Alexey Kostenko
|
6be36a65cd
|
Web: Files: SharingPanel: Changing access type external link by toggle button
|
2020-12-02 15:31:43 +03:00 |
|
Alexey Kostenko
|
541cedeb4f
|
Web: Files: Revert local changes
|
2020-12-02 11:21:17 +03:00 |
|
Alexey Kostenko
|
23b209b85c
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-02 09:14:36 +03:00 |
|
Alexey Kostenko
|
2f61c821bf
|
Web: Files: Opening editor without authorization
|
2020-12-02 08:56:42 +03:00 |
|
Ilya Oleshko
|
eb2ae72026
|
Web: Files : Components: Hide logs
|
2020-12-01 17:19:07 +03:00 |
|
Viktor Fomin
|
0d1f1a4599
|
Update yarn.lock files
|
2020-12-01 16:26:13 +03:00 |
|
Viktor Fomin
|
133b1bfc39
|
Web: Files: fixed files uploading
|
2020-12-01 16:25:49 +03:00 |
|
Viktor Fomin
|
1c8b7115a5
|
Web: Common: fixed files uploading
|
2020-12-01 14:06:57 +03:00 |
|
Viktor Fomin
|
8c8475bd51
|
Web: Common: fixed percent calculation
|
2020-11-30 19:12:16 +03:00 |
|
Viktor Fomin
|
2c8b384ef1
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-30 15:17:48 +03:00 |
|
Vladislav Makhov
|
813c9c4b1d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-11-30 15:16:49 +03:00 |
|
Viktor Fomin
|
e49ac0fec7
|
Web: Files: added progress load
|
2020-11-30 15:15:59 +03:00 |
|
|
|
f10f6b8d3b
|
Update yarn.lock files
|
2020-11-30 15:11:23 +03:00 |
|
Alexey Kostenko
|
e27400e573
|
Web: Files: SharingPanel: Added a template for setting up an external link
|
2020-11-30 09:33:35 +03:00 |
|
|
|
8c965fa4e1
|
Web: People: changed empty screen description, fixed icons alignment
|
2020-11-28 13:44:31 +03:00 |
|
Viktor Fomin
|
69b823ce46
|
Web: Files: fixed calculation new percent
|
2020-11-27 17:51:01 +03:00 |
|
|
|
b18e47492a
|
Web: Files: fixed selection and deselection of service files
|
2020-11-27 15:38:15 +03:00 |
|
|
|
daf30eebae
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-27 11:34:05 +03:00 |
|
|
|
95ba0185db
|
Web: Files: fixed files row metadata
|
2020-11-26 17:07:43 +03:00 |
|
Alexey Kostenko
|
50ec9c371a
|
Web: Files: SharingPanel: Added Disabling LinkRow
|
2020-11-26 16:25:47 +03:00 |
|
Vladislav Makhov
|
fba407c5cb
|
Add props for privacy
|
2020-11-26 15:44:43 +03:00 |
|
Vladislav Makhov
|
c22f9b7f3f
|
Add setEncryptionAccess
|
2020-11-26 15:42:12 +03:00 |
|
|
|
56fc822099
|
Web: Files: removed files row metadata
|
2020-11-26 15:11:44 +03:00 |
|
Ilya Oleshko
|
9b1ac99bdf
|
Web: Files : Article: Added service icons to TreeFolders component
|
2020-11-26 15:02:56 +03:00 |
|
Alexey Kostenko
|
541a1bb8aa
|
Web: Files: SharingPanel: Fixed internal/external links style
|
2020-11-26 14:53:48 +03:00 |
|
Alexey Kostenko
|
3a9dc6b1c8
|
Web: Files: SharingPanel: Refactoring, Added toggle button and dropDown to LinkRow
|
2020-11-25 17:03:48 +03:00 |
|
Alexey Kostenko
|
8a0c8957fd
|
Web: Files: SharingPanel: Refactoring (function "linksFunction" is moved to a separate component)
|
2020-11-25 15:40:17 +03:00 |
|
Viktor Fomin
|
3d8caa1f4d
|
Update yarn.lock files
|
2020-11-25 14:57:17 +03:00 |
|
Viktor Fomin
|
1a1e9bef8e
|
Web: Files: fixed alert
|
2020-11-25 14:37:07 +03:00 |
|
Viktor Fomin
|
d1bc59aad4
|
Web: Files: added alert
|
2020-11-25 13:50:05 +03:00 |
|
Alexey Kostenko
|
4d92a4499e
|
Web: Files: SharingPanel: Fixed indents
|
2020-11-25 09:24:54 +03:00 |
|
|
|
ab8f2c1dc1
|
Web: Files: added delete edit action after routing
|
2020-11-24 18:01:26 +03:00 |
|
Alexey Kostenko
|
437032a541
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-11-24 17:54:23 +03:00 |
|
Alexey Kostenko
|
9534f48a7d
|
Web: Files/Components: Fixed combo-button (Enable click on icon)
|
2020-11-24 17:52:23 +03:00 |
|
|
|
9c8f2c61c5
|
Web: Files: fixed getHeaderIndeterminate selector
|
2020-11-24 17:41:29 +03:00 |
|
|
|
dcccb1180f
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-24 15:12:27 +03:00 |
|
|
|
e73ce06145
|
Web: Files: fixed the display of service folders
|
2020-11-24 15:12:19 +03:00 |
|
Ilya Oleshko
|
6980d720c7
|
Web: Files : Fixed ThirdParty getOAuthToken action, added reconnect
|
2020-11-24 15:04:16 +03:00 |
|
Ilya Oleshko
|
76387d71bb
|
Web: Files : Article : Fixed ThirdParty oAuth connect
|
2020-11-24 12:55:49 +03:00 |
|
Artem Tarasov
|
bea20b5098
|
Web: Files: VersionHistory: fixed comment display
|
2020-11-24 12:27:42 +03:00 |
|
|
|
83d9d90ac6
|
Web: Files: fixed the display of service folders
|
2020-11-24 11:46:46 +03:00 |
|
Vladislav Makhov
|
06342cf27b
|
Fix upload dialog
|
2020-11-24 10:11:47 +03:00 |
|
Vladislav Makhov
|
c3cba3a0af
|
Remove unused code
|
2020-11-24 10:11:25 +03:00 |
|
Alexey Kostenko
|
f2701388c2
|
Web: Files: SharingPanel: Fixed header styles
|
2020-11-24 06:58:20 +03:00 |
|
|
|
5fa38aa8ef
|
Web: Files: added routing to thirdParty folder
|
2020-11-23 18:16:56 +03:00 |
|
Vladislav Makhov
|
baaaef7b80
|
Refactoring
|
2020-11-23 17:28:24 +03:00 |
|
Vladislav Makhov
|
84ea70264f
|
Fix filter data
|
2020-11-23 17:27:55 +03:00 |
|
|
|
9e6c036800
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-23 15:27:20 +03:00 |
|
|
|
42b2c7ba02
|
Web: Files: added ThirdPartyMoveDialog, fixed move operations to ThirdParty folders
|
2020-11-23 15:27:06 +03:00 |
|
Viktor Fomin
|
c6a6b324e6
|
Update yarn.lock files
|
2020-11-23 14:20:52 +03:00 |
|
Viktor Fomin
|
26217ab4df
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-23 14:16:09 +03:00 |
|
Viktor Fomin
|
e3701e9aa2
|
Web: Files: put timeout in constant
|
2020-11-23 14:14:32 +03:00 |
|
Artem Tarasov
|
a6b4a8452f
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-11-23 13:58:54 +03:00 |
|
Viktor Fomin
|
f92f1e6573
|
Web: Files: remove operation type
|
2020-11-23 12:59:13 +03:00 |
|
Ilya Oleshko
|
912b53cece
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-20 16:45:07 +03:00 |
|
|
|
6463048b70
|
Web: Files: fixed thirdParty folders remove
|
2020-11-20 16:08:49 +03:00 |
|
Viktor Fomin
|
7deaecc525
|
Update yarn.lock files
|
2020-11-20 15:36:14 +03:00 |
|
Alexey Kostenko
|
32b49a02c6
|
Web: Files: SharingPanel: fixed footer in add users/groups menu
|
2020-11-20 15:02:11 +03:00 |
|
Alexey Kostenko
|
d120621f65
|
Web: Files: SharingPanel: Fixed button styles
|
2020-11-20 14:38:16 +03:00 |
|
Vladislav Makhov
|
1f01a3b308
|
Add encryptionUploadDialog
|
2020-11-20 11:48:35 +03:00 |
|
Viktor Fomin
|
ed21b37651
|
Web: Files: fixed cleaning secondary operations
|
2020-11-20 00:03:13 +03:00 |
|
Vladislav Makhov
|
52515b2a3c
|
Refactoring
|
2020-11-19 18:30:29 +03:00 |
|
|
|
715557e73c
|
Web: Files: rename auth_key to token
|
2020-11-19 17:55:01 +03:00 |
|
Viktor Fomin
|
66945edc80
|
Update yarn.lock files
|
2020-11-19 16:19:05 +03:00 |
|
Viktor Fomin
|
9cd88443f2
|
Web: Files: fixed loaders, added second
|
2020-11-19 16:11:14 +03:00 |
|
|
|
2192561540
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-19 14:46:06 +03:00 |
|
|
|
b037be86b7
|
Web: Files: added change thirdparty settings to context menu, moved connect dialog
|
2020-11-19 14:46:00 +03:00 |
|
Ilya Oleshko
|
a76b6fa439
|
Web: Files : Settings : Added OAuth login for services
|
2020-11-19 14:05:07 +03:00 |
|
Artem Tarasov
|
be094640fe
|
Web: Files: Filter: fixed names of sorting items
|
2020-11-19 13:22:09 +03:00 |
|
|
|
cdf21f36da
|
Web: Files: added moveTo, copyTo operation to thirdParty folders
|
2020-11-19 12:23:54 +03:00 |
|
Vladislav Makhov
|
47554e4f1a
|
Refactoring
|
2020-11-18 20:22:52 +03:00 |
|
Viktor Fomin
|
c8f07b73bb
|
Web: Files: icon display by operation type
|
2020-11-18 17:59:39 +03:00 |
|
Viktor Fomin
|
e6007dc302
|
Web: Files: fixed label on icon, returned label
|
2020-11-18 17:29:41 +03:00 |
|
|
|
3f1ab45740
|
Web: Files: fixed delete thirdParty, removed recent api to thirdParty files
|
2020-11-18 15:43:48 +03:00 |
|
Viktor Fomin
|
34e361a329
|
Update yarn.lock files
|
2020-11-17 14:31:11 +03:00 |
|
Viktor Fomin
|
26c3558063
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-17 14:24:13 +03:00 |
|
Viktor Fomin
|
f212dc7ad9
|
Web: Files: changed progress bar to floating button
|
2020-11-17 14:23:14 +03:00 |
|
|
|
f3ebcb78fe
|
Web: Files: fixed delete ThirdParty
|
2020-11-17 14:12:36 +03:00 |
|
|
|
c666520c74
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-17 12:04:33 +03:00 |
|
Artem Tarasov
|
efacc50ac4
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-17 11:48:55 +03:00 |
|
Artem Tarasov
|
900fc894fe
|
Web: Files: VersionHistory: refactoring
|
2020-11-17 11:47:00 +03:00 |
|
|
|
76ef4fdac5
|
Web: Files: added DeleteThirdPartyDialog, refactoring
|
2020-11-17 11:46:19 +03:00 |
|
Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
e65f2b36c7
|
Web: Files: Filter: Changed Consumer to HOC
|
2020-11-17 06:33:34 +03:00 |
|
Viktor Fomin
|
e51c7d2dd4
|
Update yarn.lock files
|
2020-11-16 18:56:12 +03:00 |
|
Artem Tarasov
|
fe5de62a3b
|
Web: Files: VersionHistory: fixed filter reset after returning from the VersionHistory padge
|
2020-11-16 17:34:17 +03:00 |
|
Vladislav Makhov
|
0e6e97ca0c
|
Fix empty screen
|
2020-11-16 17:04:17 +03:00 |
|
Artem Tarasov
|
7f1387410c
|
Web: Files: VersionHistory: refactorung
|
2020-11-16 16:46:00 +03:00 |
|
Vladislav Makhov
|
9929aa36de
|
Add getEncryptionSupport data handling
|
2020-11-16 15:44:13 +03:00 |
|
Artem Tarasov
|
af8a8ba77b
|
Web: Files: VersionHistoryPanel: fixed render error
|
2020-11-16 15:38:57 +03:00 |
|
Artem Tarasov
|
52432308f9
|
Web: Files: VersionHistory: Loaders.HistoryRows component applied
|
2020-11-16 15:26:41 +03:00 |
|
Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
Vladislav Makhov
|
07d507b5c5
|
Added receive of encryption keys
|
2020-11-16 12:34:01 +03:00 |
|
Vladislav Makhov
|
b33b8268a1
|
Refactoring
|
2020-11-13 19:05:49 +03:00 |
|
|
|
2c85229d8b
|
Web: Files: fixed ThirdParty icons styles
|
2020-11-13 18:54:54 +03:00 |
|
|
|
862fd8c9ca
|
Web: Files: added action to connect button
|
2020-11-13 18:46:42 +03:00 |
|
Artem Tarasov
|
575f9af8aa
|
Web: Files: VersionHistoryPanel: added propTypes
|
2020-11-13 15:48:52 +03:00 |
|
Artem Tarasov
|
144d1894c5
|
Web: Files: Deleted unusing var
|
2020-11-13 15:48:21 +03:00 |
|
Artem Tarasov
|
fa06fb84a6
|
Web: Files: VersionHistory: added redirect when following a direct link
|
2020-11-13 15:35:16 +03:00 |
|
Artem Tarasov
|
e3ae7df15e
|
Web: Files: VersionHistory: added fileId to store
|
2020-11-13 15:34:18 +03:00 |
|
Artem Tarasov
|
e558a9a6ab
|
Web: Files: VersionHistory: added prop visibilityVersionHistoryPanel to redux
|
2020-11-13 14:51:48 +03:00 |
|
Artem Tarasov
|
60404c326a
|
Web: Files: VersionHistoryPanel: refactoring
|
2020-11-13 14:26:14 +03:00 |
|
Artem Tarasov
|
ca4c71f714
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-13 14:00:30 +03:00 |
|
Artem Tarasov
|
31a6f65e06
|
Web: Files: VersionHistory: getting culture moved to VersionRow
|
2020-11-13 13:58:58 +03:00 |
|
|
|
67507d707d
|
Web: Files: fixed remove services
|
2020-11-13 11:48:42 +03:00 |
|
Artem Tarasov
|
17c019304b
|
Web: Files: VersionHistoryPanel: fixed styles
|
2020-11-13 11:45:13 +03:00 |
|
Artem Tarasov
|
a38abc4ff4
|
Web: Fieles: VersionHistoryPanel: styled refactoring
|
2020-11-13 11:07:01 +03:00 |
|
Artem Tarasov
|
95a6f2ea47
|
Web: Files: VersionHistory: fixed render MainButton
|
2020-11-13 11:04:12 +03:00 |
|
|
|
d6999c6f3b
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-12 18:36:17 +03:00 |
|
|
|
c20df9760c
|
Web: Files: fixed thirdparty tree node
|
2020-11-12 18:36:09 +03:00 |
|
Ilya Oleshko
|
10b511e1dd
|
Web: Files : Article : Fixed ThirdParty buttons styles
|
2020-11-12 17:06:38 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Ilya Oleshko
|
0f34cbcfbd
|
Web: Files : Selectors : Fixed icons name
|
2020-11-12 15:01:33 +03:00 |
|
Ilya Oleshko
|
9e28ae23f0
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2020-11-12 14:46:29 +03:00 |
|
Ilya Oleshko
|
385f8002c1
|
Web: Files : Added new folders icons
|
2020-11-12 14:46:20 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Artem Tarasov
|
d0da8d15bd
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-12 14:27:40 +03:00 |
|
|
|
5e30eb54e7
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-12 14:26:11 +03:00 |
|
|
|
30da7208d7
|
Web: Files: added thirdParty panel to tree, refactoring
|
2020-11-12 14:26:02 +03:00 |
|
Artem Tarasov
|
ed2fa1260d
|
Web: Files: VersionHistoryPanel: fixed styles
|
2020-11-12 14:25:52 +03:00 |
|
Ilya Oleshko
|
a89740f362
|
Web: Files : Body : Fixed shared button indication
|
2020-11-12 13:42:40 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
97d9d58a29
|
Web: Files: added header loader
|
2020-11-12 13:30:54 +03:00 |
|
Ilya Oleshko
|
6f24bbf5da
|
Web: Files : Body : Fixed context options
|
2020-11-12 12:30:30 +03:00 |
|
|
|
45caaf23bf
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-12 12:01:34 +03:00 |
|
Ilya Oleshko
|
d70ca7a1d3
|
Web: Files : Body : Fixed props of tile view
|
2020-11-12 11:33:25 +03:00 |
|
|
|
73268462cb
|
Web: Files: added service icons
|
2020-11-12 11:25:48 +03:00 |
|
Artem Tarasov
|
f35effd715
|
Web: Files: VersionHistory: refactoring
|
2020-11-12 11:10:36 +03:00 |
|
Ilya Oleshko
|
4b8a8c02c7
|
Web: Files : Body : Fixed displaying for connected items
|
2020-11-12 11:08:29 +03:00 |
|
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
|
|
e9a632d035
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-11 18:10:39 +03:00 |
|
Artem Tarasov
|
da5956b5e9
|
Web: Files: VersionHistory: added condition for opening VersionHistoryPanel
|
2020-11-11 17:51:48 +03:00 |
|
Artem Tarasov
|
53f18ae0a8
|
Web: Files: added VersionHistoryPanel
|
2020-11-11 17:39:10 +03:00 |
|
Viktor Fomin
|
d2a30544d6
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-11 17:38:10 +03:00 |
|
Viktor Fomin
|
91bc88ad28
|
Update yarn.lock files
|
2020-11-11 17:37:48 +03:00 |
|
Artem Tarasov
|
3908768165
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-11 17:01:32 +03:00 |
|
Viktor Fomin
|
2cc252c2ae
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 16:42:22 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +03:00 |
|
Vladislav Makhov
|
53b2461d4f
|
Desktop helper init
|
2020-11-11 15:47:25 +03:00 |
|
Vladislav Makhov
|
2c872d2506
|
Add selector
|
2020-11-11 15:47:00 +03:00 |
|
Artem Tarasov
|
135c1d024d
|
Web: Files: VersionHistory: added styles
|
2020-11-11 15:19:30 +03:00 |
|
Viktor Fomin
|
40e2d85dbd
|
Update yarn.lock files
|
2020-11-11 13:27:17 +03:00 |
|
Artem Tarasov
|
aa24536b44
|
Web: Files: VersionHistory: added VersionHistoryPanel
|
2020-11-11 12:23:07 +03:00 |
|
Vladislav Makhov
|
a3d2ead825
|
Merge branch 'develop' into feature/desktop-view
|
2020-11-11 11:22:11 +03:00 |
|
Alexey Kostenko
|
e29eeb2f4b
|
Web: Common/Client: FilterInput: Added sectionWidth prop
|
2020-11-11 07:27:42 +03:00 |
|
Viktor Fomin
|
0852dd0814
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-10 18:25:25 +03:00 |
|
Viktor Fomin
|
237084a749
|
Web: Files: fix first loader
|
2020-11-10 18:20:42 +03:00 |
|
Viktor Fomin
|
df4c89cb91
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 18:09:58 +03:00 |
|
Viktor Fomin
|
0490c8c3f0
|
Update yarn.lock files
|
2020-11-10 18:08:51 +03:00 |
|
Ilya Oleshko
|
8a462c1e7a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 17:07:00 +03:00 |
|
Ilya Oleshko
|
cf5573c74b
|
Web: Files : Settings : Fixed style of input
|
2020-11-10 16:30:22 +03:00 |
|
|
|
a1541da672
|
Web: Files: added thirdParty icons
|
2020-11-10 15:12:14 +03:00 |
|
Artem Tarasov
|
02aed65d60
|
Web: Files: DocEditor: fixed of mobile view
|
2020-11-10 14:29:59 +03:00 |
|
Artem Tarasov
|
4031a609b8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-10 13:34:04 +03:00 |
|
Artem Tarasov
|
f578e43662
|
Web: Files: Settings: refactoring
|
2020-11-10 13:31:16 +03:00 |
|
|
|
9b10dd39ee
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 12:59:40 +03:00 |
|
|
|
fa2a510a8a
|
Web: Files: added thirdParty api, added new thirdParty dialogs
|
2020-11-10 12:50:07 +03:00 |
|
|
|
1da1cde38e
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-10 12:29:57 +03:00 |
|
Ilya Oleshko
|
ecefe5c859
|
Web: Files : Body : Fixed render for services folder
|
2020-11-10 11:43:05 +03:00 |
|
Ilya Oleshko
|
60286af94f
|
Web: Files : Selectors : Added providerItem selector for render services folders
|
2020-11-10 11:41:42 +03:00 |
|
Ilya Oleshko
|
6c0c32420a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 11:11:09 +03:00 |
|
Viktor Fomin
|
9cbe89d4b5
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 11:02:29 +03:00 |
|
Vladislav Makhov
|
3415cc046c
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2020-11-10 11:02:14 +03:00 |
|
Viktor Fomin
|
834e8e6516
|
Update yarn.lock files
|
2020-11-10 10:46:26 +03:00 |
|
Viktor Fomin
|
067ee4fc5a
|
Web: Files: delete first header preloader
|
2020-11-10 10:40:17 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Viktor Fomin
|
515bd0d05f
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-09 23:02:18 +03:00 |
|
Viktor Fomin
|
a7dee56194
|
Update yarn.lock files
|
2020-11-09 23:01:57 +03:00 |
|
|
|
4dd9c6f554
|
Update yarn.lock files
|
2020-11-09 22:35:39 +03:00 |
|
|
|
d012aa6071
|
Merge branch 'develop' into feature/filter-loader
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-11-09 22:15:04 +03:00 |
|
Artem Tarasov
|
066140f388
|
Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal
|
2020-11-09 18:59:06 +03:00 |
|
Artem Tarasov
|
57ca2d2603
|
Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file
|
2020-11-09 18:33:45 +03:00 |
|
Ilya Oleshko
|
82a2520150
|
Web: Files : Body : Fixed preload tab for new documents
|
2020-11-09 18:29:06 +03:00 |
|
Viktor Fomin
|
6e8685d8d6
|
Update yarn.lock files
|
2020-11-09 16:54:13 +03:00 |
|
|
|
cb9e450f52
|
Web: Files: removed useless operationsPanelProps
|
2020-11-09 16:11:56 +03:00 |
|
Artem Tarasov
|
46ed4741a6
|
Web: Files/Components: deleted console.log, unusing code, refactoring
|
2020-11-09 15:23:20 +03:00 |
|
Viktor Fomin
|
b3f4bd3f64
|
Update yarn.lock files
|
2020-11-09 15:16:44 +03:00 |
|
Artem Tarasov
|
11d91fe21f
|
Web: Files/Components: tree-menu: fixed selection
|
2020-11-09 15:16:15 +03:00 |
|
Viktor Fomin
|
7211978a38
|
Web: Files: fix first loader
|
2020-11-09 15:10:51 +03:00 |
|
Viktor Fomin
|
b0d202f7c9
|
Update yarn.lock files
|
2020-11-09 13:17:06 +03:00 |
|
Viktor Fomin
|
3c84424d8f
|
Web: Files: delete logo
|
2020-11-09 13:07:27 +03:00 |
|
Artem Tarasov
|
4482f70cd3
|
Web: Files: VersionHistory: added arrow-button in header
|
2020-11-09 12:42:41 +03:00 |
|
Artem Tarasov
|
fa8e8341e2
|
Web: Components/Files: fixed warrnings
|
2020-11-09 12:11:08 +03:00 |
|
Viktor Fomin
|
c2e74d3756
|
Update yarn.lock files
|
2020-11-06 18:43:16 +03:00 |
|
Artem Tarasov
|
612661a22b
|
Web: Files/Common: MainButton: fixed line-height
|
2020-11-06 16:43:14 +03:00 |
|
Artem Tarasov
|
9f46d7211f
|
Web: Files: Settings: fixed key fot translations
|
2020-11-06 16:32:47 +03:00 |
|
Artem Tarasov
|
48c4f3b0f2
|
Web: VersionHistory: deleted unusing code
|
2020-11-06 16:22:58 +03:00 |
|
Artem Tarasov
|
b55246fbd9
|
Web: Files: fixed variable name isNeedSetViewBox -> needSetViewBox
|
2020-11-06 16:19:13 +03:00 |
|
Viktor Fomin
|
1a4ced2195
|
Web: Files: fix color
|
2020-11-06 16:17:40 +03:00 |
|
Artem Tarasov
|
c791fa29aa
|
Web: Files/Common: PageLayout: fixed margin-top in Header
|
2020-11-06 16:15:03 +03:00 |
|
Artem Tarasov
|
54aac4c933
|
Web: Files: EditingWrapperComponent: removed transfer of arrow functions to components
|
2020-11-06 15:44:08 +03:00 |
|
Artem Tarasov
|
157226ce83
|
Web: Files: row: fixed margin-right icon
|
2020-11-06 14:46:08 +03:00 |
|
Artem Tarasov
|
92dd80519f
|
Web: Files: images in row: added setting viewBox for files icons
|
2020-11-06 14:14:38 +03:00 |
|
Artem Tarasov
|
aba7666ede
|
Web: Files: SharingPanel: fixed margin icon
|
2020-11-06 13:28:17 +03:00 |
|
Artem Tarasov
|
63763ac499
|
Web: Files: StyledPanel: fixed font-size in ComboButton in AddUserPanel and AddGroupPanel
|
2020-11-06 12:46:21 +03:00 |
|
|
|
15134f2beb
|
Web: Files: added setting thirdParty page with translations
|
2020-11-06 12:14:02 +03:00 |
|
|
|
8aad3dbc6f
|
Web: Files: added new icons
|
2020-11-06 12:08:29 +03:00 |
|
Artem Tarasov
|
13456f6dd0
|
Web: Files: applied icon MoveToIcon
|
2020-11-05 22:43:11 +03:00 |
|
Artem Tarasov
|
e1ebfe1cbf
|
Web: Files: VersionHistory: added external link in row
|
2020-11-05 21:10:21 +03:00 |
|
Artem Tarasov
|
eb220f0987
|
Web: Files: fixed dropdowns
|
2020-11-05 20:35:05 +03:00 |
|
Artem Tarasov
|
30adb42aaa
|
Web: Files: added new icons for folder 24x24
|
2020-11-05 17:22:45 +03:00 |
|
Artem Tarasov
|
c2ea1cc19e
|
Web: Files: settings: fixed gap between toggle button
|
2020-11-05 16:58:29 +03:00 |
|
Viktor Fomin
|
151dc898f5
|
Update yarn.lock files
|
2020-11-05 12:28:39 +03:00 |
|
Artem Tarasov
|
38c7faec04
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-11-05 11:57:55 +03:00 |
|
Viktor Fomin
|
081fe180bb
|
Web: Files: rename headers components
|
2020-11-05 11:15:46 +03:00 |
|
Artem Tarasov
|
6a4cabcedf
|
Web: Components/Files/People: fix styles
|
2020-11-05 09:22:14 +03:00 |
|
Viktor Fomin
|
1fc0d91182
|
Web: Files: fix header loader
|
2020-11-04 12:23:35 +03:00 |
|
Viktor Fomin
|
91c254c638
|
Web: Common: fix main button loader
|
2020-11-03 18:36:19 +03:00 |
|
Vladislav Makhov
|
22a494a5ad
|
yarn.lock update
|
2020-11-03 17:39:49 +03:00 |
|
Vladislav Makhov
|
bbc708192d
|
yarn.lock update
|
2020-11-03 17:29:50 +03:00 |
|
Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
Artem Tarasov
|
e880ba8ba9
|
Web: Files: fixed position of contextButton in row
|
2020-11-03 15:14:13 +03:00 |
|
Vladislav Makhov
|
63b706714b
|
Merge branch 'develop' into feature/desktop-view
|
2020-11-03 10:07:21 +03:00 |
|
|
|
60e66c1abe
|
Web: Fixed PWA App icon url on iOS
|
2020-11-02 21:42:53 +03:00 |
|
Artem Tarasov
|
2c6b10a58b
|
Web: Files: Settings: fixed selection in the TreeSettings when switching from files
|
2020-11-02 21:17:28 +03:00 |
|
Artem Tarasov
|
bfcc46a546
|
Web: Files: Settings: fixed render MainButton
|
2020-11-02 20:56:58 +03:00 |
|
Artem Tarasov
|
fa1c8c8e37
|
Web: Files: selectors: added selector for icon of dragged file
|
2020-11-02 20:31:17 +03:00 |
|
Artem Tarasov
|
f3231bd842
|
Web: Files: tooltip: refactoring tooltip when dragging'
|
2020-11-02 14:49:40 +03:00 |
|
Artem Tarasov
|
5f6e0e60e8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
|
2020-11-02 13:36:03 +03:00 |
|
Artem Tarasov
|
6d41b0e64b
|
Web: Files: Home: wixed style of tooltip when dragging
|
2020-11-02 13:19:06 +03:00 |
|
Artem Tarasov
|
bda078beee
|
Web: Files: selectors: fixed selection when dragging
|
2020-10-30 15:28:57 +03:00 |
|
Vladislav Makhov
|
7ddf6467c7
|
Made upload folder menu item is disabled in privacy folder
|
2020-10-30 15:22:55 +03:00 |
|
Ilya Oleshko
|
a823763af7
|
Web: Files : Body : RowContent : Fixed badges actions and styles
|
2020-10-30 15:20:06 +03:00 |
|
Ilya Oleshko
|
b1b402768b
|
Web: Files : Body : Added context to RowContainer
|
2020-10-30 14:25:04 +03:00 |
|
Ilya Oleshko
|
3b9679957e
|
Web: Files : Header : Added context to Header
|
2020-10-30 14:22:30 +03:00 |
|
Ilya Oleshko
|
c28b1d0121
|
Web: Components : RowContent : Renamed width property, fixed usage
|
2020-10-30 14:19:59 +03:00 |
|
|
|
f5ae1c4b0e
|
Web: Files: fixed setIsLoading
|
2020-10-30 14:13:54 +03:00 |
|
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
Artem Tarasov
|
5619974f12
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-10-29 17:21:25 +03:00 |
|
Artem Tarasov
|
076cf154a6
|
Web: Files: Settings: fixed margin on Common Settongs
|
2020-10-29 16:24:50 +03:00 |
|
Artem Tarasov
|
088df7adf5
|
Web: Files: Settings: fixed styles of headline
|
2020-10-29 14:23:37 +03:00 |
|
Artem Tarasov
|
661b004c46
|
Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix
|
2020-10-29 13:29:31 +03:00 |
|
Artem Tarasov
|
730d5a2d1b
|
Web: Files: FilesRowContent: fixed margin bettween badges
|
2020-10-29 13:28:23 +03:00 |
|
|
|
a163c439d3
|
Merge branch 'develop' into feature/fixed-dragging
|
2020-10-29 13:23:37 +03:00 |
|
|
|
77e9f78d55
|
Web: Files: fixed dragging
|
2020-10-29 12:35:53 +03:00 |
|
|
|
70d3e51520
|
Web: Files: added drag cursor
|
2020-10-29 12:35:17 +03:00 |
|
Alexey Kostenko
|
4150acdca8
|
Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix
|
2020-10-29 12:01:36 +03:00 |
|
Artem Tarasov
|
3f19b3e994
|
Web: Files: fixed margin headline
|
2020-10-29 11:41:31 +03:00 |
|
Artem Tarasov
|
f8d34cbf99
|
Web: Files: VersionHistory: fixed styles for ModalDialog for tablets
|
2020-10-29 11:12:29 +03:00 |
|
Vladislav Makhov
|
5221cd1f7a
|
Made dropdown menu available, when desktop client uses and encryption is supported
|
2020-10-29 11:05:23 +03:00 |
|
Alexey Kostenko
|
f6b6ddcd64
|
Web: Files: AddUsersPanel: Fixed arrow button color
|
2020-10-29 11:00:53 +03:00 |
|
Alexey Kostenko
|
55830ab25c
|
Web: Common/Files: PeopleSelector: Added counter to footer button
|
2020-10-29 10:55:06 +03:00 |
|
Alexey Kostenko
|
19f1984e73
|
Web: Common/Files: GroupSelector: Added counter to footer button
|
2020-10-29 10:54:10 +03:00 |
|
Alexey Kostenko
|
0b989971a6
|
Web: Files: AddGroupsPanel: Fixed styles in footer buttons
|
2020-10-28 17:37:41 +03:00 |
|
Alexey Kostenko
|
1e78053efa
|
Web: Files: AddGroups: Fixed header styles
|
2020-10-28 16:22:35 +03:00 |
|
Alexey Kostenko
|
2f7f4d7afb
|
Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix
|
2020-10-28 15:54:59 +03:00 |
|
Vladislav Makhov
|
f14eaabf50
|
Remove unused code
|
2020-10-28 14:18:02 +03:00 |
|
Artem Tarasov
|
e9144b7f67
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-10-28 14:07:50 +03:00 |
|
Artem Tarasov
|
5c17b419b9
|
Web: Files: fixed styles VersionHistory
|
2020-10-28 14:04:11 +03:00 |
|
Vladislav Makhov
|
89a102ee17
|
Refactor move operations with actions.
|
2020-10-28 14:03:58 +03:00 |
|
Vladislav Makhov
|
01e25257b5
|
Delete unused code
|
2020-10-28 11:46:08 +03:00 |
|
Vladislav Makhov
|
97ed3121cc
|
Add selector to receive operation folders data
|
2020-10-28 11:42:05 +03:00 |
|
Artem Tarasov
|
5dba586e3d
|
Web: Files: VersionHistory: fixed position of the expandButton
|
2020-10-28 11:10:52 +03:00 |
|
Artem Tarasov
|
c7963546f1
|
Web: Files: VersionHistory: fixed margin, font-size
|
2020-10-28 11:02:01 +03:00 |
|
Artem Tarasov
|
b5b84df97a
|
Web: Files: VersionHistory: fixed margin in row
|
2020-10-28 10:37:43 +03:00 |
|
Alexey Kostenko
|
92bcfdf8df
|
Web: Files: Fixed external link menu in SharingPanel
|
2020-10-28 09:50:59 +03:00 |
|
Artem Tarasov
|
44fdb0a2c0
|
Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix
|
2020-10-28 09:44:23 +03:00 |
|
Artem Tarasov
|
f091170886
|
Web: Files: VersionHistory: fixed height of row
|
2020-10-28 09:43:58 +03:00 |
|
Vladislav Makhov
|
626a2a60a2
|
Fix OperationsPanel move menu
|
2020-10-28 09:33:43 +03:00 |
|
Alexey Kostenko
|
23ecb65ea9
|
Web: Files: fixed footer in SharingPanel
|
2020-10-28 09:13:43 +03:00 |
|
Alexey Kostenko
|
910433f8e3
|
Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix
|
2020-10-27 17:41:20 +03:00 |
|
Alexey Kostenko
|
fb2e9c39db
|
Web: Files: Fixed styles in sharing row
|
2020-10-27 17:38:08 +03:00 |
|
Alexey Kostenko
|
34780f7735
|
Web: Files: Fixed sharing row styles
|
2020-10-27 17:06:52 +03:00 |
|
Alexey Kostenko
|
284034cbb4
|
Web: Files: Fixed header in sharing panel settings
|
2020-10-27 16:02:21 +03:00 |
|
Artem Tarasov
|
e4599f8279
|
Web: Files: VersionHistory: added props borderBottom for header(tablet)
|
2020-10-27 15:15:57 +03:00 |
|
Vladislav Makhov
|
3b6883595a
|
Move selector to auth
|
2020-10-27 14:47:07 +03:00 |
|
Vladislav Makhov
|
eab8d8e8e2
|
update yarn.lock
|
2020-10-27 14:28:56 +03:00 |
|
Vladislav Makhov
|
44050626b4
|
Fix console warnings
|
2020-10-27 14:21:30 +03:00 |
|
Vladislav Makhov
|
ab0b1c5ee6
|
Refactor description translation.
|
2020-10-27 14:21:05 +03:00 |
|
|
|
b548870886
|
Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector
|
2020-10-27 13:15:06 +03:00 |
|
Artem Tarasov
|
0322fdcd8e
|
Web: Components/Files: fixed style Share button
|
2020-10-27 11:49:41 +03:00 |
|
Alexey Kostenko
|
b8d285ef8f
|
Web: Files: Fixed main button drop down styles (mobile)
|
2020-10-27 11:17:15 +03:00 |
|
Vladislav Makhov
|
64a72b522f
|
Update yarn.lock
|
2020-10-27 10:49:55 +03:00 |
|
Vladislav Makhov
|
32b1d5914f
|
Add private room selectors
|
2020-10-26 16:23:00 +03:00 |
|
Vladislav Makhov
|
6ba6ba2e64
|
Refactoring of private room mock
|
2020-10-26 16:22:47 +03:00 |
|
Artem Tarasov
|
b77095f836
|
Web: Files: home: fixeds margin-right arrow button
|
2020-10-26 13:51:18 +03:00 |
|
Artem Tarasov
|
693f11e66a
|
Web: Files: TreeSettings: fixed margin-top
|
2020-10-26 10:53:53 +03:00 |
|
Artem Tarasov
|
b787b58b6c
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-10-26 09:32:29 +03:00 |
|
Artem Tarasov
|
a220443afb
|
Web: Components: tree-menu: fixed props
|
2020-10-26 08:38:04 +03:00 |
|
Vladislav Makhov
|
e5c5f9194d
|
Fix code after merge
|
2020-10-23 16:01:10 +03:00 |
|
Vladislav Makhov
|
7b458a72c9
|
Merge branch 'develop' into feature/private-room
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-23 15:49:10 +03:00 |
|
Vladislav Makhov
|
af0d47d474
|
Add translation
|
2020-10-23 15:31:45 +03:00 |
|
Vladislav Makhov
|
23c157e279
|
Update tree node with private room
|
2020-10-23 15:31:33 +03:00 |
|
Vladislav Makhov
|
5441db9b76
|
Add private room empty screen container
|
2020-10-23 15:31:10 +03:00 |
|
|
|
eee01c25e6
|
Web: Files: Fixed render with empty JSX
|
2020-10-23 15:01:07 +03:00 |
|
Artem Tarasov
|
7d1c806f28
|
Web: Files: tree: fixed desktop layout
|
2020-10-23 14:27:42 +03:00 |
|
|
|
6848dcfad7
|
Web: Files: Fixed MoveTo/CopyTo operations (no loopFilesOperations action inside props)
|
2020-10-23 14:01:02 +03:00 |
|
|
|
cb849577fb
|
Update yarn.lock files
|
2020-10-23 13:45:17 +03:00 |
|
|
|
b585313aa5
|
Update yarn.lock files
|
2020-10-23 12:21:57 +03:00 |
|
|
|
d64f82f848
|
Web: Files: Removed hard-coded string error
|
2020-10-23 12:01:53 +03:00 |
|
|
|
9df3a1cf64
|
Web: Files: Fixed display folder icon
|
2020-10-22 19:32:45 +03:00 |
|
Alexey Kostenko
|
926e3c3362
|
Web: Files/Components: Fixed styles dropDownItem in mainButton
|
2020-10-22 16:24:24 +03:00 |
|
Alexey Kostenko
|
bb00498c44
|
Web: Common/Components/Files: Fixed filter and file create field styles
|
2020-10-22 14:10:58 +03:00 |
|
Alexey Kostenko
|
e1693adcdb
|
Web: Files/Components: Fixed mobile row styles
|
2020-10-22 13:47:54 +03:00 |
|
Alexey Kostenko
|
ad2314ffd1
|
Web: Files: Fixed styles in file creation field
|
2020-10-22 13:28:51 +03:00 |
|
Alexey Kostenko
|
b6aefda481
|
Web: Files/Components: Fixed file creation field
|
2020-10-22 13:21:37 +03:00 |
|
Alexey Kostenko
|
747bf783b8
|
Web: Components/Files: Fixed row styles
|
2020-10-22 10:38:43 +03:00 |
|
Alexey Kostenko
|
5f4921d341
|
Web: Files/Components/Common: Fixed row styles
|
2020-10-21 16:54:22 +03:00 |
|
Alexey Kostenko
|
a1aaf8acf2
|
Web: Files: Fix header styles
|
2020-10-21 13:28:15 +03:00 |
|
|
|
352c04fd5f
|
Merge branch 'develop' into feature/files-recent
|
2020-10-20 19:14:43 +03:00 |
|
Vladislav Makhov
|
d012d8f724
|
Add new context menu item: "Open location".
|
2020-10-20 11:04:50 +03:00 |
|
Vladislav Makhov
|
967a01061a
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.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/api/files/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-10-20 09:23:58 +03:00 |
|
Vladislav Makhov
|
897a9cc24b
|
Fix folder creation
|
2020-10-20 09:09:25 +03:00 |
|
|
|
05a6034b05
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 20:53:59 +03:00 |
|
Vladislav Makhov
|
500ac20bdc
|
Adding to recent then create file.
|
2020-10-19 18:56:35 +03:00 |
|
Vladislav Makhov
|
e0dacb3a60
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 18:20:36 +03:00 |
|
Vladislav Makhov
|
2757a785a0
|
Merge branch 'develop' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 17:54:41 +03:00 |
|
TatianaLopaeva
|
2dd956c700
|
Update yarn.lock files
|
2020-10-19 13:41:22 +03:00 |
|
TatianaLopaeva
|
41d0c3e9d9
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 12:11:34 +03:00 |
|
Vladislav Makhov
|
fee23e5947
|
Fix code after merge
|
2020-10-19 10:58:24 +03:00 |
|
Vladislav Makhov
|
3578340bcd
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
|
2020-10-16 17:15:14 +03:00 |
|
|
|
38cd808b4e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-16 16:44:18 +03:00 |
|
|
|
a6d9908d00
|
Web: Files: remove duplicate fetchFolder
|
2020-10-16 16:45:44 +03:00 |
|
|
|
70b736998b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
|
2020-10-16 16:44:10 +03:00 |
|
|
|
ed50f3bc98
|
Update yarn.lock files
|
2020-10-16 16:38:11 +03:00 |
|
Ilya Oleshko
|
c8cfe099ce
|
Web: Files : RowContent : Disable file actions inside recycle
|
2020-10-16 16:33:25 +03:00 |
|
|
|
2ea8e5cf1c
|
Web: Files: Applied prettier style fix
|
2020-10-16 16:27:22 +03:00 |
|
TatianaLopaeva
|
14af00ffd7
|
Web: Added styles and changed images by layout
|
2020-10-16 16:21:33 +03:00 |
|
Vladislav Makhov
|
e58a88af29
|
Fix code after merge
|
2020-10-16 16:16:51 +03:00 |
|
Ilya Oleshko
|
312856acf1
|
Web: Files : RowContent : Auto formatting, disable file actions inside recycle
|
2020-10-16 16:12:37 +03:00 |
|
Ilya Oleshko
|
5c4df62c77
|
Web: Files : Body : Not render share button in recycle
|
2020-10-16 16:11:30 +03:00 |
|
|
|
d636c68ae6
|
Web: Files: fixed share translation
|
2020-10-16 16:09:59 +03:00 |
|
Ilya Oleshko
|
d5d4418536
|
Web: Files : NewFilesPanel : Fixed file open
|
2020-10-16 15:42:07 +03:00 |
|
Ilya Oleshko
|
74cae29b38
|
Web: Files : Selectors : Fixed filesList selector
|
2020-10-16 15:41:21 +03:00 |
|
|
|
30f301435e
|
Web: Files: fixed the update of the badge in the tree
|
2020-10-16 15:06:49 +03:00 |
|
Artem Tarasov
|
89b2ace28b
|
Web: Files: treeFolders: fixed badge display
|
2020-10-16 14:33:54 +03:00 |
|
Vladislav Makhov
|
3491938aa4
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-16 14:33:20 +03:00 |
|
Ilya Oleshko
|
bdad54951a
|
Web: Files : NewFilesPanel : Fixed mapState error, temporary disabled open file inside panel
|
2020-10-16 14:08:52 +03:00 |
|
Vladislav Makhov
|
3e3fce0638
|
Fix code after merge
|
2020-10-16 12:55:56 +03:00 |
|
|
|
4b2f687cab
|
Web: Files: Skip useless API requests on Editor opening
|
2020-10-16 12:15:54 +03:00 |
|
|
|
99ae158992
|
Web: Files: Removed useless API request call
|
2020-10-16 12:09:17 +03:00 |
|
Vladislav Makhov
|
ccab1949d5
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-16 11:28:31 +03:00 |
|
|
|
fa54990786
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 19:04:19 +03:00 |
|
|
|
6e7e09b91b
|
Revert "Web: Files: moved SimpleFilesRow to a separate file, removed the bind"
This reverts commit 43dc6d81a5.
|
2020-10-15 18:08:09 +03:00 |
|
|
|
ff1c1765b5
|
Web: Clients: Turned off Suspense fallback
|
2020-10-15 18:07:23 +03:00 |
|
|
|
43dc6d81a5
|
Web: Files: moved SimpleFilesRow to a separate file, removed the bind
|
2020-10-15 14:40:17 +03:00 |
|
Ilya Oleshko
|
3e66f95546
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-15 13:39:31 +03:00 |
|
TatianaLopaeva
|
14bb36900c
|
Update yarn.lock files
|
2020-10-15 11:22:58 +03:00 |
|
Artem Tarasov
|
3ee236c25b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 10:56:57 +03:00 |
|
Artem Tarasov
|
6e6bcbd92f
|
Web: Files: TreeFolders: badge for showing new elements moved to component TreeMenu
|
2020-10-15 10:55:01 +03:00 |
|
Artem Tarasov
|
8930f98cdd
|
Web: Files: settings: fixed to display loader
|
2020-10-15 10:52:51 +03:00 |
|
