1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-15 07:52:14 +00:00
Commit Graph

86 Commits

Author SHA1 Message Date
lian
2fe5db8c76 update lock feature
Don't allow delete/rename/move a file when it is locked
2017-12-27 15:03:47 +08:00
llj
946002b5c6 [dir view] file comment: fix 2017-10-13 18:00:37 +08:00
llj
b55446551b [dir view] added 'file comment' 2017-09-26 10:35:16 +08:00
llj
33266638ef [share] share repo with 'admin' perm: modification 2017-08-30 17:59:14 +08:00
llj
8be017e917 [dirent details] add 'tags' 2017-07-12 10:47:52 +08:00
llj
3905f7b3ef [dirent details] improvement 2017-07-05 12:17:11 +08:00
llj
5d48dac96c [dirent details] improvement; show more info for folders 2017-07-04 17:49:36 +08:00
llj
76d58cb025 [dir view] added 'details' for dirent 2017-07-04 14:28:40 +08:00
llj
ce749810e4 [dir view] fix for 'dirent share/del' 2017-06-30 14:33:10 +08:00
llj
a65499610c [dir view] move dir/file via drag & drop: modification, to remove the effect on 'upload file/folder via drag & drop', and other 'drag & drop' 2017-05-06 15:17:31 +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
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
534272ecd2 add name check at front end by js 2017-04-14 14:03:25 +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
acc1ebb6eb [dir view] bugfix for 'magnificPopup' & 'grid-item download' 2017-02-25 17:36:07 +08:00
llj
8f54c031e4 [dir view] fix for 'move via drag & drop' 2017-02-20 17:40:36 +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
01fb83c9b2 [mobile] added 'updateDirOpBarUI' 2017-01-12 11:39:21 +08:00
llj
fd4df3792c [dir view] modification 2017-01-07 17:55:16 +08:00
lian
77fa8c0c7a update zip download dir 2017-01-07 14:18:57 +08:00
llj
90a5552a9d [my libs, dir view] improvement: enlarge clickable area, and etc. 2017-01-04 17:19:57 +08:00
llj
2d7f5339c3 [mobile] dir view: redesigned it 2017-01-04 17:19:57 +08:00
llj
4d4762b1af [dir view] drag & drop: modified highlight effect 2017-01-04 13:51:38 +08:00
llj
0075764bae [dir view] drag & drop: highlight the dir item 2017-01-03 18:39:14 +08:00
llj
a076a934f9 [dir view] added 'move dirents by drag & drop' 2016-11-18 12:21:11 +08:00
lian
f20b90da1f update condition check when display share icon for guest user 2016-11-15 16:16:12 +08:00
lian
04f6b71441 Not allowed to set folder perm if repo not shared out 2016-10-18 13:34:36 +08:00
Daniel Pan
34640eb3e5 Merge pull request #1374 from haiwen/magnificPopup
Magnific popup
2016-10-17 15:13:53 +08:00
llj
82f3622a29 [dir view] rewrote 'view image file with magnificPopup' 2016-10-13 17:53:31 +08:00
lian
c24f871a7c not allow user set folder perm in virtual repo 2016-10-10 15:23:01 +08:00
lian
fd917c0007 update user permission
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
2016-08-22 11:20:48 +08:00
llj
ab380bf361 [lib/dirent] improved 'rename' 2016-08-12 19:10:49 +08:00
llj
271eacabd0 [zip download] modified progress 2016-08-02 11:35:05 +08:00
llj
f9500c4f61 [download zip] improvement, bugfix 2016-07-04 15:40:11 +08:00
lian
6dca56e9d5 update download dir/multi 2016-07-04 15:31:55 +08:00
Daniel Pan
cf1017513a Code clean (#1217)
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
2016-06-20 18:34:30 +08:00
Daniel Pan
b567379c2c Merge branch '5.1'
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
2016-06-13 18:25:20 +08:00
Daniel Pan
6561269301 Fix sometimes dirents duplicated in Firefox 2016-06-01 17:22:10 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1'
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
2016-05-21 13:42:04 +08:00
llj
f466979760 accessibility improvement; bugfix & clean up 2016-05-04 11:51:56 +08:00
Daniel Pan
08200845d1 fix dropdown for dir entry 2016-04-28 20:30:00 +08:00
Daniel Pan
bb8786c5da Use dropdown and HLItemView for dirent (#1120)
* Use dropdown and HLItemView for dirent

* [dir view] add some function back for 'rename'

* Remove dirent highlight after close rename form
2016-04-14 17:17:01 +08:00
llj
3f23a1685e [icons] modification 2016-04-12 11:22:04 +08:00
llj
77aac3d811 redesigned all checkbox; bugfix & improvement; removed unused code & file 2016-04-07 11:06:48 +08:00
lian
fe6dbcbb63 use new v2.1 file api when rename/lock/unlock/del file 2016-03-28 17:53:58 +08:00
llj
e2f2067a2a [dir view] modified op btns for selected item(s) 2016-03-22 15:03:50 +08:00
llj
c2b1b0bf8d [dir view] hide some buttons(ops on current dir) when item(s) selected 2016-03-22 11:46:42 +08:00
llj
6fce263e42 [details] modified 'grid view', 'share popup', 'repo folder perm', 'select2' & etc. 2016-03-10 13:56:00 +08:00
Daniel Pan
24e2870831 Show 24px file icon for low DPI screen 2016-03-04 18:29:12 +08:00