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

4044 Commits

Author SHA1 Message Date
llj
70b7034917 [lib transfer] add missing html file 2015-05-26 13:51:24 +08:00
llj
5a94089ce8 [lib setting] modified 'lib transfer success' 2015-05-26 12:04:29 +08:00
xiez
ce75273eeb Merge pull request #598 from haiwen/notice-msg
[notice] update notice msg
2015-05-26 09:41:25 +08:00
Daniel Pan
9d73f0c0f8 Merge pull request #607 from haiwen/posixpath
use posixpath.join instead of os.path.join
2015-05-25 14:59:18 +08:00
lian
b3e9ea5b7d use posixpath.join instead of os.path.join 2015-05-25 14:36:38 +08:00
Daniel Pan
8fecbfd459 Merge pull request #603 from haiwen/lib_create_fix
[lib create] bugfix for 'group lib create'
2015-05-25 11:04:53 +08:00
llj
1e009acffc [lib setting] basic info: remove 'description' 2015-05-22 16:42:42 +08:00
llj
90acdcc894 [sys admin] repo admin: bugfix for 'transfer' & removed 'description' 2015-05-22 15:51:19 +08:00
llj
6630cade24 [repo setting] bugfix for transfer 2015-05-22 15:01:38 +08:00
xiez
f2cb1f1064 Merge pull request #604 from haiwen/notice-update
[notice] update code
2015-05-21 15:25:30 +08:00
lian
b294918a76 [notice] update code
add try-exception when load notice detail to json
2015-05-20 17:20:45 +08:00
llj
02ab013dd6 [lib create] bugfix for 'group lib create' 2015-05-20 16:19:35 +08:00
xiez
132d0cd828 Merge pull request #599 from haiwen/add-pub-repo
[add pub repo] update code in multi tenancy
2015-05-18 13:20:37 +08:00
xiez
726e0511af Merge pull request #601 from haiwen/del-dirents
[del-dirents] update perm check
2015-05-18 13:19:18 +08:00
lian
0528bfe85c [del-dirents] update perm check 2015-05-15 17:19:08 +08:00
Daniel Pan
595d0cd82f Merge pull request #600 from haiwen/perm
[folder-perm] update perm check
2015-05-15 15:46:07 +08:00
lian
cf340ee7ab [add pub repo] update code in multi tenancy 2015-05-15 15:07:15 +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
zhengxie
1211677746 [tests] Fix error 2015-05-15 11:23:56 +08:00
lian
3ab68f1a92 [notice] update notice msg
use "Deleted Library" as repo-name if a repo is deleted
2015-05-15 10:39:33 +08:00
zhengxie
af498d2d20 [tests] Add tests for registraion 2015-05-14 18:15:26 +08:00
xiez
19fc72fc07 Merge pull request #597 from haiwen/fix/registraion_activate
Fix account registrion email bug
2015-05-14 17:33:35 +08:00
zhengxie
d1bd33afc2 Fix account registrion email bug 2015-05-14 17:32:54 +08:00
lian
00f3574993 update org bug 2015-05-14 17:22:49 +08:00
Daniel Pan
53d0f730b8 Merge pull request #596 from haiwen/sub-repo
[api] update repos view
2015-05-14 15:54:48 +08:00
Daniel Pan
1c8ff97e66 Merge pull request #595 from haiwen/pub-repo
add public repo
2015-05-14 13:40:23 +08:00
lian
e8cdc942e8 [api] update repos view
do not return sub-repo info if sub-repo is not enabled
2015-05-14 13:36:03 +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