1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-30 22:34:53 +00:00
Commit Graph

111 Commits

Author SHA1 Message Date
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
llj
f85d9e8e67 [dir view] bugfix for img view with magnificPopup 2017-02-09 16:00:36 +08:00
lian
7c1c1e2977 update rm ajax 2017-02-07 16:03:46 +08:00
lian
18c60fd306 update cp/mv file/dir 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
llj
01fb83c9b2 [mobile] added 'updateDirOpBarUI' 2017-01-12 11:39:21 +08:00
llj
38226256cd Merge pull request #1444 from haiwen/download-dir
update zip download dir
2017-01-07 17:58:38 +08:00
llj
fd4df3792c [dir view] modification 2017-01-07 17:55:16 +08:00
llj
6c65d06b3e [dir view] mv/cp multi: fix 2017-01-07 15:06:49 +08:00
lian
77fa8c0c7a update zip download dir 2017-01-07 14:18:57 +08:00
llj
7c4d32ac24 [dir view] fixed 'window scroll' related bugs 2017-01-04 17:32:42 +08:00
llj
f4eacae253 [mobile] dir view, group: modification 2017-01-04 17:19:57 +08:00
llj
2d7f5339c3 [mobile] dir view: redesigned it 2017-01-04 17:19:57 +08:00
Daniel Pan
1273ffa83d Merge pull request #1423 from haiwen/new
[dir view] redesigned 'new folder/file'
2017-01-04 13:53:04 +08:00
zhengxie
d4e00402af Merge branch '6.0'
Conflicts:
	media/css/seahub.css
2016-12-26 14:22:35 +08:00
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