|
|
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 |
|
|
|
1798e7bb7b
|
web: components: bump version
|
2020-06-25 18:14:06 +03:00 |
|
|
|
25d88203f0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-06-25 18:13:42 +03:00 |
|
|
|
8f5889af33
|
Web: Files: Home: Added version history context menu
|
2020-06-25 18:12:33 +03:00 |
|
|
|
e2a80c0e0c
|
Web: Components: Passed event to onClick handler
|
2020-06-25 18:11:34 +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 |
|
|
|
f4e8912cc2
|
Merge branch 'master' into feature/files
|
2020-06-25 12:34:11 +03:00 |
|
|
|
0d2dc08ef8
|
Files: added new
|
2020-06-25 12:31:35 +03:00 |
|
Ilya Oleshko
|
dff436cbf6
|
Web: Files: Home: Added context actions
|
2020-06-25 11:31:32 +03:00 |
|
Alexey
|
ad2e808fe5
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-06-25 11:09:58 +03:00 |
|
Alexey
|
edf3cae733
|
Web: Files: Small refactoring
|
2020-06-25 11:09:45 +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 |
|
Alexey
|
7313c9c35f
|
Web: Files: Updated link for portal users and open media file by link
|
2020-06-25 10:07:04 +03:00 |
|
|
|
8afdad8eb4
|
docker: select branch
|
2020-06-24 16:51:29 +00: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 |
|
|
|
b64fd26e72
|
Web: Files: added a panel for new files, removed the fake badge of new files
|
2020-06-24 13:37:54 +03:00 |
|
|
|
be09fc0510
|
docker: change config/supervisor/supervisord.conf
|
2020-06-23 19:40:01 +00:00 |
|
|
|
5ff7ddd875
|
Merge branch 'master' into feature/files
|
2020-06-23 18:21:31 +00: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 |
|
