Commit Graph

2443 Commits

Author SHA1 Message Date
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
4a09b4b5f2 Web: fixed body scroll 2020-09-18 17:06:35 +03:00
Artem Tarasov
939a29442f Web: People: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:19:16 +03:00
Artem Tarasov
f3b8e4880c Web: Files: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:18:48 +03:00
Artem Tarasov
2e8a170166 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 16:10:09 +03:00
Artem Tarasov
ba03e55ffc added display of changes in group composition after adding/removing members 2020-09-17 16:05:56 +03:00
Artem Tarasov
fcaf136b2c added document title change after group update and deletion 2020-09-17 16:04:23 +03:00
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
9623029d82 Web: Files: Speeded up loading first page + refactoring 2020-09-17 12:07:36 +03:00
2f4a3141d5 Web: People: Speeded up loading first page + refactoring 2020-09-17 11:28:23 +03:00
TatianaLopaeva
a858a3a846 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-17 11:25:51 +03:00
a4cb368513 Update yarn.lock files 2020-09-16 18:39:06 +03:00
ba7c4db354 WebL People: Remove temp prop 2020-09-16 18:35:49 +03:00
374e4ece1a WebL People: Remove temp prop 2020-09-16 18:32:14 +03:00
e66ca03cbb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-16 18:08:41 +03:00
ecb2879a77 Web: Components: Styled AvatarEditor + applied changes 2020-09-16 18:08:32 +03:00
Artem Tarasov
0fb03ea54a Web: People: fixed double redirect after edit/create group 2020-09-16 16:13:03 +03:00
3b691247b2 Update yarn.lock files 2020-09-15 23:29:13 +03:00
986e53608d Update yarn.lock files 2020-09-15 22:55:11 +03:00
d750335924 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-09-15 22:43:37 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
TatianaLopaeva
3eeb24a5b5 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-15 17:52:45 +03:00
TatianaLopaeva
a3adea3c27 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
Artem Tarasov
58a43ed52d Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 16:24:57 +03:00
Vladislav Makhov
d4f4691fef Web: People: Change width values for rows 2020-09-15 16:22:58 +03:00
Vladislav Makhov
a0024722d0 Web: Files: Change width values for rows 2020-09-15 16:22:41 +03:00
Artem Tarasov
6a76e12027 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 16:22:38 +03:00
Artem Tarasov
6153e02c54 Web: People: added translation for Head field in GroupAction if there is no owner 2020-09-15 16:22:07 +03:00
4e34836e4e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-15 15:47:47 +03:00
6231d0654f Web: Files: fixed isCanCreate selector to Header 2020-09-15 15:47:39 +03:00
Artem Tarasov
89baffc5d6 Web: People: fixed display of profile removed if the group was created without an owner 2020-09-15 15:36:43 +03:00
Artem Tarasov
9c0bac60f5 Web:People: fixed styles for TreeMenu 2020-09-15 15:05:40 +03:00
Artem Tarasov
861ab54818 Web:Files; refactoring styled SettingsTree 2020-09-15 14:51:28 +03:00
Artem Tarasov
b4d0776ca4 Web:People: changed check for rendering PageLayout.ArticleMainButton 2020-09-14 14:34:42 +03:00
Artem Tarasov
3e42b49c3e Web:People: added icons for tree nodes, changed icon for root folder 2020-09-14 14:31:44 +03:00
Artem Tarasov
fc8325f65f Web:Files: refactoring SettingsTree 2020-09-14 13:53:37 +03:00
Alexey
69b8d0ec7d Web: Files/People/Components: Content rendered without columns on mobile devices 2020-09-14 08:51:54 +03:00
65fbf2247e Update yarn.lock files 2020-09-11 22:51:28 +03:00
09c8febfd3 Web: Files: Removed setup wrong title 2020-09-11 22:40:52 +03:00
de290abd57 Web: Files: Replaced invalid characters 2020-09-11 22:40:09 +03:00
51709f3c6d Web: Files: Changed default cursor in TreeSettings on loading 2020-09-11 22:39:22 +03:00
a44b4bc60a Web: Files: Fixed setIsLoading is undefined on triangle icon click 2020-09-11 22:38:50 +03:00
8045eecf1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-09-11 22:30:09 +03:00
c989eaf8a5 Web: Files: Changed default cursor in FolderTree on loading 2020-09-11 22:04:00 +03:00
2ccb4eebac Web: Files: Replaced title (People style) 2020-09-11 21:46:51 +03:00
4d97d6a7ac Web: Clients: Moved setup title to Article/Body 2020-09-11 21:45:46 +03:00
49ba2c96db Web: Files: Commented useless code 2020-09-11 20:43:40 +03:00
99a6fd523e Web: Client: Moved organizationName into authReducer 2020-09-11 18:03:40 +03:00
219ab9cac2 Web: Files: fixed Dnd display logic 2020-09-11 12:49:59 +03:00
a085b53cb8 Web: Files: refactoring isLoading 2020-09-11 12:22:18 +03:00
Artem Tarasov
76ad46fed1 refactoring, moved onLoading and isLoading to redux 2020-09-11 11:25:47 +03:00
c2d1df3fc3 Files: fix create first document 2020-09-10 21:34:23 +03:00
188b20ff86 Merge branch 'master' into feature/files 2020-09-10 17:10:19 +03:00
3a85553504 Files: GetFolderUrl fix 2020-09-10 17:09:27 +03:00
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
Vladislav Makhov
395b8b392c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 15:55:06 +03:00
Vladislav Makhov
175b244cd2 Fix state bug 2020-09-10 15:54:50 +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
Vladislav Makhov
b81f2e0dba Fix state bug 2020-09-10 15:01:56 +03:00
Vladislav Makhov
c12ae9624b Avatar editor: add indication of loading process 2020-09-10 14:18:58 +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
e4a222b57b Web: People: Fixed redirect on Save/Cancel GroupAction page 2020-09-09 22:18:27 +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
Artem Tarasov
1fd0f3c010 fixed redirect edit/view profile in people 2020-09-09 15:35:50 +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
fb53f4f1f1 Web: People: Added route to Error520 2020-09-04 20:35:21 +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
Ilya Oleshko
91705dd4da Web: People: Profile : Fixed avatar load 2020-09-03 17:16:05 +03:00
5298c1d27c Web: People: Excluded caching of temp userPhotos 2020-09-02 18:10:05 +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
4babaa5e67 Web: People: Fixed work with customNames 2020-09-02 11:59:36 +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
fc76acf31f Web: People: Home : Fixed property warnings for empty row places 2020-09-01 16:18:58 +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
Ilya Oleshko
6ad8abc8fa Web: People: Home : Added prop widthProp for components 2020-09-01 15:24:10 +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
f78eb3aada Web: People: fixed empty-screen-container to new article 2020-08-31 16:33:31 +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
2b9f263dbc Web: People: Added Webpack-bundle-analyzer 2020-08-31 11:59:35 +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
Ilya Oleshko
e899d9d6bd Web: People: Home : Fixed auto scroll to body on mobile or tablet devices 2020-08-28 12:14:22 +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
142232d0af Web: People: added aside panel to context-menu-button, added new translation 2020-08-19 10:38:34 +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
ac6dfbaebc Web People Client: simplified configuration of i18n (+ removed useless requests + removed useless Import page) 2020-08-17 13:17:38 +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
Alexey
fada82ae41 Web: Components: Fix rotate in avatar editor 2020-08-14 08:29:15 +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
abc2bcc03c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-11 15:57:35 +03:00
Ilya Oleshko
7ac9ad6c62 Web: People: Reassign: Fixed page wrapper 2020-08-11 15:51:27 +03:00
Ilya Oleshko
6df4e05bd9 Web: People: ProfileAction: Fixed page wrapper 2020-08-11 15:50:15 +03:00
Ilya Oleshko
bbc57115a3 Web: People: Profile: Fixed page wrapper 2020-08-11 15:49:54 +03:00
Ilya Oleshko
ade0c7d149 Web: People: Import: Fixed page wrapper 2020-08-11 15:49:40 +03:00
Ilya Oleshko
94f447a272 Web: People: Home: Fixed page wrapper 2020-08-11 15:49:22 +03:00
Ilya Oleshko
5d3f75b7ed Web: People: GroupAction: Fixed page wrapper 2020-08-11 15:49:03 +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
07116cfea6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-11 14:37:40 +03:00
f071702b77 Web: People: fixed profile routing 2020-08-11 14:37:03 +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
f41d10e07e Web: People: Home: Fixed items of GroupButtonsMenu 2020-08-11 11:04:40 +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