Commit Graph

2233 Commits

Author SHA1 Message Date
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
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
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