4458 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lian	b53764a24a	[api2] fix repo owner check when org user share dir	2015-12-23 13:35:22 +08:00
Daniel Pan	d9f73f8610	Merge pull request #952 from haiwen/view-raw-file ... add comment for view_raw_file function	2015-12-19 14:54:22 +08:00
lian	4f18dd71d3	add comment for view_raw_file function	2015-12-19 14:39:13 +08:00
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
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	e01b4e89c2	Merge pull request #938 from haiwen/share-dir-api ... [api] update share dir item api	2015-12-09 16:51:14 +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
patrickgao	c20ad99319	add "Last Update" for shared links	2015-12-08 23:08:50 +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	957b3b4beb	update user admin group test	2015-12-08 16:29:50 +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
poetwang	08a5c17fb3	[api2] make upload blocks token reusable	2015-12-07 11:35:55 +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
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
llj	2cb64b9e92	Merge pull request #923 from haiwen/user-info-groups ... update trans & groups tab ID in user info page	2015-12-04 14:38:42 +08:00
lian	1c4780c5c0	update trans & groups tab ID in user info page	2015-12-04 14:33:33 +08:00
xiez	698bfc4e09	Merge pull request #922 from haiwen/grp-avatar-cache ... [api2.1] update groups api when get group avatar url	2015-12-04 14:07:26 +08:00
lian	a084916cf8	[api2.1] update groups api when get group avatar url	2015-12-04 13:59:25 +08:00
zhengxie	7c06cbd76f	[avatar] Fix cache bug in api_grp_avatar_url	2015-12-04 13:55:00 +08:00
zhengxie	02bef78f7f	[tests] Add user options tests	2015-12-04 11:25:26 +08:00
zhengxie	b080acc716	Handle case when commit in an event is None	2015-12-04 11:22:09 +08:00
zhengxie	f3732d87b6	Fix multiple user options bug, handle the case repo is None when delete	2015-12-04 11:15:34 +08:00
zhengxie	4a5f27052a	[i18n] Update locales	2015-12-04 10:46:15 +08:00
zhengxie	cc1e0d0ba1	[i18n] Update	2015-12-03 18:26:03 +08:00
xiez	266dc106a8	Merge pull request #920 from haiwen/translate ... update translate	2015-12-03 18:06:31 +08:00
lian	7998a6e405	update translate	2015-12-03 18:05:20 +08:00
zhengxie	e74b7b4d2a	[i18n] Update source files	2015-12-03 17:59:33 +08:00
xiez	25ce157a7f	Merge pull request #919 from haiwen/trans ... update translate	2015-12-03 17:58:21 +08:00
lian	8e2a744db6	update translate	2015-12-03 17:56:28 +08:00