Daniel Pan
|
666063f47c
|
Merge pull request #1556 from haiwen/rename-fix
Rename fix
|
2017-04-22 17:49:07 +08:00 |
|
llj
|
7c82cada60
|
[dir view] rename: fix
|
2017-04-22 16:40:05 +08:00 |
|
llj
|
dbc8d1b041
|
[dir view] rename: fix
|
2017-04-22 16:30:58 +08:00 |
|
llj
|
390424fe30
|
[dir view] enable 'select text' when rename
|
2017-04-22 15:47:25 +08:00 |
|
Daniel Pan
|
f9e9b44ed9
|
Merge pull request #1555 from haiwen/video-file-icon
[file icon] added file icon for video files
|
2017-04-21 11:20:22 +08:00 |
|
llj
|
055e860e87
|
[file icon] added file icon for video files
|
2017-04-20 16:13:54 +08:00 |
|
llj
|
3443479e75
|
[video] show thumbnail for video files in dir-view/favorites/view-shared-dir pages
|
2017-04-19 16:21:33 +08:00 |
|
lian
|
02a3078829
|
check if repo/dir has been shared when share repo/dir
|
2017-04-19 16:05:59 +08:00 |
|
zhengxie
|
4d3b1964f3
|
wip: Support video thumbnail, moviepy and ffmpeg are required to enable this feature
|
2017-04-18 18:02:11 +08:00 |
|
llj
|
2a8e40c3c0
|
[image] use thumbnail for magnificPopups, file_view page & shared_file_view page
|
2017-04-18 17:28:29 +08:00 |
|
xiez
|
3dd41dd202
|
Merge pull request #1550 from haiwen/wopi
add wopi app
|
2017-04-18 16:07:03 +08:00 |
|
lian
|
4a76fc0cbc
|
add wopi app
|
2017-04-18 15:37:12 +08:00 |
|
xiez
|
6ea2858f64
|
Merge pull request #1548 from haiwen/is-admin
use true/false as the return value of "is_admin" field
|
2017-04-18 15:30:48 +08:00 |
|
zhengxie
|
81db6a7a0a
|
[institution] Add institution quota
|
2017-04-18 14:12:29 +08:00 |
|
lian
|
54a09989f0
|
update thumbnail
generate thumbnail of a shared file.
|
2017-04-18 12:03:33 +08:00 |
|
zhengxie
|
0c61a22100
|
Fix tests
|
2017-04-17 16:37:23 +08:00 |
|
zhengxie
|
e72cde9d0a
|
Update Django to 1.8.18
|
2017-04-17 16:37:11 +08:00 |
|
zhengxie
|
e6e6e82b82
|
Merge branch '6.0'
Conflicts:
seahub/api2/endpoints/file.py
seahub/urls.py
static/scripts/app/views/share.js
|
2017-04-17 16:21:22 +08:00 |
|
lian
|
9829bb2e86
|
update usage of seafile api
1. seafile_api.get_org_user_quota_usage
1. seafile_api.get_org_user_quota
|
2017-04-17 16:10:12 +08:00 |
|
lian
|
088bf8f6c5
|
Merge pull request #1543 from haiwen/onlyoffice
Add onlyoffice support
|
2017-04-17 15:23:44 +08:00 |
|
lian
|
6922c8fa0d
|
use true/false as the return value of "is_admin" field
|
2017-04-17 14:57:46 +08:00 |
|
xiez
|
3d662c3fdb
|
Merge pull request #1547 from haiwen/pic-rotate
update pic rotation when generate thumbnail
|
2017-04-14 16:46:26 +08:00 |
|
lian
|
b594025f2b
|
update pic rotation when generate thumbnail
|
2017-04-14 14:43:11 +08:00 |
|
llj
|
33eedef917
|
Merge pull request #1544 from haiwen/repo-name
update name check when create repo
|
2017-04-14 14:31:32 +08:00 |
|
lian
|
534272ecd2
|
add name check at front end by js
|
2017-04-14 14:03:25 +08:00 |
|
lian
|
fef1d50ecd
|
add name check
1. create/rename repo
1. create/rename folder
1. create/rename file
|
2017-04-14 13:21:16 +08:00 |
|
xiez
|
b0754e31bb
|
Merge pull request #1546 from haiwen/search-api
check if repo exists before search file
|
2017-04-14 10:45:50 +08:00 |
|
lian
|
927527c8de
|
check if repo exists before search file
|
2017-04-13 16:40:29 +08:00 |
|
zhengxie
|
8d7bceef25
|
Add onlyoffice support
|
2017-04-12 14:48:25 +08:00 |
|
Daniel Pan
|
91d9619b26
|
Merge pull request #1542 from haiwen/favorites-magnificPopup-fix
[favorites] fixed magnificPopup
|
2017-04-12 10:27:38 +08:00 |
|
llj
|
6706bbce89
|
[favorites] fixed magnificPopup
|
2017-04-11 18:09:45 +08:00 |
|
xiez
|
1a508c78c6
|
Merge pull request #1540 from haiwen/alpha-api
Alpha api
|
2017-04-11 17:49:59 +08:00 |
|
lian
|
132d181c3a
|
update repo history api
add 'name' and 'contact_email' to result
|
2017-04-11 17:44:17 +08:00 |
|
Daniel Pan
|
4522201366
|
Merge pull request #1541 from haiwen/admin-log-icon
[system admin] side nav: modified icon for 'admin logs'
|
2017-04-11 13:50:24 +08:00 |
|
llj
|
41e2f7738c
|
[system admin] side nav: modified icon for 'admin logs'
|
2017-04-11 10:56:10 +08:00 |
|
lian
|
756ccf1303
|
add api
1. add repo history api.
1. add repo trash api.
1. udpate search file api, add 'content_highlight' to search result
|
2017-04-10 17:23:34 +08:00 |
|
lian
|
0967a35630
|
udpate code style of url.py
|
2017-04-08 17:55:12 +08:00 |
|
llj
|
ad21c9f0d8
|
Merge pull request #1532 from haiwen/favorites-thumbnail
[favorites] show thumbnail for image files
|
2017-04-08 12:16:10 +08:00 |
|
Daniel Pan
|
478a9fe703
|
Merge pull request #1536 from haiwen/share-fix
[file view] share: fix for link with expiration
|
2017-04-08 11:10:26 +08:00 |
|
llj
|
c17d72b615
|
[file view] share: fix for link with expiration
|
2017-04-08 11:02:19 +08:00 |
|
Daniel Pan
|
994414fab0
|
Merge pull request #1535 from haiwen/revert
Revert
|
2017-04-07 11:40:21 +08:00 |
|
lian
|
af4b430572
|
Revert "Fix tests"
This reverts commit 375b270b53.
|
2017-04-07 10:10:17 +08:00 |
|
lian
|
7de34634a0
|
Revert "Update Django to 1.8.18"
This reverts commit 928cf4a09c.
|
2017-04-07 10:09:59 +08:00 |
|
zhengxie
|
375b270b53
|
Fix tests
|
2017-04-06 17:01:58 +08:00 |
|
lian
|
937d839565
|
update get repo owner
check if repo exists before get org repo owner
|
2017-04-06 16:15:03 +08:00 |
|
Daniel Pan
|
0d8c01c7ce
|
Merge pull request #1534 from haiwen/org-repo-owner
update get org repo owner
|
2017-04-06 16:06:35 +08:00 |
|
lian
|
5a52d4257f
|
update get org repo owner
|
2017-04-06 14:50:40 +08:00 |
|
zhengxie
|
928cf4a09c
|
Update Django to 1.8.18
|
2017-04-06 14:13:32 +08:00 |
|
llj
|
ab67b1b5a3
|
[favorites] show thumbnail for image files
|
2017-04-01 16:59:17 +08:00 |
|
xiez
|
0e025beae2
|
Merge pull request #1530 from haiwen/top-bar-fix
[UI] top-bar: bugfix & improvement
|
2017-03-30 13:48:34 +08:00 |
|