haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 04:10:47 +00:00
Code Issues Releases Wiki Activity
5,247 Commits 144 Branches 460 Tags
c39b0b5ff38021167c8e2a65ecaec43a5e57866c
Commit Graph

5247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiez
86419c7c9c Merge pull request #585 from haiwen/libs_fix3 
enable 'show error' for 'fetch libs'
 2015-05-12 17:03:44 +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
xiez
dbb28cad4c Merge pull request #584 from haiwen/encrypt-repo 
redirect to new repo page when encrypted repo token expired
 2015-05-12 16:27:46 +08:00
lian
8727fa942d redirect to new repo page when encrypted repo token expired 2015-05-12 16:05:18 +08:00
Daniel Pan
59f3a1c59b Merge pull request #581 from haiwen/render-thead 
render repo table head when reset repo collection
 2015-05-11 20:47:36 +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
xiez
831c9cf425 Merge pull request #580 from haiwen/sort_fix 
[dir view] bugfix for 'sort'
 2015-05-11 15:32:26 +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
729a455643 Merge pull request #575 from haiwen/token_fix 
Remove upload token in repo/shared_upload_dir page
 2015-05-11 11:25:15 +08:00
zhengxie
5f080b617d Remove upload token in repo/shared_upload_dir page 2015-05-11 11:20:35 +08:00
xiez
968ddd190f Merge pull request #574 from haiwen/lib_download_link 
bugfix for 'lib download link view'
 2015-05-11 10:27:31 +08:00
xiez
f3a352784c Merge pull request #572 from haiwen/share-link 
[share-admin] show "/" as root dir name
 2015-05-11 10:23:37 +08:00
llj
c3bb647373 bugfix for 'lib download link view' 2015-05-09 19:11:00 +08:00
lian
b1f2ac71fc [share-admin] show "/" as root dir name 2015-05-09 18:52:46 +08:00
zhengxie
76c4b53816 Fix enc share link bug 2015-05-09 16:15:44 +08:00
xiez
3893510114 Merge pull request #569 from haiwen/ajax_fix 
[ajax error] bugfix
 2015-05-09 15:54:55 +08:00
xiez
80bf218b2b Merge pull request #571 from haiwen/long_name 
modification for long lib/dir/file name
 2015-05-09 15:54:31 +08:00
xiez
59e1bb65de Merge pull request #570 from haiwen/rm 
rm unused html file
 2015-05-09 15:54:02 +08:00
xiez
25d02f5e27 Merge pull request #566 from haiwen/sysinfo 
[sys admin] Add system info page
 2015-05-09 15:53:49 +08:00
llj
e5877dfba2 [sys info] modified left nav icon 2015-05-09 15:48:56 +08:00
llj
210fee97c5 modification for long lib/dir/file name 2015-05-09 15:04:16 +08:00
zhengxie
7839194d08 [i18n] Update po files 2015-05-09 13:58:12 +08:00
zhengxie
b7d3c20a34 Handle rpc errors and use new rpc to get repos count 2015-05-09 13:24:08 +08:00
llj
6f9c435c82 rm unused html file 2015-05-09 13:19:01 +08:00
zhengxie
f95be12005 [i18n] Add en source file 2015-05-09 11:50:00 +08:00
zhengxie
b93e35d527 [i18n] js translation for zh_CN 2015-05-09 11:48:34 +08:00
llj
033bb1cae0 [ajax error] bugfix 2015-05-09 10:56:43 +08:00
lian
f729823185 translate 2015-05-09 10:39:01 +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
Daniel Pan
a9e3969ec9 Merge pull request #568 from haiwen/delete_fix 
[dirent.js] fixed 'delete' bug
 2015-05-08 17:20:22 +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
zhengxie
a23cf3db5e [sys admin] Add system info page 2015-05-08 15:21:54 +08:00
llj
557ba9490b [lib decrypt] improved popup 'onClose' 2015-05-08 14:45:04 +08:00
Daniel Pan
27e494670f Merge pull request #564 from haiwen/grp-lib-link 
[group-lib] update "Libraries" html code
 2015-05-08 13:34:00 +08:00
lian
dcdd690f25 [group-lib] update "Libraries" html code 2015-05-08 10:55:01 +08:00
zhengxie
60b2a4b2bf Merge branch '4.1' 2015-05-08 10:38:44 +08:00
xiez
4ad5c0726a Merge pull request #560 from haiwen/remove-msg 
[share] remove unuseful msg
 2015-05-08 10:34:08 +08:00
xiez
6a52a182b8 Merge pull request #562 from haiwen/copy-file 
[cp-dirents] fix bug when cp dirents
 2015-05-07 18:16:25 +08:00
lian
27b1167db5 [cp-dirents] fix bug when cp dirents 2015-05-07 17:55:29 +08:00
lian
a9d53861d3 [share] remove unuseful msg 2015-05-07 16:12:09 +08:00
xiez
7e4fc0c78b Merge pull request #559 from haiwen/grp-lib 
[group] remove hyperlink of "Libraires"
 2015-05-07 15:01:09 +08:00
lian
27532bd14a [group] remove hyperlink of "Libraires" 2015-05-07 14:55:59 +08:00