Commit Graph

4137 Commits

Author SHA1 Message Date
f8345f18ce Web: Common: fixed SelectedFrame, added scrolling, fixed selection in tile display 2020-07-24 10:34:53 +03:00
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
f18f14fa34 DocumentService: fix 2020-07-16 00:36:48 +03:00
cb1bf99393 Files: fix 2020-07-16 00:25:19 +03:00
f03ab16127 Converter: fix 2020-07-16 00:08:28 +03:00
d99f6ff0a5 Files: additional logging 2020-07-15 23:39:43 +03:00
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
9d0df35a17 DocumentService log error 2020-07-15 17:58:12 +03:00
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +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
533935906f Resource: fix 2020-07-15 12:55:31 +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
62ed90e9a0 web: common: bump version 2020-07-15 07:59:56 +03:00
Alexey
e886437d83 Web: Files: Fix tile styles 2020-07-15 07:30:59 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
Alexey
41f59c9130 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-13 16:00:51 +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
Ilya Oleshko
c9eb590f1e web: common: bump version 2020-07-13 15:56:36 +03:00
Ilya Oleshko
2d8b694374 Web: Common: Fixed order of returning filter props, add new 2020-07-13 15:56:24 +03:00
Alexey
8612f32ae5 web: common: bump version 2020-07-13 15:54:43 +03:00
Alexey
665915804e Web: Common: Fixed mobile view selector 2020-07-13 15:53:29 +03:00
Alexey
3ca42459a1 Web: Files: Separated the logic of the Filter and ViewSelector 2020-07-13 12:10:40 +03:00
589eaa17f1 web: components: bump version 2020-07-12 20:48:49 +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
58a9fc188c web: components: bump version 2020-07-10 14:39:52 +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
87a892ee73 web: components: bump version 2020-07-10 14:39:59 +03:00
Ilya Oleshko
62bdbf68a3 Web: Components: Fixed ContextMenuButton, removed bindings and added event property for onClick 2020-07-10 14:39:49 +03:00
7c8f84ab8b Fix Re-rendered because of props changes: props.onClick 2020-07-10 14:15:30 +03:00
Alexey
e07cfee5a9 web: components: bump version 2020-07-10 10:37:53 +03:00
Alexey
132242b06a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 08:54:01 +03:00
954551873f web: common: bump version 2020-07-09 22:27:27 +03:00
d0f66c66e7 Web: Files: Implemented CompleteVersion 2020-07-09 22:26:43 +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
5988855b61 Fix License 2020-07-08 18:30:23 +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
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +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
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
925654c3f6 Web: Common: added convert api 2020-07-07 10:27:04 +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
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00