Commit Graph

6172 Commits

Author SHA1 Message Date
29b8c1e6cc Web: Files: fixed header styles 2020-07-08 13:20:44 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +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
74b9676819 Docker: added thumbnail, backup, notify 2020-07-07 19:26:55 +03:00
6b97af6df3 web: common: bump version 2020-07-07 17:56:02 +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
b4ac3f3113 web: common: bump version 2020-07-07 10:35:59 +03:00
02be7f51e4 Web: Files: added file conversion 2020-07-07 10:35:06 +03:00
925654c3f6 Web: Common: added convert api 2020-07-07 10:27:04 +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
0e02ee4ec3 web: components: bump version 2020-07-06 10:29:08 +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
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +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
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +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
b534cb1d1f web: components: bump version 2020-07-03 11:43:06 +03:00
023b5169b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-03 11:42:09 +03:00
903d474194 Web: Components: fixed progressBar value 2020-07-03 11:41:38 +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