651 Commits

Author	SHA1	Message	Date
lian	44d176a45c	update group api test	2016-01-06 19:12:24 +08:00
zhengxie	c0d3d02341	Merge branch '4.4' into 5.0	2015-12-28 10:47:34 +08:00
zhengxie	042956c5a5	Merge branch '4.4' into 5.0	2015-12-28 10:36:30 +08:00
lian	a722448548	[api2] search user insensitive	2015-12-25 17:35:05 +08:00
lian	58550e3e59	[api2] fix share type info in "be shared" repos api	2015-12-24 14:53:29 +08:00
lian	bbb9e8664e	[api] add delete be shared repo api	2015-12-23 18:53:12 +08:00
zhengxie	1672bbd5ff	[api2] Add list shared upload links	2015-12-23 17:31:07 +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
zhengxie	3b0f3d475b	Merge branch '4.4' into 5.0 ... Conflicts: seahub/templates/share_access_validation.html	2015-12-17 15:50:50 +08:00
lian	c809bd0390	update test shard dir	2015-12-16 19:24:51 +08:00
lian	001856f89f	add password check when view file via share link	2015-12-16 19:09:55 +08:00
xiez	922b4411ba	Merge pull request #942 from haiwen/redesign ... Redesign	2015-12-15 11:59:52 +08:00
zhengxie	9404af609d	Add post_office app, and send async email to imported csv users	2015-12-15 11:32:34 +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
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
lian	c31f201d5b	update groups api	2015-12-08 18:43:32 +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
zhengxie	054ef03687	[sysadmin] Force passwd change when add/reset user	2015-12-08 11:33:26 +08:00
lian	d1bcd3e113	[api2.1] add rename, transfer and delete group api	2015-12-07 11:33:49 +08:00
zhengxie	9ffb067af1	Fix tests	2015-12-05 16:35:51 +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	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
lian	c8b84eb47f	update sys admin repo view & user info test	2015-12-04 16:19:32 +08:00
zhengxie	e91e796efc	[api2] Fix create dir shared item bug	2015-12-04 16:17:13 +08:00
zhengxie	5c3de620f8	Merge branch '5.0'	2015-12-04 11:57:53 +08:00
zhengxie	02bef78f7f	[tests] Add user options tests	2015-12-04 11:25:26 +08:00
lian	e146e92331	[api2.1] new groups api	2015-12-03 16:45:08 +08:00
zhengxie	9d53430e4c	Merge branch '4.4' into 5.0 ... Conflicts: media/css/seahub.css seahub/group/templates/group/group_manage.html seahub/utils/__init__.py seahub/views/repo.py tests/seahub/views/test_file.py	2015-12-02 17:37:50 +08:00
lian	643d036942	new file access log page	2015-11-27 10:55:56 +08:00
lian	427b51ae23	[user admin] add "groups" tab at user info page	2015-11-24 19:02:30 +08:00
zhengxie	6aa5b4fadd	[tests] Update user export excel	2015-11-24 13:28:46 +08:00
lian	4bccc4abac	udpate export excel	2015-11-24 13:19:58 +08:00
zhengxie	c72f9c6999	[api2] Refresh cache when update account	2015-11-19 11:38:39 +08:00
zhengxie	4813a496ed	Add view raw file	2015-11-12 12:13:33 +08:00
zhengxie	623c4fb5f8	[wiki] Fix inner page links	2015-11-12 10:26:31 +08:00
zhengxie	b1bedaecfb	[share] Update share link passwd	2015-11-10 15:37:47 +08:00
zhengxie	2bfe7fc32e	[api2] Support username login	2015-11-10 14:07:56 +08:00
zhengxie	9b72657a84	Merge branch '4.4' ... Conflicts: seahub/views/repo.py	2015-11-09 16:52:11 +08:00
zhengxie	06df69887f	[file] Rename send_file_download_msg to send_file_access_msg	2015-11-09 16:37:32 +08:00
xiez	cbd4e9a69a	Merge pull request #879 from haiwen/shared-folder ... update list shared folders	2015-11-09 10:56:16 +08:00
zhengxie	e2b7e88094	Merge branch '4.4'	2015-11-05 16:33:13 +08:00
zhengxie	178ff33a58	Remove share links when delete repo	2015-11-05 16:04:19 +08:00
lian	cac171ecff	update list shared folders	2015-11-03 17:27:27 +08:00