1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00
Commit Graph

3718 Commits

Author SHA1 Message Date
Daniel Pan
1c8ff97e66 Merge pull request #595 from haiwen/pub-repo
add public repo
2015-05-14 13:40:23 +08:00
lian
903b29aea4 add public repo 2015-05-14 11:28:12 +08:00
Daniel Pan
f68769fb48 Merge pull request #593 from haiwen/enc_lib_share
[share] only enable 'private share' for encrypted lib
2015-05-13 18:00:52 +08:00
llj
f32227b3a8 [share] only enable 'private share' for encrypted lib 2015-05-13 17:40:39 +08:00
Daniel Pan
25f5816735 Merge pull request #591 from haiwen/confirm_fix
[common.js] bugfix for 'showConfirm'
2015-05-13 13:27:52 +08:00
llj
4fd4bd27b1 [common.js] bugfix for 'showConfirm' 2015-05-13 11:06:57 +08:00
xiez
ede9f20319 Merge pull request #589 from haiwen/notice
update notice msg
v4.2.0-server
2015-05-13 10:28:00 +08:00
lian
dc3d409b2b update notice msg 2015-05-13 10:23:49 +08:00
Jiaqiang Xu
28c325eeae Run i18n.sh in gen-tarball.py. 2015-05-12 19:01:28 +08:00
zhengxie
8d7950ee22 [dist] Update & russian po file 2015-05-12 18:59:10 +08:00
xiez
613cfdae7f Merge pull request #588 from haiwen/default_lib
Fix for default library
2015-05-12 18:55:43 +08:00
zhengxie
0c77e03c9a Fix for default library 2015-05-12 18:54:10 +08:00
zhengxie
c16b098190 [dist] Update 2015-05-12 17:56:59 +08:00
xiez
2e72af2c0f Merge pull request #587 from haiwen/del_fix
bugfix for 'dirent delete'
2015-05-12 17:47:40 +08:00
xiez
0fd7275955 Merge pull request #586 from haiwen/url
update url of notification
2015-05-12 17:46:49 +08:00
zhengxie
c76bc3b4fd [i18n] Update Chinese language 2015-05-12 17:44:22 +08:00
llj
56e1375407 bugfix for 'dirent delete' 2015-05-12 17:36:13 +08:00
zhengxie
e3473b0b56 [i18n] Update source file 2015-05-12 17:34:43 +08:00
lian
9f9f4ddd27 update url of notification 2015-05-12 17:30:47 +08:00
zhengxie
09d4778f6a [dist] Update version, assets 2015-05-12 17:05:50 +08:00
zhengxie
bea19e74a7 [i18n] Update locales 2015-05-12 17:04:18 +08:00
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