Commit Graph

2051 Commits

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