Daniel Pan
|
5c69f79688
|
Merge pull request #1545 from haiwen/use-thumbnail
[image] use thumbnail for magnificPopup & file view page
|
2017-04-24 18:21:45 +08:00 |
|
xiez
|
a0286f1a6f
|
Merge pull request #1553 from haiwen/video
video thumbnail
|
2017-04-24 16:26:23 +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 |
|
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 |
|
llj
|
2a8e40c3c0
|
[image] use thumbnail for magnificPopups, file_view page & shared_file_view page
|
2017-04-18 17:28:29 +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 |
|
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 |
|
llj
|
6706bbce89
|
[favorites] fixed magnificPopup
|
2017-04-11 18:09:45 +08:00 |
|
llj
|
ab67b1b5a3
|
[favorites] show thumbnail for image files
|
2017-04-01 16:59:17 +08:00 |
|
llj
|
59ff3fb180
|
[UI] top-bar: bugfix & improvement
|
2017-03-30 12:12:41 +08:00 |
|
zhengxie
|
1b11350f80
|
Merge branch '6.0'
Conflicts:
seahub/templates/sysadmin/sysadmin_backbone.html
seahub/urls.py
seahub/views/sysadmin.py
static/scripts/app/views/dir.js
|
2017-03-27 13:53:35 +08:00 |
|
llj
|
b9b02cee57
|
[share popup] fixed 'direct download link'
|
2017-03-27 12:06:39 +08:00 |
|
lian
|
54ec4bba63
|
add test for admin log api
|
2017-03-23 15:05:47 +08:00 |
|
llj
|
acf79cf1aa
|
[system admin] admin logs: fix
|
2017-03-22 17:26:42 +08:00 |
|
lian
|
dd88c4e043
|
add admin operation logs page
|
2017-03-22 17:26:42 +08:00 |
|
llj
|
acc1ebb6eb
|
[dir view] bugfix for 'magnificPopup' & 'grid-item download'
|
2017-02-25 17:36:07 +08:00 |
|
llj
|
e65a95c707
|
[fileupload] update-confirm-popup: fix
|
2017-02-22 16:44:14 +08:00 |
|
llj
|
8f54c031e4
|
[dir view] fix for 'move via drag & drop'
|
2017-02-20 17:40:36 +08:00 |
|
Daniel Pan
|
b84c09e972
|
Merge pull request #1491 from haiwen/mobile-side-nav
[mobile] side nav: modified for sysadmin-backbone pages & all non-bac…
|
2017-02-17 22:55:12 +08:00 |
|
llj
|
b0d6304852
|
[mobile] side nav: modified for sysadmin-backbone pages & all non-backbone pages
|
2017-02-17 18:43:38 +08:00 |
|
zhengxie
|
d82df5fb52
|
Merge branch '6.0'
Conflicts:
media/js/base.js
seahub/api2/views.py
seahub/views/ajax.py
tests/api/test_repo_user_folder_perm.py
|
2017-02-17 17:11:33 +08:00 |
|
llj
|
c8f5d4ed5d
|
[dir view] '.repo-op' UI: bugfix
|
2017-02-17 13:26:43 +08:00 |
|
xiez
|
6fd822f45f
|
Merge pull request #1457 from haiwen/admin-group
udpate admin groups page
|
2017-02-09 18:11:09 +08:00 |
|
llj
|
f85d9e8e67
|
[dir view] bugfix for img view with magnificPopup
|
2017-02-09 16:00:36 +08:00 |
|
lian
|
718bdbb59b
|
update admin manage group page
|
2017-02-09 14:59:49 +08:00 |
|
llj
|
51fae749a5
|
Merge pull request #1336 from haiwen/rm-ajax
Rm ajax
|
2017-02-07 17:01:11 +08:00 |
|
lian
|
7c1c1e2977
|
update rm ajax
|
2017-02-07 16:03:46 +08:00 |
|
lian
|
d43a2e5eb3
|
admin search group by name
|
2017-01-19 18:21:04 +08:00 |
|
lian
|
7a8eb038e2
|
update get file uploaded bytes
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
06bc49d17b
|
rm ajax get file op url
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
6d577d83e3
|
rm repo change password
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
a862fad836
|
rm set repo user/group perm
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
18c60fd306
|
update cp/mv file/dir
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
cb837d5112
|
rm ajax toggle_group_modules
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
734263b76e
|
update cancel_cp
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
4a120b5aa5
|
update cp_progress
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
d05f72b7a0
|
update user personal wiki module
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
312500c55e
|
rm get_my_unenc_repos
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
86f948aaa8
|
update set_notice_seen_by_id
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
5a700d5f00
|
update set_notices_seen
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
996c67fdb7
|
rm get_user_contacts
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
8d62d3786e
|
update get unseen notifications count
|
2017-01-19 14:40:49 +08:00 |
|
lian
|
f13b61e497
|
add remote wipe option when admin unlink device
|
2017-01-17 13:30:25 +08:00 |
|
Daniel Pan
|
86e9eb5fbc
|
Merge pull request #1435 from haiwen/mobile
Mobile
|
2017-01-16 14:31:14 +08:00 |
|
llj
|
01fb83c9b2
|
[mobile] added 'updateDirOpBarUI'
|
2017-01-12 11:39:21 +08:00 |
|
llj
|
5f4935f6ce
|
fix
|
2017-01-09 14:17:22 +08:00 |
|