Commit Graph

4086 Commits

Author SHA1 Message Date
a18212da87 Web: Files: added files convert to row, fixed api 2020-07-07 17:55:01 +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
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
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
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
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
cf3ee949da web: common: bump version 2020-06-30 15:03:28 +03:00
0025f3b858 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-30 15:00:57 +03:00
5c3ff62d2e Web: Files: added badge click event 2020-06-30 15:00:44 +03:00
Ilya Oleshko
6c07204658 web: common: bump version 2020-06-30 12:26:21 +03:00
Ilya Oleshko
00d9c26640 Web: Common: Fixed itemId check for filter change view 2020-06-30 12:26:14 +03:00
Ilya Oleshko
f883297700 web: common: bump version 2020-06-30 11:43:48 +03:00
Ilya Oleshko
c2a9189d4e Web: Files: Home: Filter: Added viewSettings to SortComboBox for mobile devices 2020-06-30 11:43:40 +03:00
Alexey
8cb95b4a64 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-30 09:41:04 +03:00
Alexey
a3dd53878e Web: Files/Common: added ViewSelector component 2020-06-30 09:40:09 +03:00
6c2352d4e5 Merge branch 'master' into feature/files 2020-06-29 17:54:33 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
c6975459cb Merge branch 'master' into feature/files 2020-06-29 16:54:44 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
6d05a77b60 Merge branch 'master' into feature/files 2020-06-29 12:40:47 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
461fc55f22
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
2020-06-28 16:23:36 +03:00
155e0b2c9b Backup: fix 2020-06-28 14:46:16 +03:00
2d1d09096c web: common: bump version 2020-06-26 17:41:11 +03:00
6bf6a774ef Web: Common: fix hammer off error 2020-06-26 17:40:24 +03:00
1626d179ee web: common: bump version 2020-06-26 15:59:13 +03:00
6e37032e21 web: components: bump version 2020-06-26 15:58:43 +03:00
792f8ff7a8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-26 15:55:54 +03:00
0c9fa66e36 Web: Common: added new api methods 2020-06-26 15:52:46 +03:00
6d40997d09 Web: Components: removed badge from tree-menu, fixed tree styles 2020-06-26 15:51:47 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
817d0d1bb1 Thumb: fix 2020-06-26 11:01:37 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
29a0e752bb Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
1798e7bb7b web: components: bump version 2020-06-25 18:14:06 +03:00
e2a80c0e0c Web: Components: Passed event to onClick handler 2020-06-25 18:11:34 +03:00
23945aeb24 Api: backup removed 2020-06-25 16:25:03 +03:00
b01b3d85f8 Backup: fix 2020-06-25 16:10:28 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00