haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-12 06:29:23 +00:00
Code Issues Releases Wiki Activity
5,037 Commits 133 Branches 453 Tags 2.2 GiB
c70cdcc2d4
Commit Graph

326 Commits

Author SHA1 Message Date
Daniel Pan
463b48c788 Make open-via-client in community edition and clean code for file/dir icons 2016-02-29 15:29:29 +08:00
Daniel Pan
003838b8f1 Fix CSS problems 2016-02-28 22:17:08 +08:00
Daniel Pan
3de67a1f15 Add rename 2016-02-28 19:35:33 +08:00
Daniel Pan
43a5861ea4 Add mv/cp to grid view 2016-02-28 19:35:33 +08:00
Daniel Pan
3a4ad38ea5 Add share dialog 2016-02-28 19:35:33 +08:00
Daniel Pan
e5766ec06e Update dirent del function 2016-02-28 19:35:32 +08:00
Daniel Pan
f49547bbfe Clean dirent-grid.js 2016-02-28 19:35:32 +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
51f47662d6 [share] show error msg for every failed item 2016-02-24 16:11:45 +08:00
Daniel Pan
229681560a Merge pull request #969 from haiwen/library-settings 
Add repo operations
 2016-02-23 21:59:08 +08:00
llj
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +08:00
llj
7413e36f0e [lib setting] folder perm: clean up 2016-02-23 12:46:00 +08:00
llj
3d27c05520 [lib setting] folder perm: modified ui 2016-02-20 14:20:50 +08:00
llj
9b4e4d0460 [lib setting] add 'folder perm' 2016-02-19 17:38:32 +08:00
llj
a541bd5ed1 [lib setting] remove 'permissions' 2016-02-19 17:38:32 +08:00
llj
eaba92f544 [lib setting] added 'shared links' 2016-02-19 17:38:32 +08:00
llj
f6ed190d5b [lib settings] modification 2016-02-19 17:38:32 +08:00
Daniel Pan
adf9837337 Add setting library history 2016-02-19 17:38:32 +08:00
Daniel Pan
54a29bc743 Add library transfer 2016-02-19 17:38:32 +08:00
Daniel Pan
b0ccc76bee Finish rename repo 2016-02-19 17:38:32 +08:00
Daniel Pan
92044f6a34 Add share link admin dialog and permission settings dialog 2016-02-19 17:38:31 +08:00
Daniel Pan
8d12ea22c7 Add repo operations 2016-02-19 17:38:31 +08:00
Daniel Pan
4179a13c4c Merge pull request #1014 from haiwen/turn-group-wiki 
Turn on/off group Wiki
 2016-02-19 17:29:41 +08:00
llj
4dd0015cba [group setting, group wiki] bugfix, modification 2016-02-19 17:01: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
Daniel Pan
6a88d50b02 Turn on/off group Wiki 2016-01-30 16:23:52 +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
53fddee277 [group dir view] modification 2016-01-13 16:04:04 +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
zhengxie
cf3d96b46a Merge branch '5.0' 
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
 2016-01-13 10:19:56 +08:00
llj
0c86fb539c [group settings] complete 'import members' 2016-01-09 16:50:46 +08:00
lian
a7458622b7 check if audit enabled 2016-01-09 16:40:39 +08:00
llj
ec6679e448 add 'updateGroups' for side-nav, and other improvement 2016-01-09 14:35:16 +08:00
llj
bda85406ca [group settings] manage members: added 'add multi members once' and other improvement 2016-01-08 12:18:33 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
llj
13486afe57 [add group] fix: modified param name according to the api 2015-12-19 10:29:05 +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
1d78ec4c4e [dir view] enable read-only dirents in non-encrypted libs to be copied into other libs 2015-12-17 19:02:10 +08:00
llj
d749a227e7 [groups] redesigned the UI 2015-12-17 14:58:50 +08:00
llj
de63d7284c [group members] removed some spaces 2015-12-15 11:33:07 +08:00
llj
1f15e38752 [group members] use double size for member avatars 2015-12-15 10:59:44 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
llj
4c3e5ab067 [group] dir view: bugfix for side nav 2015-12-09 15:13:33 +08:00
llj
2b9923c700 [groups] removed 'sideTips', use 'side nav' 2015-12-04 17:26:04 +08:00
llj
25c07a916e [side nav] modified 'group nav' 2015-12-04 16:33:51 +08:00
llj
fa42d59cc8 redesigned 'group top' 2015-12-04 16:33:51 +08:00
llj
385b32154d [hd] modified mine/shared/org ...pages 2015-12-04 16:33:51 +08:00
llj
4c0c8c10aa [side nav] modified 'group nav' 2015-12-04 16:33:51 +08:00
llj
e5c5c2b9e7 redesigned side nav; removed 'top group nav' 2015-12-04 16:33:51 +08:00
llj
bd72a97c85 [groups] show error msg for 'add new group' 2015-12-03 17:35:13 +08:00
llj
51b44c40a3 [groups] use new collection url 2015-12-02 11:39:36 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
zhengxie
e2b7e88094 Merge branch '4.4' 2015-11-05 16:33:13 +08:00
llj
5d2600c8c0 [backbone] added 'Search files in this library' 2015-11-03 11:06:24 +08:00
llj
d070a4d7d3 [add-repo] bugfix 2015-11-02 17:11:11 +08:00
llj
216bea2b4b [share.js] modified 'delete link' 2015-10-30 16:27:16 +08:00
llj
0e6de3b4e9 [share.js] modified 'delete link' 2015-10-21 15:34:09 +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
0dc31715d4 use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view 2015-10-19 15:04:37 +08:00
llj
b1577770b1 use 'POST' to delete libraries 2015-10-10 14:31:20 +08:00
lian
1de4cb2608 change ENABLE_ENCRYPT_LIBRARY to ENABLE_ENCRYPTED_LIBRARY 2015-10-09 15:40:54 +08:00
llj
8f8170fc3f [add repo] bugfix & improvement 2015-10-08 20:42:08 +08:00
llj
8dff8a8b2d modified js for IE 2015-10-08 18:43:39 +08:00
lian
668fdb7215 add ENBALE_ENCRYPT_LIBRARY setting 2015-09-24 17:20:45 +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
f986bfa5cd [rename] redesigned it 2015-09-18 10:18:36 +08:00
llj
e0e31faedf [font icon] modification 2015-09-17 18:10:41 +08:00
lian
8aee7bc8de show err msg detail when share dir to user/group 2015-09-15 12:00:29 +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
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
lian
a737ed58b8 allow rename/move/delete operation when file is locked 2015-09-11 10:05:35 +08:00
lian
acc2f75235 update api err msg and common.ajaxErrorHandler 2015-09-01 17:42:54 +08:00
llj
24bf53c980 [permission UI] modified 'permission' column width for languages like German 2015-08-26 15:56:29 +08:00
llj
eda7a6ef1c [i18n] add translation for some text 2015-08-22 15:26:13 +08:00
llj
d877f2aceb [share] modified 'expired' UI for download link 2015-08-19 17:56:45 +08:00
lian
fdafab3d5a show "Expired" when file share expired 2015-08-18 15:18:02 +08:00
patrickgao
806965fa0f add SHARE_LINK_PASSWORD_MIN_LENGTH 2015-08-12 15:20:12 +08:00
llj
2f2e1b7524 [fileupload] enable resumable fileupload for 'dir view' & 'upload link' 
'resumable' is only enabled for 'upload files',
not for 'add folder' & 'file update'
 2015-08-07 15:03:59 +08:00
llj
ba4f3e7eff [activity] bugfix & improvement 2015-07-29 20:18:28 +08:00
lian
d889f3bafe update activity page 2015-07-28 19:55:05 +08:00
lian
dfc7f1856f new activity page 2015-07-28 19:55:05 +08:00
lian
68b40743c7 update file lock check when update file 2015-07-24 12:16:57 +08:00
xiez
024a1deceb Merge pull request #706 from haiwen/file-lock 
file lock
 2015-07-23 10:40:40 +08:00
llj
83c0374cd8 [starred files] bugfix 2015-07-22 21:01:10 +08:00
llj
ebf1d7f8d0 [myhome side nav] bugfix for 'cur tab' 2015-07-22 11:59:50 +08:00
lian
2d34cb611a check file lock before update a file 2015-07-20 17:36:12 +08:00
llj
65c540a29d [lib/dir/file share] rewrote 'random password' 2015-07-20 16:36:07 +08:00
llj
2aa15a7d19 [file lock] show name instead of email 2015-07-20 13:50:42 +08:00
llj
97ebba6f2b [file lock] 'dir view' & 'file view': improvement & bugfix 2015-07-20 13:50:42 +08:00
lian
2c2bf4f98f file lock 2015-07-20 13:50:42 +08:00
patrickgao
7f5a1f012d generate a random password 2015-07-20 11:15:07 +08:00
llj
d3097a6acf [fileupload] UI fix for 'file replace confirm popup' 2015-07-17 15:48:00 +08:00
lian
14c264f22a update & return encoded thumbnail src to web 2015-07-16 13:09:52 +08:00
zhengxie
00f64782ad Merge branch 'dir-share-popup' 
Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py
 2015-07-15 15:06:56 +08:00
llj
eaa93960f0 [dir shared items] modification 2015-07-15 14:55:23 +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
b29974901c [sort] new interaction for 'myhome shared libs' 2015-07-14 11:46:20 +08:00
llj
69101f41f6 [dir shared items] modified 'perm edit', bugfix & add 'error handle' for 'list/add/delete', clean up code 2015-07-14 11:03:59 +08:00
llj
0a13dd88bb [dir private share] dir shared items: modified 'list/add', add 'delete' 2015-07-14 11:03:58 +08:00
llj
6ff2efb597 [dir private share] split into user/group share 2015-07-14 11:03:05 +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
Daniel Pan
03b82ce655 Merge pull request #695 from haiwen/IE8 
Ie8
 2015-07-09 11:13:14 +08:00
Daniel Pan
f5a465eb79 Merge pull request #697 from haiwen/rm_filePrivateShare 
remove 'file private share'
 2015-07-09 11:12:10 +08:00
llj
516779defb remove 'file private share' & 'private shared files' 2015-07-07 17:35:23 +08:00
Daniel Pan
7dcac275b8 Merge pull request #682 from haiwen/open-via-client 
only show open-via-client in pro version
 2015-07-07 13:49:17 +08:00
lian
20c7358ef9 fix bug when unstar a file 2015-07-06 14:43:45 +08:00
llj
63a975bf3d [dir.js] modified for IE8 2015-07-02 17:38:36 +08:00
lian
7a7b21ef39 only show open-via-client in pro version 2015-07-01 15:54:01 +08:00
lian
803dcf8e6d [guest-user] update url of "libraries" and "my home" tab 2015-06-25 12:05:47 +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
Daniel Pan
f6a3b05f75 Merge pull request #650 from haiwen/select 
global addressbook
 2015-06-18 09:57:09 +08:00
lian
be00d946d8 Do not show contacts tab 2015-06-17 18:20:32 +08:00
Daniel Pan
1e396ac7a2 Merge pull request #646 from haiwen/ie_tip 
Ie tip
 2015-06-16 14:11:49 +08:00
llj
dbbfd393bb [contact] bugfix, improvement 2015-06-13 18:43:45 +08:00
lian
6c74c14da4 [global-addressbook] 
show contacts tab when is-cloud-mode AND not enabel global addressbook
 2015-06-12 17:50:15 +08:00
llj
8d2054dafd [js] bugfix for object 2015-06-10 13:43:41 +08:00
lian
ffb31e5cb0 [starred-file] fix bug when generate file view url 2015-06-09 11:54:18 +08:00
llj
ee816216ea add 'top tip' for IE 2015-06-05 17:49:09 +08:00
xiez
d2a075df68 Merge pull request #620 from haiwen/add_org_lib 
[org view] modified 'add library'
 2015-05-28 17:43:19 +08:00
llj
cb3d7cb6e7 [org view] modified 'add lib' UI 2015-05-28 16:08:30 +08:00
llj
cb4e0d7493 [org view] modified 'add library' 2015-05-28 13:57:00 +08:00
xiez
17301682de Merge pull request #617 from haiwen/lib_share_fix 
[share] bugfix for newly created library
 2015-05-27 18:04:06 +08:00
llj
0fb3d1037c [share] bugfix for newly created library 2015-05-27 17:58:21 +08:00
llj
46334b8118 [sub lib] bugfix for 'create' & 'dir op bar' 2015-05-27 17:09:29 +08:00
llj
be238d44c4 [share] bugfix for 'download link' 2015-05-27 15:10:50 +08:00
llj
f354630506 [dir view] bugfix for 'new file/dir', fileupload, dirent js & template 2015-05-27 14:16:07 +08:00
zhengxie
51ade2d834 Update styles of share popup 2015-05-26 14:36:31 +08:00
zhengxie
8993da33d7 Add direct link for shared file, refactor share link download 2015-05-26 14:36:30 +08:00
llj
02ab013dd6 [lib create] bugfix for 'group lib create' 2015-05-20 16:19:35 +08:00
lian
0528bfe85c [del-dirents] update perm check 2015-05-15 17:19:08 +08:00
lian
ecb4fa1796 [folder-perm] update perm check 
when operate a dir/file, use their own perm instead of repo perm
 2015-05-15 14:59:51 +08:00
lian
903b29aea4 add public repo 2015-05-14 11:28:12 +08:00
llj
f32227b3a8 [share] only enable 'private share' for encrypted lib 2015-05-13 17:40:39 +08:00
zhengxie
0c77e03c9a Fix for default library 2015-05-12 18:54:10 +08:00
llj
56e1375407 bugfix for 'dirent delete' 2015-05-12 17:36:13 +08:00
llj
2dc00204df enable 'show error' for 'fetch libs' 
Conflicts:
	static/scripts/app/views/group.js
	static/scripts/app/views/myhome-repos.js
	static/scripts/app/views/myhome-shared-repos.js
	static/scripts/app/views/organization.js
 2015-05-12 16:56:24 +08:00
lian
f725506262 upate render repo table thead 2015-05-11 18:39:21 +08:00
lian
97bbf0156d render repo table head when reset repo collection 2015-05-11 17:30:11 +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
lian
ac2ab17771 fix bug when sort repo 2015-05-11 15:31:03 +08:00