Commit Graph

5239 Commits

Author SHA1 Message Date
Vladislav Makhov
97fa7010ea Set scale prop at the "sign in" button 2020-06-30 06:48:14 +03:00
Vladislav Makhov
a93ee38107 Rename remember text 2020-06-30 06:45:30 +03:00
Vladislav Makhov
fb386a8783 Change "forgot password" styles 2020-06-30 06:44:08 +03:00
Vladislav Makhov
8eaf1f02b7 Make greetingTitle black 2020-06-30 06:39:14 +03:00
Vladislav Makhov
df996552c3 Make Header component is available on login page 2020-06-30 06:26:31 +03:00
Vladislav Makhov
05263bf36e Remove logo from FormContainer 2020-06-29 17:12:32 +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
36e0d6a200 Thumb: fix 2020-06-26 12:55:19 +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
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