5247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
zhengxie	ded441bdce	Fix onetime token bug in video/audio bug	2015-04-30 11:01:41 +08:00
llj	92ec6f94d4	[folder perm] enable add perm for multi users & groups	2015-04-29 20:35:02 +08:00
Daniel Pan	801abe9026	Merge pull request #541 from haiwen/contact ... User nickname in contact list	2015-04-29 19:58:17 +08:00
zhengxie	bac472f248	User nickname in contact list	2015-04-29 16:23:20 +08:00
llj	fb0c5ed09f	[share] modified 'contacts' input in file/dir private share	2015-04-29 12:04:46 +08:00
Daniel Pan	4cc780a3ad	Merge pull request #539 from haiwen/clear_token ... Clear token when change user password	2015-04-29 10:39:53 +08:00
zhengxie	3edf280898	Clear token when change user password	2015-04-29 10:24:29 +08:00
llj	2c6994c56a	[folder perm] modified 'user perm'	2015-04-28 17:18:24 +08:00
zhengxie	e5efbfa5c3	[dist] Add static files to media/assets	2015-04-28 16:43:28 +08:00
Daniel Pan	16ec8ed587	Merge pull request #537 from haiwen/d-link ... [api] fix bug when create download link for root dir	2015-04-28 15:59:54 +08:00
lian	b2dbdee325	[api] fix bug when create download link for root dir	2015-04-28 15:55:05 +08:00
Daniel Pan	506453b1fe	Merge pull request #530 from haiwen/folder_perm_fix ... Fix system library bug, fix mv/cp dir(s)/file(s) bug	2015-04-28 13:56:12 +08:00
zhengxie	ab2b49a236	Moved select2.png	2015-04-27 17:50:00 +08:00
Daniel Pan	2f9becdd33	Merge pull request #535 from haiwen/file_view ... [file view] side-toolbar: removed 'discussion' & 'groups', moved 'histor...	2015-04-27 17:44:51 +08:00
Daniel Pan	9c8ac87904	Merge pull request #536 from haiwen/repo-trash ... [repo-trash] add deleted time	2015-04-27 17:40:18 +08:00
lian	b567167b33	[repo-trash] add deleted time	2015-04-27 17:37:08 +08:00
llj	5b11355ee1	[file view] side-toolbar: removed 'discussion' & 'groups', moved 'history' & 'share' to the right top	2015-04-27 17:01:59 +08:00
Jiaqiang Xu	545adba437	[pkg] Don't run i18n script in gen-tarball.py.	2015-04-27 16:13:03 +08:00
Daniel Pan	b52fb0ed35	Merge pull request #533 from haiwen/folder-icon-fix ... [folder-icom] fix bug when create a folder	2015-04-27 16:00:22 +08:00
Daniel Pan	9c5e22b775	Merge pull request #534 from haiwen/folder-perm ... [folder-perm] fix bug when set perm to a sub dir	2015-04-27 15:56:32 +08:00
lian	b16e3369ab	[folder-icom] fix bug when create a folder	2015-04-27 15:40:36 +08:00
lian	438fd78e06	[folder-perm] fix bug when set perm to a sub dir	2015-04-27 15:37:09 +08:00
Daniel Pan	50c40edb2b	Merge pull request #532 from haiwen/folder-icon ... [dirent-icon] new folder icon with perm	2015-04-27 15:26:48 +08:00
lian	427224718a	[dirent-icon] new folder icon with perm	2015-04-27 15:21:23 +08:00
zhengxie	150e5fd8da	Fix system library bug, fix mv/cp dir(s)/file(s) bug	2015-04-27 14:59:49 +08:00
Daniel Pan	8d73f57a58	Merge pull request #528 from haiwen/share_admin_ui ... [share admin] removed 'desc' for libs & folders	2015-04-27 14:17:01 +08:00
llj	46d28b4010	[share admin] removed 'desc' for libs & folders	2015-04-27 13:35:30 +08:00
Daniel Pan	8b34007437	Merge pull request #527 from haiwen/orphan ... [sys-admin] remove sys list orphan page	2015-04-27 10:45:16 +08:00
lian	2f7de987e9	[sys-admin] remove sys list orphan page	2015-04-27 10:40:01 +08:00
Daniel Pan	94256c7d3d	Merge pull request #526 from haiwen/folder-perm ... Show folder permission only in pro version and enabled	2015-04-25 18:58:45 +08:00
zhengxie	6e13d4f4c8	Show folder permission only in pro version and enabled	2015-04-25 18:17:50 +08:00
xiez	cdd5fe353e	Merge pull request #523 from haiwen/api-fix ... [api] Fix group repos	2015-04-25 15:44:02 +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	dc4131bf2d	Merge pull request #524 from haiwen/folder-perm ... [folder-perm] log error	2015-04-25 15:28:05 +08:00
zhengxie	2e0ff97e16	[api] Fix group repos	2015-04-25 15:04:40 +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
Daniel Pan	cce391e5d2	Merge pull request #521 from haiwen/group-info ... [sys-admin] add group info page	2015-04-25 11:53:21 +08:00
lian	69784c0025	[sys-admin] add group info page	2015-04-25 10:57:14 +08:00
Daniel Pan	886e22ec85	Merge pull request #518 from haiwen/api-fix ... [api2] Fix group repos	2015-04-24 14:17:25 +08:00
zhengxie	e5c5719ea7	[api2] Fix group repos	2015-04-24 13:35:45 +08:00
Daniel Pan	527e3274b4	Merge pull request #517 from haiwen/group-avatar ... show group avatar	2015-04-24 10:33:12 +08:00
lian	a3e16357ac	show group avatar	2015-04-24 10:25:47 +08:00
Daniel Pan	21182045cb	Merge pull request #516 from haiwen/api-fix ... [api] Update group repos	2015-04-23 19:53:10 +08:00
lian	c5113cb647	[folder-perm] log error	2015-04-23 17:24:48 +08:00
zhengxie	aa8d169397	[api] Update group repos	2015-04-23 16:25:27 +08:00