Commit Graph

5347 Commits

Author SHA1 Message Date
314206639f Notify: fix 2020-06-29 19:15:18 +03:00
7950db51ff Notify: fix 2020-06-29 18:10:31 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
d7cb638a1e Backup: notify fix 2020-06-29 15:58:56 +03:00
3f97755c92 Backup: fix notify 2020-06-29 15:45:38 +03:00
4a848ea535 Backup: notify fix 2020-06-29 15:15:09 +03:00
SuhorukovAnton
e1f7b7365a api-defaultvalue: fix backup 2020-06-29 14:40:42 +03:00
SuhorukovAnton
4ba2223fa1 Merge branch 'master' into feature/api-defaultvalue 2020-06-29 14:20:24 +03:00
SuhorukovAnton
06cc93223f api-defaultvalue-fix 2020-06-29 14:16:23 +03:00
SuhorukovAnton
6869d7c8d1 api-defaultvalue: fix 2020-06-29 13:37:53 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
da91c97809 Files: added new for subfolder 2020-06-28 19:02:09 +03:00
90aad433a0 Files: fix getshare 2020-06-28 18:45:01 +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
b617257887 Notify: back rename 2020-06-28 14:08:12 +03:00
SuhorukovAnton
51be59740e api-defaultvalue 2020-06-26 15:48:41 +03:00
SuhorukovAnton
fc4f073a9b api-defaultvalue: fix 2020-06-26 12:59:39 +03:00
36e0d6a200 Thumb: fix 2020-06-26 12:55:19 +03:00
SuhorukovAnton
debb0d2193 api-defaultvalue: first version 2020-06-26 12:53:26 +03:00
7cafc968eb Thumb: fix 2020-06-26 12:40:46 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
237709f8f3 Thumb: fix 2020-06-26 10:53:52 +03:00
3a00f3e9d0 Files: fix GetNewItems 2020-06-26 10:45:24 +03:00
83b05c5b64 Files: added news 2020-06-25 20:17:24 +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
197f468bf7 Removed unused proto, added backup rewrite 2020-06-25 19:05:14 +03:00
23945aeb24 Api: backup removed 2020-06-25 16:25:03 +03:00
e18080508f
Merge pull request #44 from ONLYOFFICE/feature/thumbnails
Feature/thumbnails
2020-06-25 16:10:42 +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
0d2dc08ef8 Files: added new 2020-06-25 12:31:35 +03:00
453c812476 docker update 2020-06-23 18:10:13 +00:00
11cf2a954f docker: mysql sample data 2020-06-23 19:55:14 +03:00
62e179fae0 update dockerfile 2020-06-23 15:31:48 +00: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
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
f4592ed73d Thumb: fix 2020-06-17 14:36:09 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
78593b8c1f UserManager: fix 2020-06-17 12:53:12 +03:00
ca9af1080c Backup: refactoring 2020-06-17 10:49:17 +03:00
b36dac0cb4 Backup: fix 2020-06-16 19:04:40 +03:00