Commit Graph

4136 Commits

Author SHA1 Message Date
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
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +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
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
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
1871959768 fix 2020-06-25 15:17:22 +03:00
2fe2c2167b Merge branch 'master' into feature/thumbnails
# Conflicts:
#	ASC.Web.sln
2020-06-25 15:01:38 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
NikolayRechkin
b7e40eefdd update yarn.lock files 2020-06-25 11:01:47 +03:00
NikolayRechkin
9046c068fa web: common: bump version 2020-06-25 10:53:25 +03:00
NikolayRechkin
1337df1101 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-06-25 10:51:05 +03:00
NikolayRechkin
06fc4e9e33 web: common: MediaViewer. added a touch swipe events 2020-06-25 10:50:24 +03:00
d30a6a2186 web: components: bump version 2020-06-24 14:07:39 +03:00
3c619cfb40 Web: Components: fixed TreeFolders styles 2020-06-24 14:06:07 +03:00
SuhorukovAnton
e21d99e361 Thumbnails: fix 2020-06-23 14:19:12 +03:00
SuhorukovAnton
cce4d5fa7a Thumbnails: delete unnecessary 2020-06-23 14:14:13 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
a0dcf31041 web: components: bump version 2020-06-22 15:21:56 +03:00
2d232ffcb7 Web: Common: added onMouseDown event to DragAndDrop 2020-06-22 15:21:13 +03:00
NikolayRechkin
1d719ec3cb web: common: bump version 2020-06-22 09:53:54 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
10bcd867cc Web: Common: Api: Added getFileVersion 2020-06-18 17:45:35 +03:00
c672728b43 Web: Components: Export Box component 2020-06-18 17:45:01 +03:00
76e7ba73c4 web: components: bump version 2020-06-18 10:43:22 +03:00
2d627baa71 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-18 10:42:05 +03:00
d07e8e2322 Web: Components: added new styles to tree-node 2020-06-18 10:08:36 +03:00
6121a2c580 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-17 17:20:39 +03:00
39a5a75998 UI version page: init 2020-06-17 17:20:32 +03:00
571d41ac78 web: common: bump version 2020-06-17 17:16:05 +03:00
572fa4c3a5 Web: Files: fixed selector value, added new fields in folders 2020-06-17 17:15:15 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
f5ac2aa70f web: common: bump version 2020-06-17 11:41:17 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
9267ffe9b1 web: common: bump version 2020-06-16 11:49:44 +03:00
22a7df50b7 Web: Common: added DnD styles 2020-06-16 11:49:22 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
ceeff0b0c0 web: common: bump version 2020-06-15 15:41:34 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
a4645f72ef web: common: bump version 2020-06-15 13:49:37 +03:00
2b9dbcbe81 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-15 13:48:39 +03:00
7f0498f299 Web: Common: changed the logic of Drag And Drop 2020-06-15 13:46:42 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
Ilya Oleshko
e2cef60f0f web: components: bump version 2020-06-11 15:55:13 +03:00
Ilya Oleshko
9ab3b7557b web: common: bump version 2020-06-11 15:55:03 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
31bbd13805 web: common: bump version 2020-06-11 10:19:57 +03:00
10b03928b8 Web: Common: fixed viewScrollTop undefined value 2020-06-11 10:16:14 +03:00
7c96f27214 web: common: bump version 2020-06-11 09:56:35 +03:00
0ab8c4d872 Web: Common: fixed select items with scroll 2020-06-11 09:54:33 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00