|
b617257887
|
Notify: back rename
|
2020-06-28 14:08:12 +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 |
|
|
b94e4fbeac
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-16 18:00:38 +03:00 |
|
|
b35a60cac0
|
Backup: added DeleteBackupRequest
|
2020-06-16 17:46:10 +03:00 |
|
|
dedd754875
|
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
|
2020-06-16 17:44:56 +03:00 |
|
SuhorukovAnton
|
5fbe80d32a
|
Thumbnails: first version
|
2020-06-16 14:55:46 +03:00 |
|
|
fc0826b60d
|
Backup: service, progress
|
2020-06-16 14:34:44 +03:00 |
|
|
38c40eec05
|
Merge branch 'master' into feature/backup
|
2020-06-15 18:40:26 +03:00 |
|
|
09e7a81e9b
|
UserManager: fix
|
2020-06-15 18:39:52 +03:00 |
|
|
9276bfd384
|
Backup: fix
|
2020-06-15 18:33:53 +03:00 |
|
|
68575e5048
|
Backup: ajaxpro removed
|
2020-06-15 11:19:40 +03:00 |
|
|
1f15d39445
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-06-13 18:32:07 +03:00 |
|
|
a05d0a94c8
|
Files: fix
|
2020-06-13 18:31:45 +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 |
|
|
2f8e09f915
|
fix
|
2020-06-10 17:22:48 +03:00 |
|
SuhorukovAnton
|
ab6588d99b
|
Backup: bagfix and refactoring
|
2020-06-10 15:35:10 +03:00 |
|
|
5aef887fe1
|
test: fix
|
2020-06-10 11:49:50 +03:00 |
|
|
31fc052531
|
Merge branch 'master' into feature/backup
|
2020-06-09 10:54:35 +03:00 |
|
|
344916b395
|
TenantManager: fix
|
2020-06-09 10:54:05 +03:00 |
|
|
3c66bbb607
|
Merge branch 'master' into feature/backup
|
2020-06-09 10:48:07 +03:00 |
|
|
eb7a026025
|
Backup: added autofac
|
2020-06-08 14:57:45 +03:00 |
|
SuhorukovAnton
|
af2295f98a
|
Backup: fix
|
2020-06-08 13:40:26 +03:00 |
|
|
725955e851
|
ProgressQueue: fix
|
2020-06-08 12:44:01 +03:00 |
|
|
5fb753b528
|
Backup: fix start
|
2020-06-08 11:17:54 +03:00 |
|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|