IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,090 Commits 40 Branches 22 Tags 420 MiB
4bf9133851
Commit Graph

4120 Commits

Author SHA1 Message Date
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
pavelbannov
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
Alexey Safronov
589eaa17f1 web: components: bump version 2020-07-12 20:48:49 +03:00
Alexey Safronov
4efe98ff9e Revert "Fix Re-rendered because of props changes: props.onClick" 
This reverts commit 7c8f84ab8b.
 2020-07-12 20:48:15 +03:00
Alexey Safronov
58a9fc188c web: components: bump version 2020-07-10 14:39:52 +03:00
Alexey Safronov
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
Alexey Safronov
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
Alexey Safronov
954551873f web: common: bump version 2020-07-09 22:27:27 +03:00
Alexey Safronov
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
pavelbannov
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
gopienkonikita
6b97af6df3 web: common: bump version 2020-07-07 17:56:02 +03:00
gopienkonikita
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
gopienkonikita
b4ac3f3113 web: common: bump version 2020-07-07 10:35:59 +03:00
gopienkonikita
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
gopienkonikita
0e02ee4ec3 web: components: bump version 2020-07-06 10:29:08 +03:00
gopienkonikita
d3dc618ad9 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-06 10:28:44 +03:00
gopienkonikita
02c40ad657 Web: Files: moved dragging prop to redux, added onDrop function to TreeFolders 2020-07-06 10:28:31 +03:00
Alexey Safronov
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
gopienkonikita
b534cb1d1f web: components: bump version 2020-07-03 11:43:06 +03:00
gopienkonikita
023b5169b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-03 11:42:09 +03:00
gopienkonikita
903d474194 Web: Components: fixed progressBar value 2020-07-03 11:41:38 +03:00
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
NikolayRechkin
f9fd3d5122 web: common: bump version 2020-07-02 17:18:03 +03:00
NikolayRechkin
379974e8f2 web: common: added a double tap event 2020-07-02 17:17:23 +03:00
NikolayRechkin
d4eac18a74 web: common: bump version 2020-07-02 11:03:21 +03:00
NikolayRechkin
478e03530b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-07-02 11:03:03 +03:00
NikolayRechkin
1a32e11f2c web: Common: added a touch events 2020-07-02 11:02:50 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
gopienkonikita
cf3ee949da web: common: bump version 2020-06-30 15:03:28 +03:00