Commit Graph

5924 Commits

Author SHA1 Message Date
77d1853370 Merge branch 'master' into feature/files 2020-06-29 15:59:37 +03:00
d7cb638a1e Backup: notify fix 2020-06-29 15:58:56 +03:00
2d711a9f85 Merge branch 'master' into feature/files 2020-06-29 15:47:15 +03:00
3f97755c92 Backup: fix notify 2020-06-29 15:45:38 +03:00
3fd2242766 Merge branch 'master' into feature/files 2020-06-29 15:15:37 +03:00
4a848ea535 Backup: notify fix 2020-06-29 15:15:09 +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
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
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
ebfee242dc Web: Files: moved the media viewer visible to redux 2020-06-26 17:17:51 +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
75f29fe11b Web: Files: added badge for displaying new files 2020-06-26 15:55:34 +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
Ilya Oleshko
c04b4cfddb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-26 15:13:21 +03:00
Ilya Oleshko
25793c9570 Web: Files: Home: Added "new" badge for folders 2020-06-26 15:13:13 +03:00
fd4a4c2aec Merge branch 'master' into feature/files 2020-06-26 12:55:54 +03:00
36e0d6a200 Thumb: fix 2020-06-26 12:55:19 +03:00
943bd44458 Merge branch 'master' into feature/files 2020-06-26 12:41:45 +03:00
7cafc968eb Thumb: fix 2020-06-26 12:40:46 +03:00
8f9e294d21 docker: bug fix 2020-06-26 12:28:38 +03:00
b3aaa823f5 docker: update sql dump 2020-06-26 11:46:51 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
817d0d1bb1 Thumb: fix 2020-06-26 11:01:37 +03:00
5319b905e6 Merge branch 'master' into feature/files 2020-06-26 10:54:17 +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
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +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
Ilya Oleshko
506642b02c Web: Files: Home: Added edit or create check for actions 2020-06-25 17:08:48 +03:00
Ilya Oleshko
a454b51bfe Web: Files: Home: Fixed rerender after selecting elements 2020-06-25 16:31:06 +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