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

144 Commits

Author SHA1 Message Date
llj
13fac0efa0 [dir view] redesigned 'new folder/file' 2016-12-15 12:12:30 +08:00
llj
3534b5836e [fileupload] fix for Firefox 50 2016-11-25 16:59:21 +08:00
Daniel Pan
625573a669 Merge pull request #1361 from haiwen/fileupload
Fileupload
2016-11-18 11:29:52 +08:00
lian
f20b90da1f update condition check when display share icon for guest user 2016-11-15 16:16:12 +08:00
llj
25a2fd91c4 [dir view] fix for dirs with more than 100 dirents 2016-11-01 18:01:41 +08:00
llj
82f3622a29 [dir view] rewrote 'view image file with magnificPopup' 2016-10-13 17:53:31 +08:00
llj
ada3365e15 [dir view] check quota for fileupload 2016-09-19 20:42:47 +08:00
llj
585d0163d0 [sort] fix, rewrote 2016-09-08 16:26:23 +08:00
lian
a11925b033 remember sort mode after sort repos/dirents 2016-09-07 10:03:21 +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
a62dc674d3 [dir view] fixed 'loading more' 2016-08-05 14:21:28 +08:00
llj
271eacabd0 [zip download] modified progress 2016-08-02 11:35:05 +08:00
zhengxie
57cc2b4aba Merge branch '5.1'
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
2016-07-21 10:55:50 +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
llj
1bee4c4afb [dir view] mv/del multi items: bugfix 2016-06-14 16:39:31 +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
lian
bec227de26 update dir page
when visit a invalid repo dir page, error msg will show.
but then visit a valid repo, error msg still there and no dir page show.
2016-06-04 10:24:08 +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
c9c673d832 [dir view] improved details 2016-05-11 18:29:01 +08:00
llj
f466979760 accessibility improvement; bugfix & clean up 2016-05-04 11:51:56 +08:00
Daniel Pan
374edec89b Use breadcrumb, update path-bar style and fix close button in popover 2016-05-02 21:59:20 +08:00
lian
419645fdc2 add download multi dirents api 2016-04-28 15:16:58 +08:00
llj
88a73c4323 Merge pull request #1139 from haiwen/fileupload2
Fileupload
2016-04-21 16:07:05 +08:00
Daniel Pan
bc0fe0e93b Improve file upload menu 2016-04-20 18:00:38 +08:00
Daniel Pan
8bb44749eb Make table sort operations focusable (#1128) 2016-04-19 14:41:17 +08:00
llj
0a725c7e8f [fileupload] move 'setFileInput' into dir.js 2016-04-18 15:02:22 +08:00
llj
32375abcb6 [fileupload] use dropdown 2016-04-18 11:57:55 +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
77aac3d811 redesigned all checkbox; bugfix & improvement; removed unused code & file 2016-04-07 11:06:48 +08:00
Daniel Pan
45a7ba13e7 Restructure views
Conflicts:
	seahub/templates/libraries.html
	static/scripts/app/router.js
	static/scripts/app/views/group.js
	static/scripts/app/views/organization.js
2016-04-01 10:39:11 +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
05f3d353bf [lib decrypt] bugfix, improvement 2016-03-21 17:16:57 +08:00
lian
69cbd56064 add new api & update code
1. add new repo set password api
2. update repo url related code
2016-03-21 15:38:22 +08:00
lian
317477fc28 update sort dirents
remember sort mode when view different folder
2016-03-17 11:26:49 +08:00
Daniel Pan
49ac5b9ec2 Merge pull request #1061 from haiwen/render-dirents
update render dirents
2016-03-15 18:19:12 +08:00
lian
e4a468eb8f update render dirents 2016-03-15 12:04:31 +08:00
llj
91c3f75251 [lib setting] folder perm: open the jstree 2016-03-10 15:11:21 +08:00
llj
cefd38b98d [dir view] grid view: bugfix & improvement 2016-03-05 16:41:26 +08:00
llj
eaf51187c0 [dir view] grid view: show 'name' tip, added magnificPopup preview for images, & etc. 2016-03-05 11:19:19 +08:00
llj
9a89536ae5 [dir view] enable 'thumbnail' for grid view 2016-03-03 16:37:18 +08:00
llj
80d51d4464 [dir view] bugfix for 'decrypt lib', position of grid item's op menu, and etc. 2016-03-03 11:12:44 +08:00
Daniel Pan
23e3d2d088 Add right click context menu 2016-02-28 19:35:32 +08:00
Daniel Pan
3caeee4c54 Add create file/folder in grid view 2016-02-28 19:35:32 +08:00
Daniel Pan
5873f1af95 Remember view mode in cookie 2016-02-28 19:35:32 +08:00
Daniel Pan
978eb3973e Add grid view for dirView 2016-02-28 19:35:31 +08:00
llj
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +08:00
Daniel Pan
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +08:00
zhengxie
cc5af51dec Merge branch '5.0'
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
2016-02-02 12:19:46 +08:00
llj
243e28abbf [fileupload] show error msg instead of 'errorThrown' 2016-01-27 16:41:05 +08:00
Daniel Pan
35bec4b59f Merge pull request #995 from haiwen/group_fix
show group name in path for 'group dir view'; fix updateGroups in sid…
2016-01-13 16:24:22 +08:00
llj
13ea3fcb6a show group name in path for 'group dir view'; fix updateGroups in side-nav.js 2016-01-13 14:54:46 +08:00
llj
f7e8dcef72 [dir view] enable multi dirents in read-only, non-encrypted libs to be copied into other libs 2015-12-18 11:30:24 +08:00
llj
5d2600c8c0 [backbone] added 'Search files in this library' 2015-11-03 11:06:24 +08:00
zhengxie
8fd9bebf45 Merge branch '4.4'
Conflicts:
	seahub/auth/views.py
	seahub/templates/libraries.html
	seahub/templates/sysadmin/sys_admin_group_info.html
	seahub/templates/sysadmin/sys_publink_admin.html
	seahub/templates/sysadmin/userinfo.html
	seahub/urls.py
2015-10-20 10:27:27 +08:00
llj
8dff8a8b2d modified js for IE 2015-10-08 18:43:39 +08:00
llj
805b73ea3b [rename] bugfix for 'cancelRename', improved 'click doc to hide form' 2015-09-18 10:18:37 +08:00
llj
3ba435b1d6 Improved 'hide .hidden-op' 2015-09-18 10:18:36 +08:00
llj
d76b0d7065 [rename] click outside the form to hide the form 2015-09-18 10:18:36 +08:00
llj
75b0b4f39f Merge pull request #808 from haiwen/thumbnail-fix
bugfix for 'get image thumbnail'
2015-09-14 14:41:11 +08:00
llj
5aac9f5889 bugfix for 'get image thumbnail' 2015-09-14 14:34:33 +08:00
llj
eda7a6ef1c [i18n] add translation for some text 2015-08-22 15:26:13 +08:00
lian
14c264f22a update & return encoded thumbnail src to web 2015-07-16 13:09:52 +08:00
llj
7e325c815a Merge pull request #720 from haiwen/sort
Sort
2015-07-14 14:49:07 +08:00
llj
285f1a6e04 [dir view] bugfix for 'sort by time' 2015-07-14 14:22:12 +08:00
llj
1a406f9b26 [lib/dir/file sort] bugfix for new interaction 2015-07-11 14:51:26 +08:00
patrickgao
f9282585b8 file sorting alternation 2015-07-09 17:16:10 +08:00
llj
63a975bf3d [dir.js] modified for IE8 2015-07-02 17:38:36 +08:00
lian
d7cac0d24c [guest-user] add permission for guest user
disable generate shared link when user's role is GUEST
2015-06-24 15:08:37 +08:00
llj
8d2054dafd [js] bugfix for object 2015-06-10 13:43:41 +08:00
llj
46334b8118 [sub lib] bugfix for 'create' & 'dir op bar' 2015-05-27 17:09:29 +08:00
llj
f354630506 [dir view] bugfix for 'new file/dir', fileupload, dirent js & template 2015-05-27 14:16:07 +08:00
lian
0528bfe85c [del-dirents] update perm check 2015-05-15 17:19:08 +08:00
xiez
9ea129e9d2 Merge pull request #578 from haiwen/showDir_fix
bugfix for 'showDir'
2015-05-11 15:44:55 +08:00
xiez
58023821b8 Merge pull request #577 from haiwen/select_fix
[dir view] bugfix for 'select'
2015-05-11 15:34:11 +08:00
llj
705e17384f [dir view] bugfix for 'sort' 2015-05-11 15:03:10 +08:00
llj
65c2abf8cb bugfix for 'showDir' 2015-05-11 14:25:06 +08:00
llj
727644bd39 [dir view] bugfix for 'select' 2015-05-11 14:10:10 +08:00
llj
557ba9490b [lib decrypt] improved popup 'onClose' 2015-05-08 14:45:04 +08:00
llj
2ff000a42b [dir view] fix 'op bar' when scroll 2015-05-06 11:59:44 +08:00
lian
ca8a449d5a enable sort repo/dirent by Chinese word 2015-04-30 11:59:09 +08:00
lian
79efd306a9 new repo/dir/group url 2015-04-25 15:39:06 +08:00
llj
9f60afcf22 modified 'top-group-nav' & 'get contacts', cleaned up code & removed unused files 2015-04-22 15:31:53 +08:00
llj
7d861af84b fix dir.js & improve group-side-nav.js 2015-04-22 15:31:50 +08:00
Daniel Pan
fd3a150717 Finish URL design 2015-04-22 15:31:49 +08:00
llj
608f30e354 [dir view] remove small preview for images files 2015-04-22 15:31:49 +08:00
llj
fb197d6532 [dir view] modified 'get image thumbnail' 2015-04-22 15:31:48 +08:00
llj
8d45b64511 [dir view] use magnificPopup for img view 2015-04-22 15:31:47 +08:00
Daniel Pan
9d6dfdabeb encode path for using in URI 2015-04-22 15:31:47 +08:00
llj
d612ec360c modified lib op icons & dir op bar 2015-04-22 15:31:46 +08:00
lian
2a90af3675 update js/template 2015-04-22 15:31:46 +08:00
zhengxie
f022b4902e Move scripts from media to static folder 2015-04-22 15:31:46 +08:00