Commit Graph

1364 Commits

Author SHA1 Message Date
ea16508688 Merge branch 'master' into feature/files 2020-09-10 16:32:12 +03:00
2413e22323 Files: GetFolderUrl fix 2020-09-10 16:31:32 +03:00
Artem Tarasov
6a219488e9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 16:01:30 +03:00
Artem Tarasov
3c4562a03a removed passing onLoading and isLoading in ArticleBodyContent through properties 2020-09-10 16:00:02 +03:00
3e059081fe Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-10 15:22:54 +03:00
36a0bf12f4 Web: Files: fixed error handler create file/folder 2020-09-10 15:22:44 +03:00
f724848195 Merge branch 'master' into feature/files 2020-09-10 13:45:15 +03:00
0a6c2fda18 Files: fix FileConverterQueueScope 2020-09-10 13:44:38 +03:00
7433eea815 Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh 2020-09-10 13:19:06 +03:00
23b2a310a0 Merge branch 'master' into feature/files 2020-09-10 12:35:55 +03:00
fb0dec0a16 Files: fix 2020-09-10 12:30:33 +03:00
323823981a Update yarn.lock files 2020-09-09 22:25:31 +03:00
b3b6fd0938 Web: Components: Re-written ModalDialog component with SLOT pattern 2020-09-09 21:49:25 +03:00
cc9e0e1374 Merge branch 'master' into feature/scope
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
SuhorukovAnton
5f62bfb00d scope: bugfix 2020-09-09 17:02:51 +03:00
Alexey
5843368d4f Web: Files: Increased the width of the "row update text" field 2020-09-09 15:41:28 +03:00
e0febd8890 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-09-09 13:49:25 +03:00
a70b890581 Notify: rename 2020-09-09 13:43:39 +03:00
b674bc2f2f Merge branch 'master' into feature/files 2020-09-08 17:36:47 +03:00
c87fd2cfdb Files: share fix 2020-09-08 17:36:22 +03:00
c468c5e6cc Merge branch 'master' into feature/files 2020-09-08 17:03:19 +03:00
ad51a6bf29 Files: fix 2020-09-08 17:00:29 +03:00
98429ce4ab Merge branch 'master' into feature/files 2020-09-08 16:34:21 +03:00
92a72d7983 Files: Tag. Fix 2020-09-08 16:33:39 +03:00
765558b7b1 Merge branch 'master' into feature/files 2020-09-08 16:23:12 +03:00
f8b3382a42 Files: tagDao. Fix 2020-09-08 16:22:45 +03:00
893f7be135 Merge branch 'master' into feature/files 2020-09-08 16:11:09 +03:00
187e5de648 TagDao: fix 2020-09-08 16:10:18 +03:00
d30026b82f Merge branch 'master' into feature/files 2020-09-08 15:20:05 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +03:00
00f913794d Web: Files: fixed arrow button 2020-09-08 11:16:03 +03:00
9778b258d7 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:41:51 +03:00
efbebc05b5 Update yarn.lock files 2020-09-07 18:41:42 +03:00
886c7d6464 Merge branch 'master' into feature/files 2020-09-07 18:16:33 +03:00
d9783ecf26 Web: Common: fixed sort-combobox styles, added isMobile prop 2020-09-07 17:31:36 +03:00
96df0ab8ca Api: added payment settings 2020-09-07 16:53:39 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
c7cb291668 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-07 13:55:24 +03:00
a2f050590b Update yarn.lock files 2020-09-04 21:04:05 +03:00
49f5166517 Web: Files: Added route to Error520 2020-09-04 20:35:49 +03:00
0432158a0f Web: Files: fixed files page crash 2020-09-04 19:10:24 +03:00
020ccfd7d4 Scope: fix 2020-09-04 14:33:44 +03:00
f48574a809 Merge branch 'master' into feature/scope 2020-09-04 11:26:03 +03:00
Artem Tarasov
72476521cd Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-02 18:03:27 +03:00
Artem Tarasov
17d5e7fb95 refactoring styles 2020-09-02 17:58:21 +03:00
0eb3b2b4d3 Update yarn.lock files 2020-09-02 12:30:53 +03:00
da50146545 Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render) 2020-09-02 12:19:21 +03:00
6bf251bb8e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 18:34:23 +03:00
0152274029 Web: Clients: Fixed workbox.expiration.Plugin is not a constructor 2020-09-01 18:34:06 +03:00
Artem Tarasov
dfb32288e8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 18:32:48 +03:00
Artem Tarasov
3778ca9aea refactoring 2020-09-01 18:32:15 +03:00
00c6ce5e9b Web: Clients: Added api-cache in service-worker for base info for 30 Minutes 2020-09-01 18:11:20 +03:00
bd6c0d0338 Web: Clients: Fixed windows is not defined 2020-09-01 18:09:39 +03:00
bc8613c4f6 Web: Clients: Uncommented self.skipWaiting() on install service-worker 2020-09-01 17:53:24 +03:00
Ilya Oleshko
4e663b9514 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 15:25:43 +03:00
Ilya Oleshko
4e7ab40221 Web: Files: Home : Added render checking and code formatting 2020-09-01 15:25:32 +03:00
Artem Tarasov
c876730130 added APIs methods 2020-09-01 11:44:43 +03:00
Artem Tarasov
ba42cdcb71 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 10:16:53 +03:00
Artem Tarasov
461cb53b4e added getFilesSettings 2020-09-01 01:05:28 +03:00
29d9f21d05 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
5f7265931c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-31 17:45:52 +03:00
062a3a793f Update yarn.lock files 2020-08-31 17:45:37 +03:00
9ee046bb1e Web: Files: fixed empty-screen-container to new article 2020-08-31 16:32:44 +03:00
f5348c3ccd Files: settings. Added settings, forcesave, thirdparty 2020-08-31 15:41:28 +03:00
d9f70df70a Update yarn.lock files 2020-08-31 12:42:36 +03:00
1c5402db37 Web: Files: Added Webpack-bundle-analyzer 2020-08-31 12:07:58 +03:00
SuhorukovAnton
90f1c4fa3d Merge branch 'master' into feature/scope 2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
1fb90663ee Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-31 10:04:45 +03:00
1f32e91d54 Web: Files: added widthProp to row 2020-08-31 10:03:48 +03:00
3da549264e Merge branch 'master' into feature/data-storage-migration 2020-08-28 18:46:20 +03:00
Artem Tarasov
0e32424313 refactoring 2020-08-28 17:42:01 +03:00
Artem Tarasov
4b9631597b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-28 12:15:53 +03:00
Ilya Oleshko
ab16aa979d Web: Files: Home : Fixed auto scroll to body on mobile or tablet devices 2020-08-28 12:14:35 +03:00
Artem Tarasov
b859f35e5e implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods 2020-08-28 12:13:53 +03:00
Diana
7466aed406 choice between mysql and postgresql 2020-08-28 00:45:07 +03:00
17c4cf02fc Merge branch 'master' into feature/files 2020-08-27 18:06:05 +03:00
be5abb8cd3 Files: added settings methods 2020-08-27 18:05:21 +03:00
Artem Tarasov
551d171ac1 added error403 to Settings, when thirdParty is disabled 2020-08-27 18:00:20 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
Artem Tarasov
69a54a0717 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-27 10:39:54 +03:00
Artem Tarasov
84d4446b23 added api methods for settings, refactoring 2020-08-27 10:38:46 +03:00
e1dbf344c7 Web: Files: fixed logout to files module 2020-08-26 16:26:38 +03:00
7fa6111cc3 Web: Files: fixed DragAndDrop 2020-08-26 15:21:22 +03:00
Artem Tarasov
95d5414718 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-26 13:55:49 +03:00
Artem Tarasov
872d0dae0d Fixed MainButton accessibility when going to Settings 2020-08-26 13:55:04 +03:00
3fce8d1027 Web: Files: fixed row click on mobile 2020-08-26 13:36:30 +03:00
82af63f80d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-26 11:35:19 +03:00
78e62b36fc Web: Files: removed custom dropzone function, refactoring 2020-08-26 11:35:12 +03:00
Artem Tarasov
392896de1f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-25 15:24:14 +03:00
Artem Tarasov
c584f75c4e fixed node selection when switching between TreeSettings and TreeFolders 2020-08-25 15:23:43 +03:00
8e88dd8239 Web: Files: fixed onLoading prop 2020-08-25 11:01:45 +03:00
SuhorukovAnton
055e787d63 scope: fix 2020-08-24 21:41:06 +03:00
Artem Tarasov
5a494b3c2c refactoring. moved the onLoading function to redux 2020-08-24 17:25:41 +03:00
SuhorukovAnton
c96620554d Merge branch 'master' into feature/scope 2020-08-24 17:09:42 +03:00
Artem Tarasov
35c1b08547 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-24 12:50:52 +03:00
Artem Tarasov
c385fd3b34 fixed selected node SettingsTree 2020-08-24 12:50:27 +03:00
ccf177bf7b Web: Files: fixed tree badge styles 2020-08-24 11:21:28 +03:00
Artem Tarasov
4cbfa4c6ae fixed routing SettingsTree 2020-08-24 10:33:16 +03:00
Artem Tarasov
503acfeea1 fixed translate SettingsTree 2020-08-21 13:38:55 +03:00
Diana
bb5c2a23e7 postgree 2020-08-21 05:34:37 +03:00
Artem Tarasov
d01dfb0aae Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 18:43:20 +03:00
fd5a9a74f0 Merge branch 'master' into feature/files 2020-08-20 17:51:14 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
603a8bbbc5 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-20 17:40:52 +03:00
2fc42a79e5 Web: Files: fixed sharing panels styles 2020-08-20 17:39:23 +03:00
Artem Tarasov
141e4ffaec fix style 2020-08-20 16:09:46 +03:00
15ba6828c5 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-08-20 12:43:12 +03:00
6ce83a9d3f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 12:17:46 +03:00
d5942241e8 Web: Clients: Parallelized initial API queries 2020-08-20 12:17:36 +03:00
Artem Tarasov
4eace9bae1 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 11:27:47 +03:00
Artem Tarasov
f2c39cd592 added common settings, translation 2020-08-20 11:27:00 +03:00
96ec887ffa Web: Files: fixed sharing panel styles 2020-08-20 11:19:54 +03:00
05bc905831 Web: Clients: Fixed regex to transltaion.json files for serviceWorker 2020-08-19 21:18:23 +03:00
27f52a2dc2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 20:00:57 +03:00
8d11e1b0c8 Web: Clients: Changed interaction with serviceWorker 2020-08-19 20:00:41 +03:00
Artem Tarasov
cdbeea4741 added translation, admin settings 2020-08-19 18:16:31 +03:00
Artem Tarasov
6130af291e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 16:14:59 +03:00
Artem Tarasov
4754a84483 fixed routing 2020-08-19 16:14:21 +03:00
56af481750 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-19 10:38:50 +03:00
8fb4214a1f Web: Files: added aside panel to context-menu-button, added new translation 2020-08-19 10:38:43 +03:00
Artem Tarasov
7d4b18405e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-18 17:27:20 +03:00
Artem Tarasov
1e6a2c37dc added Routing, refactoring 2020-08-18 17:23:30 +03:00
2b37363939 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-18 17:04:01 +03:00
a7aef2667d Web: Files: added translations 2020-08-18 17:00:12 +03:00
Artem Tarasov
b4d837320e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-18 15:55:50 +03:00
7a813247af Web: Clients: fixed url to loading translation.json for products 2020-08-18 11:18:44 +03:00
c16c9b280a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-17 14:19:19 +03:00
673860f987 Web Files Client: simplified configuration of i18n (+ removed useless requests) 2020-08-17 14:17:44 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +03:00
Artem Tarasov
e35f7a8ebf fixed styles (svg icons in tree nodes, margin-top) 2020-08-14 18:28:01 +03:00
7f9dc150ed Files: revert 2020-08-14 18:00:40 +03:00
f00a964c32 Merge branch 'master' into feature/private
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
Artem Tarasov
d969cac7e9 created TreeSettings, added translate 2020-08-14 17:19:12 +03:00
b15ad23ab9 Web: Files: fixed styles 2020-08-14 17:07:30 +03:00
maksim
c7a3fa85f2 Thirdparty: remove reference 2020-08-14 16:16:48 +03:00
maksim
c24bdfbbba Merge branch 'master' into feature/thirdparty 2020-08-14 16:01:55 +03:00
maksim
4a29a69761 feature custom nuget server 2020-08-14 13:48:34 +03:00
7bd1e7abe1 Web: Files: added version api 2020-08-14 13:02:23 +03:00
6d92275269 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-08-14 11:42:13 +03:00
58fffc1756 File: fix revision 2020-08-14 11:35:34 +03:00
9299193f6c Web: Files: fixed embedding link, fixed share link 2020-08-13 15:56:24 +03:00
0626d82fa8 Web: Files: added unblock/check-in api 2020-08-13 14:42:29 +03:00
2616e8a8dd Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 12:02:07 +03:00
37df28d1a9 Web: Files: fixed badge error 2020-08-13 12:02:00 +03:00
62c5bd5244 Merge branch 'master' into feature/files 2020-08-13 11:53:47 +03:00
cbf9630d7f File: added Locked, LockedBy 2020-08-13 11:52:59 +03:00
b60dad90b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 09:59:13 +03:00
ef15a36cf8 Web: Files: added icons to context menu actions 2020-08-13 09:59:05 +03:00
d6ff0d6a44 Merge branch 'master' into feature/files 2020-08-12 18:26:28 +03:00
6782269c7f Files: lock file 2020-08-12 18:13:52 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
3a37e0839a Files: fix FileShareLink 2020-08-12 17:34:54 +03:00
c0f82fdf71 Web: Files: added Unblock/Check-in 2020-08-12 14:39:04 +03:00
maksim
6782b16413 fix: replacing projectreference with packagereference 2020-08-12 13:34:19 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
181c1e52f4 Web: Files: added version history api 2020-08-12 11:08:04 +03:00
f3749c1c94 Web: Files: fixed version styles 2020-08-12 10:14:40 +03:00
Ilya Oleshko
30c17e3220 Web: Files: VersionHistory: Fixed page wrapper 2020-08-11 15:48:37 +03:00
Ilya Oleshko
9d703ec01e Web: Files: Home: Fixed page wrapper 2020-08-11 15:48:17 +03:00
Ilya Oleshko
71a2f02cdc Web: Files: Home: Moved function initialization out of render 2020-08-11 11:15:54 +03:00
Ilya Oleshko
20d411dfb9 Web: Files: Home: Fixed items of GroupButtonsMenu 2020-08-11 11:05:06 +03:00
Ilya Oleshko
bcb546ce0e Web: Files: Wdyr not expand by default 2020-08-11 10:59:51 +03:00
e0795e0f17 Web: Files: added translations to sharing panel 2020-08-11 10:38:53 +03:00
5a3d046287 Web: Files: fixed sharing panel styles 2020-08-10 16:13:37 +03:00
33c45e3486 Web: Files: added translations to VersionHistory 2020-08-10 15:29:22 +03:00
fcda53f1f5 Web: Files: fixed scroll in the sharing panel 2020-08-10 14:04:42 +03:00
010875e7ef Web: Files: removed fetchFiles from filter 2020-08-10 11:42:15 +03:00
65ef03615e Web: Files: fixed update tree after files operations 2020-08-07 17:36:54 +03:00
4abfc3385e Web: Files: fixed update tree folders 2020-08-07 17:21:51 +03:00
7d69c3e7e4 Web: Files: added new update logic for badge 2020-08-07 16:54:26 +03:00
e34be36031 Web: Files: fixed focus in the sharing panel 2020-08-07 16:52:43 +03:00
9ceee0dfc6 Web: Files: fixed items select 2020-08-06 16:47:28 +03:00
53ab16529d Web: Files: fixed close group-button-menu 2020-08-06 16:09:20 +03:00
6c69ece258 Web: Files: added close events by keys, fixed focus in aside 2020-08-05 15:17:21 +03:00
f8b791fa54 Merge branch 'master' into feature/files 2020-08-04 10:33:33 +03:00
a9e8c89240 Files: fix add tag 2020-08-04 10:30:09 +03:00
7055672075 Web: Files: fixed document edit 2020-08-04 09:44:22 +03:00
483906fed8 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-08-03 18:29:41 +03:00
1701db1a91 Files: fix CompleteVersion 2020-08-03 18:28:34 +03:00
34c2252b25 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
2020-08-02 22:31:52 +03:00
6253b151e1 fix ChangeHistory, UpdateFile, added UpdateComment 2020-08-02 21:48:58 +03:00
e4501f3cd6 Web: Files: added edit comment panel to VersionHistory 2020-07-31 17:24:57 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
8ce8aed45d Web: Files: fixed items select 2020-07-31 12:14:44 +03:00
018298e921 Web: Files: fixed row warning 2020-07-31 11:31:11 +03:00
72bc996a1a Web: Files: added file operations to contextMenu, refactoring 2020-07-31 11:14:37 +03:00
547852e678 Web: Files: added new translations 2020-07-31 11:10:16 +03:00
SuhorukovAnton
73fff2e63c Merge branch 'master' into feature/scope 2020-07-30 16:39:52 +03:00
e85c125900 Web: Files: refactoring VersionHistory page, fixed page crash when following a direct url 2020-07-30 10:52:19 +03:00
7fb40014dd Web: Files: fixed VersionHitory header styles 2020-07-30 10:45:59 +03:00
SuhorukovAnton
456866d4d9 scope: refactoring 2020-07-30 00:57:58 +03:00
18b2935c12 fix merge 2020-07-29 14:52:37 +03:00
0231e60cc7 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
#	web/ASC.Web.Components/src/index.js
2020-07-28 17:34:46 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +03:00
eabb06f8a8 Web: Files: hid the progress settings in the progress bar 2020-07-24 13:48:24 +03:00
be81ca291d Update yarn.lock files + bump versions 2020-07-17 18:03:08 +03:00
d094546147 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
ec20c66c5d Update yarn.lock files 2020-07-17 17:43:39 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
fafe83cebd Merge branch 'master' into feature/files 2020-07-16 16:53:56 +03:00
679e77a3ea Update yarn.lock files 2020-07-16 16:09:09 +03:00
4681fb0f78 fix 2020-07-16 16:02:21 +03:00
098e872a38 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
78b10ab893 Update yarn.lock files 2020-07-16 14:55:40 +03:00
8d0d5fd908 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	web/ASC.Web.Components/package.json
2020-07-16 14:41:32 +03:00
ff41b28a64 DI: files fix 2020-07-16 12:08:20 +03:00
Alexey
b4304d8526 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-16 11:33:17 +03:00
a505175b58 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-16 11:00:18 +03:00
595362b2b3 Web: Files: moved files uploader to separate file, moved convert dialog to redux, added routing to MainButton actions 2020-07-16 11:00:09 +03:00
060a173691 Web: Files: fixed Delete progress 2020-07-16 10:04:25 +03:00
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
ddf5aa6f19 Files: additional logging 2020-07-15 23:18:35 +03:00
Alexey
965b2e97d3 Web: Common: Tile view temporarily hidden 2020-07-15 19:05:40 +03:00
531b66875f Files: fix 2020-07-15 18:27:46 +03:00
SuhorukovAnton
6da23f477b ASC.Files.Core: refactoring 2020-07-15 18:07:34 +03:00
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +03:00
SuhorukovAnton
83a88d0240 Merge branch 'master' into feature/ASC.Files.Core 2020-07-15 17:38:40 +03:00
Alexey
356a18acc6 Web:Files: Added translation to tile view 2020-07-15 17:04:29 +03:00
a54be3b64c Merge branch 'master' into feature/files 2020-07-15 16:57:14 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
Alexey
4bf9133851 Web: Files: Tile: fix styles and small refactoring 2020-07-15 11:31:23 +03:00
Alexey
b573555024 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-15 08:00:04 +03:00
Alexey
e886437d83 Web: Files: Fix tile styles 2020-07-15 07:30:59 +03:00
SuhorukovAnton
5bf0bd22b6 ASC.Files.Core: first version 2020-07-14 13:03:53 +03:00
bb507b5aeb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-14 10:16:21 +03:00
bc671b4332 Web: Files: fixed pathParts error 2020-07-14 10:14:53 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
a347f4e4f3 fix 2020-07-13 16:18:31 +03:00
Alexey
e5b71cff4f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-07-13 16:00:32 +03:00
a822f9b349 Files: fix 2020-07-13 15:57:39 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
a0fddf446d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-13 13:17:09 +03:00
d109aab32b Web: Files: moved progress to redux 2020-07-13 13:17:00 +03:00
Alexey
3ca42459a1 Web: Files: Separated the logic of the Filter and ViewSelector 2020-07-13 12:10:40 +03:00
b7d79e9a2f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-12 20:48:30 +03:00
4efe98ff9e Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b.
2020-07-12 20:48:15 +03:00
Alexey
e3294771ce Web: Files: Home: Fixed selection of elements on Tile view 2020-07-12 12:49:25 +03:00
Alexey
031788ba50 Web: Files: Home: Fixed init styled TileContent outside render 2020-07-12 11:52:56 +03:00
Alexey
5b027aa170 Web: Files: Home: Removed the header if there are no files or folders. Refactoring 2020-07-12 11:37:25 +03:00
064160a1ea Files: onedrive 2020-07-10 18:37:02 +03:00
Alexey
5423d392f8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 16:01:48 +03:00
Ilya Oleshko
63bf62d331 Web: Files: Home: Fixed check event for onEditComplete action 2020-07-10 16:00:09 +03:00
Alexey
b99d3c5e7d Web: Files: Tile: Mobile style fix 2020-07-10 15:41:06 +03:00
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
56df9a98ef Files: resources 2020-07-10 14:57:42 +03:00
6f316242cb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:38:44 +03:00
Ilya Oleshko
2ff6c73876 Web: Files: Home: Fixed context menu actions for edit 2020-07-10 14:40:47 +03:00
d8597a8602 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:15:40 +03:00
7c8f84ab8b Fix Re-rendered because of props changes: props.onClick 2020-07-10 14:15:30 +03:00
Alexey
dbc98c1a84 Web: Files: Home: Fixed onEditComplete function bind for tile 2020-07-10 14:05:46 +03:00
SuhorukovAnton
2925ff25b4 api-defaultvalue: add System.Text.Json 2020-07-10 13:35:24 +03:00
Ilya Oleshko
e55e2414b9 Web: Files: Home: Fixed onEditComplete function bind for row 2020-07-10 13:14:09 +03:00
e48c202528 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 11:42:14 +03:00
9cbef5763f Web: Files: Added why-did-you-render package (https://github.com/welldone-software/why-did-you-render) 2020-07-10 11:42:06 +03:00
Ilya Oleshko
950eaf2d43 Web: Files: Home: Fixed init styled RowContent outside render 2020-07-10 11:39:55 +03:00
Alexey
c6fa5aecef Web: Files: fixed tile styles 2020-07-10 10:35:36 +03:00
Alexey
132242b06a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 08:54:01 +03:00
d0f66c66e7 Web: Files: Implemented CompleteVersion 2020-07-09 22:26:43 +03:00
c9040bd1e3 Files: fix CompleteVersion 2020-07-09 22:26:00 +03:00
SuhorukovAnton
f8e42cbd08 api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
SuhorukovAnton
28e70e91f6 api-defaultvalue: add JsonPropertyNames 2020-07-09 18:37:36 +03:00
e48c6077a2 Web: Files: Replace bind to data-api usage 2020-07-09 18:03:44 +03:00
3db51c32e1 Web: Files: Replace bind to data-api usage 2020-07-09 16:28:01 +03:00
ddfe9f05bf Web: Files: Replace bind to data-api usage 2020-07-09 16:20:56 +03:00
8a4d7a4da2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-09 15:59:02 +03:00
Ilya Oleshko
2ef98eee3b Web: Files: Home: Added icon for edit/create action 2020-07-09 15:49:32 +03:00
ecb5613ada Web: Files: fixed duplicate input ids 2020-07-09 15:13:51 +03:00
47ed29b8ad Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-09 15:10:12 +03:00
3db03a70e5 Web: Files: Replace bind to data-api usage 2020-07-09 15:09:50 +03:00
447f0b0c98 Web: Files: added link for sharing to social networks 2020-07-09 12:29:44 +03:00
71c267939d Files: fix names and Serializers 2020-07-09 12:02:44 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
c2b962f8e6 Web: Files: fixed safari convert icon styles 2020-07-08 16:55:39 +03:00
05ad931149 Web: Files: fixed header styles 2020-07-08 14:24:45 +03:00
ec6236612c Web: Files: fixed confirmation of modal dialogs with empty files 2020-07-08 14:00:17 +03:00
29b8c1e6cc Web: Files: fixed header styles 2020-07-08 13:20:44 +03:00
Alexey
6435d8759b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-07-08 13:02:01 +03:00
Alexey
1a99461091 Web: Files: Added file view as tiles 2020-07-08 12:26:25 +03:00
66cee95ff1 Web: Files: fixed aside panel styles, fixed moveTo/copyTo error 2020-07-08 11:44:46 +03:00
b8d70657bb Web: Files: fixed convert dialog style 2020-07-08 09:39:17 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
a18212da87 Web: Files: added files convert to row, fixed api 2020-07-07 17:55:01 +03:00
a9dec93ad4 Web: Files: refactoring convert 2020-07-07 15:00:50 +03:00
SuhorukovAnton
88cad55450 api-defaultvalue: delete DataMembers 2020-07-07 12:59:12 +03:00
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +03:00
02be7f51e4 Web: Files: added file conversion 2020-07-07 10:35:06 +03:00
5121869447 Web: Files: added convert dialog 2020-07-07 10:26:28 +03:00
Alexey
e7b4727b77 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-07 07:45:32 +03:00
Alexey
50ed35c9e5 Web: Files: Added folder view as tiles 2020-07-07 07:45:22 +03:00
51c3e533ea Web: Files: fixed TreeFolders selected node style 2020-07-06 11:19:18 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
c8d6ba3cd1 Web: Files: removed duplicate t prop 2020-07-06 10:41:47 +03:00
d3dc618ad9 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-06 10:28:44 +03:00
02c40ad657 Web: Files: moved dragging prop to redux, added onDrop function to TreeFolders 2020-07-06 10:28:31 +03:00
b155a850f1 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-05 14:35:26 +03:00
51a993b2ea Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# 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
#	web/ASC.Web.Components/package.json
2020-07-05 14:35:14 +03:00
6cc564b716 Merge branch 'master' into feature/files 2020-07-04 12:47:53 +03:00
2b4d853b77 Files: fix 2020-07-04 12:46:01 +03:00
81ace5028d Merge branch 'master' into feature/files 2020-07-03 18:34:27 +03:00
6c0b91a836 Files: converter fix 2020-07-03 18:33:40 +03:00
9a2c382dfc Merge branch 'master' into feature/files 2020-07-03 17:47:29 +03:00
b9b938cdf8 Files: fix convert 2020-07-03 17:47:01 +03:00
c318086fca Merge branch 'master' into feature/files 2020-07-03 17:37:49 +03:00
9440367b3a FileConvert: fix 2020-07-03 17:37:14 +03:00
7cba451f89 Merge branch 'master' into feature/files 2020-07-03 14:49:26 +03:00
98b007fe35 Files: fix CheckConversion 2020-07-03 14:48:56 +03:00
be99a345f7 Merge branch 'master' into feature/files 2020-07-03 14:24:47 +03:00
13efc06874 Files: fix 2020-07-03 14:19:45 +03:00
2b6ef1e745 Merge branch 'master' into feature/files 2020-07-03 13:37:09 +03:00
ded7034ba7 Files: fix convert 2020-07-03 13:36:31 +03:00
Ilya Oleshko
80deafb3e3 Web: Files: Home: Fixed translation key 2020-07-03 12:37:10 +03:00
151ec90f4c Merge branch 'master' into feature/files 2020-07-03 11:35:09 +03:00
479a4e5896 Files: additional logging 2020-07-03 11:34:36 +03:00
Ilya Oleshko
e9fb8b95e1 Web: Files: Home: Added translations for context options 2020-07-03 11:00:25 +03:00
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
c9a64ca377 Added NullIfDefault 2020-07-02 18:15:52 +03:00
SuhorukovAnton
5737eca3ad api-defaultvalue: fix 2020-07-02 15:50:31 +03:00
944dbabf40 Web: Files: fixed click event 2020-07-02 13:09:32 +03:00
6a019c6c35 Web: Files: fixed SharingPanel render 2020-07-02 11:50:32 +03:00
SuhorukovAnton
02729b9b37 api-defaultvalue: fix 2020-07-02 10:27:25 +03:00
SuhorukovAnton
cb0cbf99a4 api-defaultvalue: fix 2020-07-02 10:24:01 +03:00
SuhorukovAnton
d185a6143c api-defaultvalue: fix 2020-07-02 10:20:41 +03:00
ba4b16393e Web: Files: fixed badges update, fixed markAsRead 2020-06-30 18:46:19 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
d13c4ac3bd Web: Files: fixed markAsRead 2020-06-30 16:54:39 +03:00
0025f3b858 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-30 15:00:57 +03:00
5c3ff62d2e Web: Files: added badge click event 2020-06-30 15:00:44 +03:00
Ilya Oleshko
d52c0a67b7 Web: Files: Home: Filter: Fixed init, added translation keys 2020-06-30 11:58:23 +03:00
Ilya Oleshko
c2a9189d4e Web: Files: Home: Filter: Added viewSettings to SortComboBox for mobile devices 2020-06-30 11:43:40 +03:00
Alexey
8cb95b4a64 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-30 09:41:04 +03:00
Alexey
a3dd53878e Web: Files/Common: added ViewSelector component 2020-06-30 09:40:09 +03:00
SuhorukovAnton
4ba2223fa1 Merge branch 'master' into feature/api-defaultvalue 2020-06-29 14:20:24 +03:00
SuhorukovAnton
06cc93223f api-defaultvalue-fix 2020-06-29 14:16:23 +03:00
SuhorukovAnton
6869d7c8d1 api-defaultvalue: fix 2020-06-29 13:37:53 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
da91c97809 Files: added new for subfolder 2020-06-28 19:02:09 +03:00
90aad433a0 Files: fix getshare 2020-06-28 18:45:01 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
ebfee242dc Web: Files: moved the media viewer visible to redux 2020-06-26 17:17:51 +03:00
792f8ff7a8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-26 15:55:54 +03:00
75f29fe11b Web: Files: added badge for displaying new files 2020-06-26 15:55:34 +03:00
SuhorukovAnton
51be59740e api-defaultvalue 2020-06-26 15:48:41 +03:00
Ilya Oleshko
25793c9570 Web: Files: Home: Added "new" badge for folders 2020-06-26 15:13:13 +03:00
SuhorukovAnton
fc4f073a9b api-defaultvalue: fix 2020-06-26 12:59:39 +03:00
SuhorukovAnton
debb0d2193 api-defaultvalue: first version 2020-06-26 12:53:26 +03:00
5319b905e6 Merge branch 'master' into feature/files 2020-06-26 10:54:17 +03:00
3a00f3e9d0 Files: fix GetNewItems 2020-06-26 10:45:24 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
83b05c5b64 Files: added news 2020-06-25 20:17:24 +03:00
25d88203f0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-06-25 18:13:42 +03:00
8f5889af33 Web: Files: Home: Added version history context menu 2020-06-25 18:12:33 +03:00
Ilya Oleshko
506642b02c Web: Files: Home: Added edit or create check for actions 2020-06-25 17:08:48 +03:00
Ilya Oleshko
a454b51bfe Web: Files: Home: Fixed rerender after selecting elements 2020-06-25 16:31:06 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
f4e8912cc2 Merge branch 'master' into feature/files 2020-06-25 12:34:11 +03:00
0d2dc08ef8 Files: added new 2020-06-25 12:31:35 +03:00
Ilya Oleshko
dff436cbf6 Web: Files: Home: Added context actions 2020-06-25 11:31:32 +03:00
Alexey
edf3cae733 Web: Files: Small refactoring 2020-06-25 11:09:45 +03:00
Alexey
7313c9c35f Web: Files: Updated link for portal users and open media file by link 2020-06-25 10:07:04 +03:00
b64fd26e72 Web: Files: added a panel for new files, removed the fake badge of new files 2020-06-24 13:37:54 +03:00
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
bfcd495815 Web: Files: fixed SharingPanel styles 2020-06-22 16:59:04 +03:00
8b5c7f842a Web: Files: fixed context-menu actions 2020-06-22 15:20:24 +03:00
c9dd9c57d7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-22 14:26:39 +03:00
12aa58e26b Web: Files: fixed TreeFolders render 2020-06-22 14:26:20 +03:00
Alexey
1a93002655 Web: Files: Added translation: "Link for portal users" 2020-06-22 11:27:52 +03:00
Alexey
c8a48b0755 Web: Files: Link for portal users 2020-06-22 10:45:28 +03:00
Ilya Oleshko
59d5b843a1 Web: Files: Home: Fixed home re-rendering after change property for tree 2020-06-19 13:10:43 +03:00
259c004838 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-06-18 17:50:40 +03:00
235e10a645 Web: Files: VersionHistory: Added simple version viewer 2020-06-18 17:49:07 +03:00
8a62a57de9 Web: Files: Fixed undefined error 2020-06-18 17:46:10 +03:00
2968205e53 Web: Files: fixed TreeFolders styles, added DragAndDrop validation 2020-06-18 16:43:21 +03:00
2cd534e7fb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-18 14:31:46 +03:00
e6108694df Web: Files: VersionHistory: Added back button 2020-06-18 14:31:38 +03:00
2d627baa71 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-18 10:42:05 +03:00
19eacb0099 Web: Files: added DragAndDrop to TreeFolders 2020-06-18 10:41:56 +03:00
6d86341900 Web: Files: Added opportunity to go to version history page by click on badge 2020-06-18 10:31:51 +03:00
6121a2c580 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-17 17:20:39 +03:00
39a5a75998 UI version page: init 2020-06-17 17:20:32 +03:00
6a241f7f93 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-17 11:40:35 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
Ilya Oleshko
51d7984c91 Web: Fixed header icons width to 17px 2020-06-17 11:26:18 +03:00
53bb74f26f Web: Files: Replaced icons in FolderTree 2020-06-17 10:50:30 +03:00
Ilya Oleshko
2bdbb60545 Web: Files: App: Use Studio layout only if we need it 2020-06-16 19:28:09 +03:00
Ilya Oleshko
42f4b01dbf Web: Files: DocEditor: Fixed height after change router 2020-06-16 19:26:54 +03:00
Ilya Oleshko
55574cd2de Web: Files: Home: Fixed first select, added closing menu after operations 2020-06-16 18:21:38 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
4d403544f6 Web: Files: fixed mouseUp function 2020-06-16 17:28:11 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
2b9dbcbe81 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-15 13:48:39 +03:00
024b973a1f Web: Files: changed the logic of Drag And Drop, added tooltip of operations 2020-06-15 13:48:27 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
1f15d39445 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-06-13 18:32:07 +03:00
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
df0508ee01 Web: Files: fixed drag and drop in the trash folder 2020-06-09 11:14:16 +03:00
0882db7a80 Web: Files: added setSelections function to SelectedFrame, code refactoring 2020-06-09 10:04:03 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
Ilya Oleshko
be6b6eb3ad Merge branch 'master' into feature/files 2020-06-05 14:25:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
Ilya Oleshko
1d53e84d7f Web: Files: Home: Fixed filter type for selector 2020-06-05 12:02:54 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
06a7e81a49 Files: feed. FoldersModule 2020-06-04 19:36:43 +03:00
70376338ce Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:48:24 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
Ilya Oleshko
d14268ab66 Web: Files: Home: Fixed context menu triggering 2020-06-04 16:47:37 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
Ilya Oleshko
424b8566f9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:17:04 +03:00
Ilya Oleshko
61a45fcd3d Web: Files: Home: Apply default filter after first page load 2020-06-04 16:15:04 +03:00
Ilya Oleshko
7c5d6da7b1 Web: Files: Article: Fixed go out of page range after tree navigation 2020-06-04 16:14:18 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
acfaa84ee8 Web: Files: added DragAndDrop to module Files, refactoring operations panel 2020-06-04 15:54:06 +03:00
99dc0aca98 Web: Files: fixed MoveTo CopyTo translations 2020-06-04 15:51:36 +03:00
2d4dda536c Web: Files: added new translations 2020-06-04 15:34:07 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
Ilya Oleshko
7be13a76b1 Web: Files: Article: Fixed translation key warning 2020-06-04 11:09:02 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
b7969e6bfb Web: Files: fixed tree render 2020-06-03 14:33:40 +03:00
Ilya Oleshko
a09db02952 Web: Files: Home: Fixed restore filter after reload page 2020-06-03 14:05:50 +03:00
Ilya Oleshko
4cf89ef3b5 Web: Files: Home: Fixed filter init 2020-06-03 13:30:28 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
NikolayRechkin
346be5b443 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-29 09:51:12 +03:00
0599944585 Web: Files: added dropzone uploading, code refactoring 2020-05-29 09:30:49 +03:00
NikolayRechkin
4819c535b6 Merge branch 'master' into feature/files 2020-05-29 00:18:02 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
80dcee7ed4 Files: fix long operations 2020-05-27 18:23:50 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
a2b933994e Web: Files: fixed conflictResolveType for files operations 2020-05-27 15:10:33 +03:00
NikolayRechkin
686151c65a Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-26 14:46:53 +03:00
NikolayRechkin
c54af7f933 web: files: do not render the closed media viewer 2020-05-26 14:46:10 +03:00
dc1597825e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-26 14:31:24 +03:00
ead15da793 Web: Files: fixed update tree folders after remove 2020-05-26 14:31:11 +03:00
Ilya Oleshko
4b107b45dd Web: Files: DocEditor: Added mobile view for mobile devices 2020-05-26 12:53:58 +03:00
49de9ec7b9 Web: Files: added progress-bar for empty recycle bin operation 2020-05-21 17:10:58 +03:00
NikolayRechkin
784e78736f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-21 15:38:31 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
150e229ee8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-21 15:18:44 +03:00
86a0f456a5 Web: Files: fixed error in files operations, added restore action 2020-05-21 15:18:35 +03:00
Nikolay Rechkin
cbc0332919
Merge pull request #38 from ONLYOFFICE/feature/media-viewer
Feature/media viewer
2020-05-21 14:20:24 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +03:00
88f19ced05 Files: fix 2020-05-21 11:24:40 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
8f5913929f Web: Files: fixed opening the operation panel 2020-05-20 15:43:27 +03:00
dbc222849d Web: Files: fixed create folder action 2020-05-20 15:24:07 +03:00
08c8caf5de Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 13:47:08 +03:00
3576dcb7be Web: Files: fixed files and folders deletion actions in contextMenu 2020-05-20 13:46:56 +03:00
a61103e0f8 Merge branch 'master' into feature/files 2020-05-20 12:59:32 +03:00
a064da49f4 Files: fix OpenEdit 2020-05-20 12:58:40 +03:00
1ef138701b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 12:00:09 +03:00
761b3cd4f7 Web: Files: added progress to delete dialog 2020-05-20 12:00:02 +03:00
ea9bb3df38 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-05-20 11:28:24 +03:00
68dfa9dcd7 Merge branch 'master' into feature/files 2020-05-20 11:27:52 +03:00
cee180669b Files: added FileEntryWrapperConverter 2020-05-20 11:27:20 +03:00
5207769230 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 10:55:34 +03:00
bdee7bf455 Web: Files: added MoveTo and Copy actions, code refactoring 2020-05-20 10:54:08 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
b63b8edc21 web: files: fix 2020-05-19 09:27:46 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
NikolayRechkin
20cf39f908 web: common: MediaViewer. Refactoring 2020-05-19 00:12:48 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
609290dcd9 Merge branch 'master' into feature/files 2020-05-18 12:03:38 +03:00
18a7198e8c Web: Files: added error handlers 2020-05-18 12:00:37 +03:00
7e387cf51a Files: fix 2020-05-18 11:59:37 +03:00
4b89f35538 Web: Files: fixed sharing panel selected options 2020-05-18 11:34:07 +03:00
bcd8e1915e Web: Files: fixed download actions 2020-05-18 11:16:45 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
f0adf6d38e FileOperation: ProgressStep fixed 2020-05-18 10:43:53 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
2424924eed Files: optimization 2020-05-17 21:11:56 +03:00
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
cc64abed6f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-15 21:25:40 +03:00
6e31e618ef Web: Files: fixed download as 2020-05-15 21:25:31 +03:00
8c11f5364c Web: Files: added download files upload with progress 2020-05-15 21:02:56 +03:00
f97e690773 Web: Files: added sharing api 2020-05-15 18:47:35 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
787ddf831c Merge branch 'master' into feature/files 2020-05-15 14:03:33 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
aeef09bbc1 Merge branch 'master' into feature/files 2020-05-15 12:58:43 +03:00
19a43e461a Files: createindex fixed 2020-05-15 12:57:40 +03:00
ea03b6428f fix 2020-05-14 20:39:40 +03:00
2c21d99ca2 Files: fix 2020-05-14 19:53:26 +03:00
93f6771f48 Files: serializer 2020-05-14 18:52:06 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +03:00
28c09d37f2 Files: fixed DbFilesSecurity keys 2020-05-14 15:43:56 +03:00
17a88df5ac Files: fix download 2020-05-14 13:47:53 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
NikolayRechkin
6bfad7069d web: common: MediaViewer. fixed a file deletion 2020-05-14 11:47:57 +03:00
NikolayRechkin
22a0046f1f web: files: MediaViewer. file deletion 2020-05-13 16:20:23 +03:00