haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 07:24:58 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 136 Branches 453 Tags 2.3 GiB
c06d51a596
Commit Graph

733 Commits

Author SHA1 Message Date
llj
8dff8a8b2d modified js for IE 2015-10-08 18:43:39 +08:00
llj
1dfcfc58c1 [simplemodal] updated simplemodal.js to fix IE problems 2015-10-08 17:26:33 +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
llj
1c1e9870a9 [common.js] modified ajaxErrorHandler 2015-09-07 17:55: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
dfd5316966 [select2] added translation 2015-08-19 17:59:59 +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
llj
32249b1f78 [common.js] added translation for select2 2015-08-18 11:01:58 +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
zhengxie
6a5290866a [dist] Update locales and dist 2015-07-07 14:08:43 +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
zhengxie
4c414b735c Update dist 2015-07-06 13:30:53 +08:00
zhengxie
8725d74029 [dist] Update 2015-07-03 14:45:03 +08:00
llj
63a975bf3d [dir.js] modified for IE8 2015-07-02 17:38:36 +08:00
llj
205f5486bb [common.js] modified for IE8 2015-07-02 17:14:31 +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
Ubuntu
3ba9bbaa4c [dist] Update 2015-06-18 03:57:48 +00: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
llj
945648de4c [select2] modification for long name/email 2015-06-17 14:26:31 +08:00
llj
8d8f2e3a39 [select2] modified 'placeholder' text 2015-06-16 19:15:56 +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
lian
747b477a1f add cloud address book function 2015-06-12 16:16:49 +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
zhengxie
2e532be421 [dist] Update locales and static files 2015-05-28 18:29:40 +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
zhengxie
f16a44c1aa [dist] Update 2015-05-27 15:32:40 +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
Daniel Pan
fe94d09542 Merge pull request #608 from haiwen/lib_transfer_and_desc 
Lib transfer and desc
 2015-05-26 16:49:25 +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
5a94089ce8 [lib setting] modified 'lib transfer success' 2015-05-26 12:04:29 +08:00
llj
6630cade24 [repo setting] bugfix for transfer 2015-05-22 15:01:38 +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
llj
4fd4bd27b1 [common.js] bugfix for 'showConfirm' 2015-05-13 11:06:57 +08:00
zhengxie
0c77e03c9a Fix for default library 2015-05-12 18:54:10 +08:00
xiez
2e72af2c0f Merge pull request #587 from haiwen/del_fix 
bugfix for 'dirent delete'
 2015-05-12 17:47:40 +08:00
llj
56e1375407 bugfix for 'dirent delete' 2015-05-12 17:36:13 +08:00
zhengxie
09d4778f6a [dist] Update version, assets 2015-05-12 17:05:50 +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
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
xiez
3893510114 Merge pull request #569 from haiwen/ajax_fix 
[ajax error] bugfix
 2015-05-09 15:54:55 +08:00
llj
210fee97c5 modification for long lib/dir/file name 2015-05-09 15:04:16 +08:00
llj
033bb1cae0 [ajax error] bugfix 2015-05-09 10:56:43 +08:00
xiez
2ab78acae7 Merge pull request #567 from haiwen/top_notice 
[top notice] enable close 'cur note'
 2015-05-09 10:08:06 +08:00
xiez
e857e1a918 Merge pull request #565 from haiwen/lib_decrypt 
[lib decrypt] improved popup 'onClose'
 2015-05-09 10:07:41 +08:00
llj
feaf16ce97 [dirent.js] fixed 'delete' bug 2015-05-08 17:03:25 +08:00
llj
46971d7b01 [top notice] enable close 'cur note' 2015-05-08 15:59:18 +08:00
llj
557ba9490b [lib decrypt] improved popup 'onClose' 2015-05-08 14:45:04 +08:00
xiez
f6b1405672 Merge pull request #552 from haiwen/group-lib 
[group] fix bug when unshare a group repo
 2015-05-07 14:53:34 +08:00
xiez
e60a421728 Merge pull request #558 from haiwen/fix-mvcp 
Fix mvcp bug
 2015-05-07 14:51:58 +08:00
Daniel Pan
b8e51bf916 Fix mvcp bug in Firefox 2015-05-07 14:44:26 +08:00
Daniel Pan
74b7428d21 Fix xss in formating people list in sharing dialog 2015-05-07 11:45:04 +08:00
lian
08001b70c0 [group] fix bug when unshare a group repo 2015-05-07 10:39:51 +08:00
llj
2ff000a42b [dir view] fix 'op bar' when scroll 2015-05-06 11:59:44 +08:00
llj
ea355f0327 [dir view] bugfix for '#upload-menu' ui 2015-05-05 17:29:31 +08:00
Daniel Pan
c67e089713 Merge pull request #545 from haiwen/star 
starred file page
 2015-05-05 15:37:56 +08:00
Daniel Pan
ccac0ddbcb Merge pull request #543 from haiwen/folder-perm 
[folder perm, share] select contacts: enable search contact name
 2015-05-05 11:38:35 +08:00
llj
a4509d30fe [folder perm, share] contacts input: improvement 2015-05-05 11:10:56 +08:00
lian
2ea8eb6324 starred file page 2015-05-04 17:02:20 +08:00
llj
70315404b3 [folder perm, share] select contacts: enable search contact name 2015-04-30 21:19:35 +08:00
Daniel Pan
282690d6f5 Merge pull request #538 from haiwen/folder-perm 
[folder perm] modified 'user perm'
 2015-04-30 14:40:08 +08:00
llj
3934bb18ab [user perm] improvement 2015-04-30 13:54:57 +08:00
lian
ca8a449d5a enable sort repo/dirent by Chinese word 2015-04-30 11:59:09 +08:00
llj
92ec6f94d4 [folder perm] enable add perm for multi users & groups 2015-04-29 20:35:02 +08:00
llj
fb0c5ed09f [share] modified 'contacts' input in file/dir private share 2015-04-29 12:04:46 +08:00
llj
2c6994c56a [folder perm] modified 'user perm' 2015-04-28 17:18:24 +08:00
lian
438fd78e06 [folder-perm] fix bug when set perm to a sub dir 2015-04-27 15:37:09 +08:00
xiez
255cbb98e0 Merge pull request #519 from haiwen/new-url 
new repo/dir/group url
 2015-04-25 15:43:51 +08:00
lian
79efd306a9 new repo/dir/group url 2015-04-25 15:39:06 +08:00
Daniel Pan
e68d81279c Merge pull request #515 from haiwen/hide_group_nav_after_click 
Hide group nav popup when click a group
 2015-04-25 14:40:57 +08:00
Daniel Pan
c593d1f22e Merge pull request #522 from haiwen/folder-perm-lj 
Folder perm lj
 2015-04-25 14:35:46 +08:00
llj
c01969c7ed [folder perm] rewrote it 2015-04-25 14:28:09 +08:00
zhengxie
e5c5719ea7 [api2] Fix group repos 2015-04-24 13:35:45 +08:00
lian
a3e16357ac show group avatar 2015-04-24 10:25:47 +08:00
Daniel Pan
db6705e075 Hide group nav popup when click a group 2015-04-23 16:16:43 +08:00
lian
1721a5821d [dirent-view] add/modify/remove user/group folder perm 2015-04-23 10:18:50 +08:00
Daniel Pan
f7b676595f Merge pull request #513 from haiwen/repo_create 
modified 'repo create' for myhome/group/org
 2015-04-22 18:48:48 +08:00
llj
5c75344bfa modified 'repo create' for myhome/group/org 2015-04-22 18:45:28 +08:00
llj
7ce56b26a8 [org lib] modified 'unshare' 2015-04-22 16:32:48 +08:00
llj
b00d29c8e2 modified 'group repo' & some improvement 2015-04-22 15:48:46 +08:00
llj
ed4447150d [grp lib] bugfix & improvement 2015-04-22 15:47:38 +08:00
llj
4cb39ba0f4 [group] remove confirm for 'lib unshare' 2015-04-22 15:47:25 +08:00
zhengxie
fdb23d9ca2 Update makefile and djangojs 2015-04-22 15:47:16 +08:00
llj
c77585f9a1 [org repo] improvement 2015-04-22 15:47:04 +08:00
llj
be1e9762af [org repo] bugfix & improvment 2015-04-22 15:46:55 +08:00
llj
e808ce2bc8 [repo create] bugfix 2015-04-22 15:31:53 +08:00
llj
55a87b55c5 add top-group-nav.js 2015-04-22 15:31:53 +08:00
llj
816960b129 bugfix for 'dir view', modified grp-repo-tmpl 2015-04-22 15:31:53 +08:00
llj
cfad7ef7d4 [share] bugfix 2015-04-22 15:31:53 +08:00
llj
9f60afcf22 modified 'top-group-nav' & 'get contacts', cleaned up code & removed unused files 2015-04-22 15:31:53 +08:00
zhengxie
c870a61d0c show guide when there is no owned repos 2015-04-22 15:31:52 +08:00
llj
f53c178e95 [side nav] improvement 2015-04-22 15:31:52 +08:00
Daniel Pan
bec4baed22 Add translated files 2015-04-22 15:31:52 +08:00
lian
66e938868a enable/disable personal wiki 2015-04-22 15:31:51 +08:00
llj
cfc7ad8934 [group nav] modified 'enable modules' 2015-04-22 15:31:51 +08:00
Daniel Pan
177d962f84 delete unused myhome.js, group.js, organization.js, redirect home/my/ to / 2015-04-22 15:31:50 +08:00
Daniel Pan
f8750ecfae Improve of empty tip hiding 2015-04-22 15:31:50 +08:00
Ubuntu
4215d935c6 [static] Update build.js 2015-04-22 15:31:50 +08:00
llj
7d861af84b fix dir.js & improve group-side-nav.js 2015-04-22 15:31:50 +08:00
Daniel Pan
d60630b9eb Improve group nav and fix other urls 2015-04-22 15:31:50 +08:00
llj
628511aef8 added group side nav 2015-04-22 15:31:50 +08:00
llj
a18b3297bf [side nav] modified for myhome & org 2015-04-22 15:31:49 +08:00
Daniel Pan
fd3a150717 Finish URL design 2015-04-22 15:31:49 +08:00
llj
6680e8e88e fix 2015-04-22 15:31:49 +08:00
Daniel Pan
9a25a52976 [backbone] Merge into one library app 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
Daniel Pan
448bcb7565 Improve sub-library support 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
llj
49c8695c37 [sub lib create] bugfix 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
zhengxie
dd5128cb57 Complete sub repo creation 2015-04-22 15:31:47 +08:00
zhengxie
49f26cb251 Create repo in organization 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