4478 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Pan	f348dfb717	Merge pull request #977 from haiwen/update-grp-api ... update grp api & add group members api	2015-12-31 15:26:24 +08:00
lian	ea963bb531	update grp api & add group members api	2015-12-31 12:58:48 +08:00
Daniel Pan	098415212f	Merge pull request #929 from haiwen/force_pwd ... [sysadmin] Force passwd change when add/reset user	2015-12-20 11:19:24 +08:00
Daniel Pan	9e855459eb	Merge pull request #930 from haiwen/post_office ... Add post_office app, and send async email to imported csv users	2015-12-20 11:17:41 +08:00
llj	800856e305	[backbone] remove unused code and files	2015-12-19 13:51:38 +08:00
llj	13486afe57	[add group] fix: modified param name according to the api	2015-12-19 10:29:05 +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
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	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
xiez	b67f4f7fc9	Merge pull request #936 from haiwen/groups-api ... update groups api	2015-12-09 10:42:36 +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
lian	46d9fea299	[api-v2.1] update transfer group api	2015-12-08 16:40:17 +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
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
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
zhengxie	887b6bbe03	Fix tests and replace mimetype with content_type	2015-12-05 16:35:50 +08:00
zhengxie	68efe49481	[django 1.8] WIP	2015-12-05 16:32:01 +08:00
zhengxie	cf1d719ecf	Merge branch '5.0'	2015-12-05 16:30:56 +08:00
zhengxie	0023d93aad	[share] Update share link passwd	2015-12-05 16:29:31 +08:00
zhengxie	238d3d28d4	[api2] Support username login	2015-12-05 16:29:19 +08:00
zhengxie	b316c4decc	[api2] Add more attributes to search-user and account info	2015-12-05 12:24:51 +08:00
zhengxie	8410afdba2	Fix api mkdir error when parent dir is nonexistent, and clean duplicated code in account	2015-12-05 11:46:08 +08:00
Daniel Pan	7d2bd6d859	Merge pull request #925 from haiwen/groups ... [groups] removed 'sideTips', use 'side nav'	2015-12-04 17:31:05 +08:00
llj	2b9923c700	[groups] removed 'sideTips', use 'side nav'	2015-12-04 17:26:04 +08:00
llj	25c07a916e	[side nav] modified 'group nav'	2015-12-04 16:33:51 +08:00
lian	aedbf5174b	return group member avatar url	2015-12-04 16:33:51 +08:00
llj	fa42d59cc8	redesigned 'group top'	2015-12-04 16:33:51 +08:00
llj	385b32154d	[hd] modified mine/shared/org ...pages	2015-12-04 16:33:51 +08:00
llj	4c0c8c10aa	[side nav] modified 'group nav'	2015-12-04 16:33:51 +08:00
llj	e5c5c2b9e7	redesigned side nav; removed 'top group nav'	2015-12-04 16:33:51 +08:00
llj	93f98bce15	[nav] removed top nav; redesigned side nav for home_base	2015-12-04 16:27:26 +08:00
lian	4293deceb3	[api] add get group members api	2015-12-04 16:27:26 +08:00
zhengxie	107f383bc1	Merge branch '5.0'	2015-12-04 16:25:10 +08:00
xiez	612abc605d	Merge pull request #924 from haiwen/sysadmin-repo ... update sys admin repo view	2015-12-04 16:20:52 +08:00