5247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Pan	ee0ec9fa54	Merge pull request #949 from haiwen/cp_fix ... [dir view] enable multi dirents in read-only, non-encrypted libs to b…	2015-12-18 11:35:10 +08:00
llj	f7e8dcef72	[dir view] enable multi dirents in read-only, non-encrypted libs to be copied into other libs	2015-12-18 11:30:24 +08:00
xiez	91cc17cc71	Merge pull request #948 from haiwen/cp_fix ... [dir view] enable read-only dirents in non-encrypted libs to be copie…	2015-12-18 10:57:38 +08:00
zhengxie	4b17a586dc	[i18n] Update locales	2015-12-18 10:57:14 +08:00
llj	1d78ec4c4e	[dir view] enable read-only dirents in non-encrypted libs to be copied into other libs	2015-12-17 19:02:10 +08:00
zhengxie	686d192905	[i18n] Update locales	2015-12-17 16:44:09 +08:00
zhengxie	fae9210238	[i18n] Update source files	2015-12-17 16:10:44 +08:00
zhengxie	3b0f3d475b	Merge branch '4.4' into 5.0 ... Conflicts: seahub/templates/share_access_validation.html	2015-12-17 15:50:50 +08:00
Daniel Pan	c801ce4ad1	Merge pull request #947 from haiwen/groups_v2 ... [groups] redesigned the UI	2015-12-17 15:19:08 +08:00
llj	d749a227e7	[groups] redesigned the UI	2015-12-17 14:58:50 +08:00
lian	c809bd0390	update test shard dir	2015-12-16 19:24:51 +08:00
xiez	ad658ac746	Merge pull request #946 from haiwen/view-file ... add password check when view file via dir share	2015-12-16 19:12:32 +08:00
lian	001856f89f	add password check when view file via share link	2015-12-16 19:09:55 +08:00
llj	0a9cf94d69	[view shared dir] 'grid view': bugfix for thumbnail check	2015-12-16 15:26:08 +08:00
xiez	2c47c5c49b	Merge pull request #943 from haiwen/group-members-api ... [api-v2.1] update groups api & add get group members api	2015-12-15 15:09:05 +08:00
lian	5bbd92bb6d	[api-v2.1] update groups api & add get group members api	2015-12-15 14:38:25 +08:00
llj	5ba2ac18c8	Merge pull request #937 from haiwen/shared-dir-last-update ... add "Last Update" for shared dir	2015-12-15 14:09:44 +08:00
xiez	922b4411ba	Merge pull request #942 from haiwen/redesign ... Redesign	2015-12-15 11:59:52 +08:00
llj	21f791ec4e	Merge pull request #941 from haiwen/group_members ... [group members] redesigned it	2015-12-15 11:48:48 +08:00
llj	de63d7284c	[group members] removed some spaces	2015-12-15 11:33:07 +08:00
zhengxie	9404af609d	Add post_office app, and send async email to imported csv users	2015-12-15 11:32:34 +08:00
llj	1f15e38752	[group members] use double size for member avatars	2015-12-15 10:59:44 +08:00
llj	03d075a00b	[group members] redesigned it	2015-12-11 20:58:29 +08:00
lian	ce77796a49	Revert "[api] update search user api" ... This reverts commit c33941e0e4.	2015-12-09 16:53:31 +08:00
xiez	e01b4e89c2	Merge pull request #938 from haiwen/share-dir-api ... [api] update share dir item api	2015-12-09 16:51:14 +08:00
xiez	41ff991f2b	Merge pull request #939 from haiwen/search-user ... [api] update search user api	2015-12-09 15:21:58 +08:00
llj	4c3e5ab067	[group] dir view: bugfix for side nav	2015-12-09 15:13:33 +08:00
lian	c33941e0e4	[api] update search user api ... 1. not return unregistered user 2. add arg to control if return myself	2015-12-09 15:12:48 +08:00
lian	2450f1f3b0	[api] update share dir item api ... 1. update perm check when share repo/dir 2. check if user registered when share repo/dir	2015-12-09 15:10:40 +08:00
xiez	b67f4f7fc9	Merge pull request #936 from haiwen/groups-api ... update groups api	2015-12-09 10:42:36 +08:00
patrickgao	c20ad99319	add "Last Update" for shared links	2015-12-08 23:08:50 +08:00
lian	c31f201d5b	update groups api	2015-12-08 18:43:32 +08:00
xiez	038a6122b4	Merge pull request #932 from haiwen/grps-api ... [api-v2.1] update transfer group api	2015-12-08 16:58:40 +08:00
xiez	12448d95d4	Merge pull request #934 from haiwen/user-admin-groups ... update user admin group test	2015-12-08 16:54:39 +08:00
lian	46d9fea299	[api-v2.1] update transfer group api	2015-12-08 16:40:17 +08:00
lian	957b3b4beb	update user admin group test	2015-12-08 16:29:50 +08:00
Daniel Pan	30fc64d5e7	Merge pull request #933 from haiwen/group_icons ... [group] modified icons	2015-12-08 16:28:37 +08:00
llj	8469c3331a	[group] modified icons	2015-12-08 16:00:34 +08:00
zhengxie	054ef03687	[sysadmin] Force passwd change when add/reset user	2015-12-08 11:33:26 +08:00
Daniel Pan	660c1b6e4b	Merge pull request #928 from haiwen/markdown_edit ... [markdown edit] modified 'font-family'; modified editor options	2015-12-07 18:16:17 +08:00
llj	aacbf9a315	[markdown edit] modified 'font-family'; modified editor options	2015-12-07 18:09:10 +08:00
Daniel Pan	54328d3f91	Merge pull request #927 from haiwen/view_shared_dir ... [view shared dir] remove 'bold' for dir name links	2015-12-07 15:25:44 +08:00
llj	ab5e0ee2fd	[view shared dir] remove 'bold' for dir name links	2015-12-07 14:52:25 +08:00
xiez	7da8a3e8b2	Merge pull request #926 from haiwen/update-grps-api ... [api2.1] add rename, transfer and delete group api	2015-12-07 14:07:14 +08:00
poetwang	08a5c17fb3	[api2] make upload blocks token reusable	2015-12-07 11:35:55 +08:00
lian	d1bcd3e113	[api2.1] add rename, transfer and delete group api	2015-12-07 11:33:49 +08:00
zhengxie	808a5e186d	[django1.8] Fix compatibility error in groups api and log export	2015-12-07 10:52:56 +08:00
zhengxie	9ffb067af1	Fix tests	2015-12-05 16:35:51 +08:00
zhengxie	83d7e8b404	Update rest framework to latest (v3.3.1)	2015-12-05 16:35:51 +08:00
zhengxie	333c0a9966	Upgrade rest framwork, check memcached at startup	2015-12-05 16:35:51 +08:00