1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-13 06:55:59 +00:00
Commit Graph

401 Commits

Author SHA1 Message Date
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
Daniel Pan
92e9d6cb9a Merge pull request #1402 from haiwen/show-logout
Show logout
2016-12-06 10:20:32 +08:00
llj
81bbaace7a [repo-folder-perm-admin] fix 2016-12-03 14:12:04 +08:00
llj
3534b5836e [fileupload] fix for Firefox 50 2016-11-25 16:59:21 +08:00
llj
a076a934f9 [dir view] added 'move dirents by drag & drop' 2016-11-18 12:21:11 +08:00
llj
dbd104e7d0 show log-out message 2016-11-18 11:56:11 +08:00
Daniel Pan
8b54e37d1f Merge pull request #1400 from haiwen/share
[share.js] show error msg
2016-11-18 11:36:24 +08:00
Daniel Pan
625573a669 Merge pull request #1361 from haiwen/fileupload
Fileupload
2016-11-18 11:29:52 +08:00
Daniel Pan
2c6070085a Merge pull request #1337 from haiwen/jstree-update
[jstree] updated jstree to the latest v3.3.2, rewrote/modified relate…
2016-11-18 11:27:11 +08:00
llj
9ba72b4b47 [UI] top-bar: bugfix & improvement 2016-11-17 17:51:27 +08:00
llj
2d26c57a66 [share.js] show error msg 2016-11-17 11:53:43 +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
0128cc25ad [jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix 2016-10-25 11:39:52 +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
90ab3746b3 [dirent-mvcp] bugfix 2016-10-14 16:16:33 +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
llj
ada3365e15 [dir view] check quota for fileupload 2016-09-19 20:42:47 +08:00
llj
7ecf62d970 [fileupload] upgrade fileupload plugin to the latest version 2016-09-19 20:41:54 +08:00
Daniel Pan
b1778698b9 Merge pull request #1354 from haiwen/repo-pattern
add library pattern feature
2016-09-19 13:57:02 +08:00
lian
2e098b628e enable library template when create group/pub repo 2016-09-18 11:58:14 +08:00
llj
fb6430b027 [fileupload] modified 'maxNumberOfFiles' 2016-09-14 17:35:42 +08:00
lian
94e91265cc add library pattern feature 2016-09-14 13:47:12 +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
llj
f5042956ce [share/perm popup] fix 2016-08-22 15:19:44 +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
Daniel Pan
2836931021 Merge pull request #1320 from haiwen/side-nav-fix
[side nav] group list: fix
2016-08-19 18:09:18 +08:00
lian
7ce3001d67 fix bug when create an encrypted share link 2016-08-16 17:28:49 +08:00
Daniel Pan
16e9f6296e Merge pull request #1325 from haiwen/rename-improvement
[lib/dirent] improved 'rename'
2016-08-16 13:34:19 +08:00
llj
1e0d94b694 [share] fix 2016-08-16 10:20:05 +08:00
llj
ab380bf361 [lib/dirent] improved 'rename' 2016-08-12 19:10:49 +08:00
llj
70b04525b2 [side nav] group list: fix 2016-08-10 14:22:04 +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
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
llj
e5b0d1ee31 [invitations] bugfix & improvment 2016-07-20 15:45:05 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
llj
2f5cf202d9 [misc] fix 2016-07-20 14:20:19 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +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
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
llj
b2cda939aa UI fix (#1257) 2016-06-23 16:48:29 +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