5646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Pan	9e956826d1	Merge pull request #1366 from haiwen/group_wiki-fix ... [group wiki] fix UI	2016-09-24 16:27:24 +08:00
llj	eb7312904b	[group wiki] fix UI	2016-09-24 15:53:53 +08:00
Daniel Pan	d629e24369	Merge pull request #1364 from haiwen/sub-repo ... filter out sub repos	2016-09-22 11:42:54 +08:00
lian	74b5e840db	filter out sub repos	2016-09-22 11:32:21 +08:00
xiez	2e8f406302	Merge pull request #1363 from haiwen/handler ... NOT use is_pro_version in seahub/handler	2016-09-21 17:11:54 +08:00
lian	9a8be38362	NOT use is_pro_version in seahub/handler	2016-09-21 17:09:51 +08:00
xiez	9bdd8b1f75	Merge pull request #1351 from haiwen/revert-file ... update revert file/dir	2016-09-20 14:07:32 +08:00
Daniel Pan	5c6dcb1888	Merge pull request #1362 from haiwen/profile ... [user profile] modified UI	2016-09-20 13:25:12 +08:00
llj	405e6b7e2c	[user profile] modified UI	2016-09-20 13:19:09 +08:00
Daniel Pan	b1778698b9	Merge pull request #1354 from haiwen/repo-pattern ... add library pattern feature	2016-09-19 13:57:02 +08:00
lian	b23fc5dbf3	udpate repo_created_cb	2016-09-19 13:54:17 +08:00
llj	3834245dce	[library templates] fix	2016-09-19 11:13:01 +08:00
Daniel Pan	a2434f7e4b	Merge pull request #1359 from haiwen/unlink-device ... delete device token when mark device remoted wiped failed	2016-09-18 18:21:43 +08:00
lian	c8cf40309d	delete device token when mark device remoted wiped failed	2016-09-18 18:07:51 +08:00
Daniel Pan	5ed52bb292	Merge pull request #1358 from haiwen/ui-fix ... [password change done] fixed UI	2016-09-18 14:33:41 +08:00
llj	f6efedd510	[password change done] fixed UI	2016-09-18 13:59:49 +08:00
lian	2e098b628e	enable library template when create group/pub repo	2016-09-18 11:58:14 +08:00
lian	dd2b8ca290	update convert datetime/timestamp to isoformat time string	2016-09-17 16:15:00 +08:00
Daniel Pan	eae6bf90fe	Merge pull request #1356 from haiwen/get-exif ... update get image exif info	2016-09-17 15:43:50 +08:00
lian	e0b3764dfe	update get image exif info	2016-09-17 13:41:40 +08:00
lian	4d8383c82a	Merge pull request #1355 from haiwen/max_number_of_files ... [fileupload] modified 'maxNumberOfFiles'	2016-09-17 13:37:40 +08:00
llj	fb6430b027	[fileupload] modified 'maxNumberOfFiles'	2016-09-14 17:35:42 +08:00
lian	94e91265cc	add library pattern feature	2016-09-14 13:47:12 +08:00
Daniel Pan	72cefff03f	Merge pull request #1353 from haiwen/traffic-quota ... count traffic when download zipped dir	2016-09-13 14:48:30 +08:00
lian	e7cc4342a1	count traffic when download zipped dir	2016-09-13 13:49:33 +08:00
lian	58737d62f7	update revert file/dir	2016-09-13 11:16:12 +08:00
Daniel Pan	93a85e014c	Merge pull request #1340 from haiwen/sort-repos ... remember sort mode after sort repos	2016-09-09 18:04:28 +08:00
zhengxie	c0add5e56a	[i18n] Add Finnish support	2016-09-09 16:37:25 +08:00
llj	585d0163d0	[sort] fix, rewrote	2016-09-08 16:26:23 +08:00
xiez	07f2bc258e	Merge pull request #1348 from haiwen/fix/roles ... [role perm] Update settings of role permissions	2016-09-07 14:24:08 +08:00
lian	a11925b033	remember sort mode after sort repos/dirents	2016-09-07 10:03:21 +08:00
Daniel Pan	631c75814b	Merge pull request #1349 from haiwen/get_exif ... update get image's exif info function	2016-09-06 13:44:20 +08:00
zhengxie	f4253ad806	[role perm] Update settings of role permissions	2016-09-05 15:16:31 +08:00
lian	2fc5aa0859	update get image's exif info function	2016-09-05 13:48:19 +08:00
xiez	c8de707f56	Merge pull request #1346 from haiwen/fix/invite ... [invitations] Fix mail and role	2016-09-05 10:39:05 +08:00
zhengxie	de9f8a0aea	[invitations] Fix mail and role	2016-09-05 10:37:18 +08:00
xiez	66a3e82e04	Merge pull request #1344 from haiwen/file-comment ... update md5_repo_id_parent_path	2016-09-02 18:16:35 +08:00
lian	1b9ee33b08	update md5_repo_id_parent_path ... encode path before pass it to md5 module	2016-09-02 17:46:59 +08:00
Daniel Pan	bd1e52a624	Merge pull request #1343 from haiwen/trash-restore-tip ... restore trash: modified the success tip	2016-09-02 17:24:51 +08:00
llj	63dc1b9fdd	restore trash: modified the success tip	2016-09-02 16:14:19 +08:00
xiez	d5ff53d94d	Merge pull request #1342 from haiwen/rotate-thumbnail ... rotate image according to Orientation info	2016-09-02 14:51:25 +08:00
lian	7290245178	rotate image according to Orientation info	2016-09-02 14:46:21 +08:00
Daniel Pan	37e315daa6	Merge pull request #1339 from haiwen/video-audio-preview ... video and audio file can be previewed always	2016-09-01 15:43:02 +08:00
zhengxie	bd5ebc495c	[i18n] Update zh po files	2016-09-01 13:31:16 +08:00
zhengxie	71405f6743	[i18n] Update po files	2016-09-01 11:08:44 +08:00
lian	f45aa40cf2	video and audio file can be previewed always	2016-09-01 10:58:19 +08:00
lian	47c6fd1e81	Merge pull request #1335 from haiwen/head-cmmt-id ... return head commit id when create repo via web api	2016-08-23 15:32:22 +08:00
lian	3f7cea8160	return head commit id when create repo via web api	2016-08-23 11:26:11 +08:00
Daniel Pan	799640cc0a	Merge pull request #1334 from haiwen/misc ... clean CSS	2016-08-22 16:02:01 +08:00
Daniel Pan	ecaae2c8c6	Merge pull request #1333 from haiwen/popup-fix ... [share/perm popup] fix	2016-08-22 16:01:39 +08:00