haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 07:10:55 +00:00
Code Issues Releases Wiki Activity
4,451 Commits 138 Branches 455 Tags 2.5 GiB
1f15e38752
Commit Graph

205 Commits

Author SHA1 Message Date
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