Commit Graph

3280 Commits

Author SHA1 Message Date
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
f1f1ae818e Files: fix long operation 2020-12-01 12:29:08 +03:00
8de24eae99 Files: openedit. AllowAnonymous 2020-12-01 10:20:15 +03:00
6f76404eaa Files: optimization 2020-11-30 23:02:10 +03:00
Viktor Fomin
8c8475bd51 Web: Common: fixed percent calculation 2020-11-30 19:12:16 +03:00
Alexey Kostenko
7a95d4b942 Web: Files: Server: Added api setacelink 2020-11-30 18:34:45 +03:00
645749fbc7 Files: rename ParentFolderID to FolderId.
Optimization
2020-11-30 16:47:26 +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
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
4ad116937a Merge branch 'develop' into bugfix/fix-empty-screen-description 2020-11-30 13:27:35 +03:00
c029a2df04 Web: People: fixed text alignment 2020-11-30 12:15:45 +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
a0adc29899 Web: People: fixed alignment and color of icons 2020-11-28 13:15:30 +03:00
83e4db1e7f Web: People: removed useless buttons styles 2020-11-28 13:05:10 +03:00
2b7480a200 Web: People: fixed headers fontWeight 2020-11-28 13:03:53 +03:00
Viktor Fomin
69b823ce46 Web: Files: fixed calculation new percent 2020-11-27 17:51:01 +03:00
12542c137c Remove todo 2020-11-27 17:06:26 +03:00
b4e071081c todo 2020-11-27 16:42:27 +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
56fc822099 Web: Files: removed files row metadata 2020-11-26 15:11:44 +03:00
Alexey Kostenko
541a1bb8aa Web: Files: SharingPanel: Fixed internal/external links style 2020-11-26 14:53:48 +03:00
afc280904b Web: People: fixed passwordSettings minLength 2020-11-26 12:27:09 +03:00
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +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
ebc7886762 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-25 14:57:56 +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
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
4a1023808c People: filter groups 2020-11-24 16:13:49 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
Artem Tarasov
bea20b5098 Web: Files: VersionHistory: fixed comment display 2020-11-24 12:27:42 +03:00
Alexey Kostenko
f2701388c2 Web: Files: SharingPanel: Fixed header styles 2020-11-24 06:58:20 +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
af77fa0f24
Merge branch 'develop' into bugfix/filter-fix 2020-11-20 16:19:52 +03:00
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
Viktor Fomin
7deaecc525 Update yarn.lock files 2020-11-20 15:36:14 +03:00
Viktor Fomin
8ffc4b4d4a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-20 15:35:59 +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
be081c45b6 Files: fixed share folder 2020-11-20 13:45:42 +03:00
Artem Tarasov
56d2286f63 Merge branch 'develop' into bugfix/filter-fix 2020-11-20 13:09:04 +03:00
Artem Tarasov
f2d15f07f8 Web: People: Filter: changed translation of elements in the sorting list 2020-11-20 12:43:35 +03:00
b5a66444d7 Thirdparty: fix save 2020-11-20 12:24:17 +03:00
Viktor Fomin
2a175aedf4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-20 11:53:18 +03:00
0337bd58da Files: fixed DI 2020-11-20 10:22:15 +03:00
Viktor Fomin
ed21b37651 Web: Files: fixed cleaning secondary operations 2020-11-20 00:03:13 +03:00
2a222a94fc Thirdparty: fix save 2020-11-19 22:17:45 +03:00
5aef0e809e Files: fix get share 2020-11-19 21:48:16 +03:00
1ddb6804ed Files: fix share thirdparty 2020-11-19 21:47:40 +03:00
Viktor Fomin
11c4864e9c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-19 16:20:27 +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
Artem Tarasov
c0346ddcf6 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-19 16:08:11 +03:00
Artem Tarasov
be094640fe Web: Files: Filter: fixed names of sorting items 2020-11-19 13:22:09 +03:00
2ceb845808 Thirdparty: fix copy 2020-11-19 11:30:00 +03:00
Viktor Fomin
a2e6e9cf25 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-18 18:00:28 +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
93410996f0 Merge branch 'develop' into refactoring/files-thirdparty 2020-11-18 15:19:36 +03:00
2909d9d240 Thirdparty: refactoring security, tag 2020-11-18 13:37:11 +03:00
3c19fda2de Thirdparty: refactoring security 2020-11-18 11:28:43 +03:00
20d37596cf Files: fix share 2020-11-17 22:36:27 +03:00
0c520416fa Files: remove cache 2020-11-17 21:17:23 +03:00
f1f9cce600
Merge branch 'develop' into feature/floating-button 2020-11-17 19:07:08 +03:00
6cb92946be fix uploadmemberphoto 2020-11-17 18:01:34 +03:00
f11a11d470 Thirdparty: refactoring 2020-11-17 17:56:36 +03:00
903abca3a8 Thirdparty: refactoring 2020-11-17 17:41:42 +03:00
1b03c87157 Thirdparty: refactoring 2020-11-17 17:08:54 +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
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
2c945b0414
Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-17 11:18:59 +03:00
121f34946b Files: added base "Only in TMFileDao" methods 2020-11-17 11:13:53 +03:00
Alexey Kostenko
3702bd597d Web: Common: Refactoring HOC withLayoutSize 2020-11-17 10:32:02 +03:00
Alexey Kostenko
c6d4b5bf60 Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-17 08:11:35 +03:00
Alexey Kostenko
99ae4dba20 Web: People: Changed Consumer to HOC 2020-11-17 06:39:08 +03:00
Alexey Kostenko
e65f2b36c7 Web: Files: Filter: Changed Consumer to HOC 2020-11-17 06:33:34 +03:00
7866ba1212 Files: removed dependencies 2020-11-16 21:30:33 +03:00
77fec89a0f Files: DotNetZip replaced with SharpCompress 2020-11-16 19:41:14 +03:00
Viktor Fomin
e51c7d2dd4 Update yarn.lock files 2020-11-16 18:56:12 +03:00
Artem Tarasov
8d56195705 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-16 17:35:43 +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
cd523404f1 Merge branch 'develop' into refactoring/scope 2020-11-16 17:09:19 +03:00
Artem Tarasov
7f1387410c Web: Files: VersionHistory: refactorung 2020-11-16 16:46:00 +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
7c228a78e5 Files: fix create file in thirdparty 2020-11-15 18:34:47 +03:00
68483bc979 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +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
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
Alexey Kostenko
df060ba8a2 Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-13 10:58:34 +03:00
Viktor Fomin
fc33f10e37
Merge branch 'develop' into feature/filter-loader 2020-11-13 10:30:09 +03:00
2ec76cae70 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-12 18:03:10 +03:00
Viktor Fomin
4c398104cb Update yarn.lock files 2020-11-12 15:06:18 +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
Artem Tarasov
ed2fa1260d Web: Files: VersionHistoryPanel: fixed styles 2020-11-12 14:25:52 +03:00
Viktor Fomin
9890f1cc43 Update yarn.lock files 2020-11-12 13:37:13 +03:00
Viktor Fomin
0bb00e39db Web: People: added header loader 2020-11-12 13:31:19 +03:00
Viktor Fomin
97d9d58a29 Web: Files: added header loader 2020-11-12 13:30:54 +03:00
Alexey Kostenko
366989ea9c Web: People: Added sectionWidth prop to filterInput 2020-11-12 11:23:08 +03:00
Artem Tarasov
f35effd715 Web: Files: VersionHistory: refactoring 2020-11-12 11:10:36 +03:00
Viktor Fomin
3dc69fc9e8 Web: People: added group loader 2020-11-12 00:12:28 +03:00
Viktor Fomin
45e9ab5aea Merge branch 'develop' into feature/filter-loader 2020-11-11 23:26:03 +03:00
d8bd2b7d21 Update yarn.lock files 2020-11-11 22:03:47 +03:00
c4411f7b00
Merge branch 'develop' into hotfix/section-loader 2020-11-11 21:54:02 +03:00
SuhorukovAnton
9039c810c5 x-www-form-urlencoded: fix 2020-11-11 18:36:58 +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
Alexey Kostenko
63dad62226 Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page) 2020-11-11 15:46:46 +03:00
Artem Tarasov
135c1d024d Web: Files: VersionHistory: added styles 2020-11-11 15:19:30 +03:00
Alexey Kostenko
7a6a9b539b Web: People: Fixed loading of the main page when switching from a profile 2020-11-11 14:09:40 +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
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
2ebd7e882c Web: People: fix first loader 2020-11-10 18:20:56 +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
Viktor Fomin
a82551568b Web: People: fix props name 2020-11-10 17:30:43 +03:00
SuhorukovAnton
6e2860a7e5 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-10 14:51:33 +03:00
Artem Tarasov
02aed65d60 Web: Files: DocEditor: fixed of mobile view 2020-11-10 14:29:59 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +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
1490332568 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
4458bca039 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-10 11:21:34 +03:00
6947185bab Files: refactoring 2020-11-10 11:21:22 +03:00
Viktor Fomin
9cbe89d4b5
Merge branch 'develop' into feature/filter-loader 2020-11-10 11:02:29 +03:00
Viktor Fomin
834e8e6516 Update yarn.lock files 2020-11-10 10:46:26 +03:00
Viktor Fomin
8648abedbd Web: People: delete first header preloader 2020-11-10 10:40:33 +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
afd252e2ce Web: People: fix profile action loader 2020-11-10 03:08:59 +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
Viktor Fomin
9f19173195 Web: People: added circle in row 2020-11-09 22:57:02 +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
3c38343063 Fix download.
fix thirdparty
2020-11-09 17:46:49 +03:00
Viktor Fomin
6e8685d8d6 Update yarn.lock files 2020-11-09 16:54:13 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +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
33ef924307 Web: People: fix first loader 2020-11-09 15:11:04 +03:00
Viktor Fomin
7211978a38 Web: Files: fix first loader 2020-11-09 15:10:51 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
884cb67a35 Web: People: delete logo 2020-11-09 13:07:43 +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
Viktor Fomin
445b2e83b5 Web: People: delete loading label 2020-11-09 12:37:13 +03:00
Artem Tarasov
fa8e8341e2 Web: Components/Files: fixed warrnings 2020-11-09 12:11:08 +03:00
Artem Tarasov
1bd3db6a17 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-09 11:21:34 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
Artem Tarasov
43bb83692d Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-11-06 18:08:22 +03:00
37fa37f473 Files: fix autofac 2020-11-06 17:54:48 +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
b1f9db662d Web: People: fix color 2020-11-06 16:17:56 +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
d2e8890b7b
Merge branch 'develop' into hotfix/documents-bugfix 2020-11-06 15:49:30 +03:00
Artem Tarasov
54aac4c933 Web: Files: EditingWrapperComponent: removed transfer of arrow functions to components 2020-11-06 15:44:08 +03:00
2250baf7b7 Thirdparty: fix 2020-11-06 15:10:27 +03:00
Artem Tarasov
157226ce83 Web: Files: row: fixed margin-right icon 2020-11-06 14:46:08 +03:00
Artem Tarasov
ed1d182068 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-06 14:25:17 +03:00
Artem Tarasov
92dd80519f Web: Files: images in row: added setting viewBox for files icons 2020-11-06 14:14:38 +03:00
SuhorukovAnton
89c6e5548c x-www-form-urlencoded: fix 2020-11-06 13:39:25 +03:00
SuhorukovAnton
2a98447b82 x-www-form-urlencoded: update PrivacyRoomController 2020-11-06 13:30:57 +03:00
Artem Tarasov
aba7666ede Web: Files: SharingPanel: fixed margin icon 2020-11-06 13:28:17 +03:00
SuhorukovAnton
7b8efca8b3 x-www-form-urlencoded: fix 2020-11-06 12:46:57 +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
SuhorukovAnton
8b5a34d98f Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-06 12:05:30 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +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
Vladislav Makhov
265ed05414 Merge branch 'develop' into feature/third-party-settings 2020-11-05 19:19:50 +03:00
e9b5992600 Fix PrivacyRoomController 2020-11-05 18:42:23 +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
Artem Tarasov
ace2111197 Web: People: applied prop size for Avatar Component 2020-11-05 11:40:19 +03:00
Viktor Fomin
3bdff517f9 Web: People: rename headers components 2020-11-05 11:16:33 +03:00
Viktor Fomin
081fe180bb Web: Files: rename headers components 2020-11-05 11:15:46 +03:00
Artem Tarasov
df9a1658e9 Web: People: refactoring 2020-11-05 09:44:20 +03:00
Artem Tarasov
6a4cabcedf Web: Components/Files/People: fix styles 2020-11-05 09:22:14 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
Viktor Fomin
72467a70c2 Web: People: fix header loader 2020-11-04 12:24:02 +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
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
78b2dc4631 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-03 11:47:16 +03:00
f39d6e83b8 Files: refactoring 2020-11-03 11:47:05 +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
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +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
42b7b93832
Merge branch 'develop' into feature/article-resize 2020-11-02 11:44:08 +03:00
2ae201ebbd Files: privacy 2020-11-02 11:29:01 +03:00
Artem Tarasov
a3b2475405 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-02 09:23:36 +03:00
6baeee6ddd Files: fix startediting 2020-10-31 18:14:37 +03:00
Ilya Oleshko
7726e17170 Merge branch 'develop' into feature/article-resize 2020-10-30 15:32:25 +03:00
Artem Tarasov
bda078beee Web: Files: selectors: fixed selection when dragging 2020-10-30 15:28:57 +03:00
Artem Tarasov
3caf7d6339 Merge branch 'develop' into hotfix/documents-bugfix 2020-10-30 15:25:30 +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
318202ca57 Web: People : UserContent : Added sectionWidth property, fixed missing styles 2020-10-30 14:23:56 +03:00
Ilya Oleshko
b055c0224a Web: People : Body : Added context to RowContainer 2020-10-30 14:23:23 +03:00
Ilya Oleshko
648427fbf4 Web: People : Header : Added context to Header 2020-10-30 14:22:48 +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
496d908f6d Notify: fix 2020-10-30 10:23:35 +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
265feee81e Refactoring: scope 2020-10-29 12:31:55 +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
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
Artem Tarasov
f8d34cbf99 Web: Files: VersionHistory: fixed styles for ModalDialog for tablets 2020-10-29 11:12:29 +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
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +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
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +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
75bbe888cd Scope: refactoring. Migration, ASC.Files.Service 2020-10-26 19:38:23 +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
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
9df3a1cf64 Web: Files: Fixed display folder icon 2020-10-22 19:32:45 +03:00
949cc1bd56 Startup revert 2020-10-22 17:32:53 +03:00
86a15c35aa Added root folder request 2020-10-22 17:17:20 +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
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
Alexey Kostenko
a1aaf8acf2 Web: Files: Fix header styles 2020-10-21 13:28:15 +03:00
1d2f65ba12 Refactoring: scope 2020-10-20 23:10:17 +03:00
352c04fd5f
Merge branch 'develop' into feature/files-recent 2020-10-20 19:14:43 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +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
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +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
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00