4522 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	46e79044cc	[markdown/wiki view] modified 'marked' options	2015-11-11 18:35:03 +08:00
zhengxie	1f075be450	[wiki] Remove content link parsing	2015-11-11 16:21:01 +08:00
llj	bb9f374e41	Merge pull request #894 from haiwen/markdown ... Markdown	2015-11-11 15:50:08 +08:00
llj	a6f86b6ea9	[markdown edit] modification	2015-11-11 15:42:33 +08:00
llj	91bc45c596	[shared dir view] grid view: fix	2015-11-10 18:08:54 +08:00
zhengxie	2ce8eb17df	[utils] Fix function arg error	2015-11-10 17:36:23 +08:00
llj	1055c9a557	[shared dir view] fix for lang popup	2015-11-10 17:33:09 +08:00
llj	b2313e1456	[markdown view/edit] use 'marked' for md/wiki view, use editormd for md edit	2015-11-10 10:26:55 +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	e1e890622d	Merge pull request #891 from haiwen/update-indentation ... update indentation	2015-11-09 13:34:15 +08:00
lian	65dbec209d	update indentation	2015-11-09 13:32:21 +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	7c42b0acf7	[api2] Fix undefined variables	2015-11-09 10:55:35 +08:00
poetwang	d518c3f47a	[api2] generate url for each block for downloading blocks	2015-11-07 13:25:32 +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
xiez	3106179524	Merge pull request #887 from haiwen/is-password-set ... update use of is_password_set api	2015-11-05 15:48:45 +08:00
lian	3b0f5cf70d	update use of is_password_set api	2015-11-05 15:24:43 +08:00
llj	a66e768748	Merge pull request #883 from haiwen/new-file-icons-192 ... add HD images for 'shared dir' grid view	2015-11-05 14:52:04 +08:00
Daniel Pan	2d62b851ce	Merge pull request #886 from haiwen/repo-trash-tip ... add a tip for deleted libraries	2015-11-05 14:47:24 +08:00
patrickgao	6a51182d2e	update	2015-11-05 14:32:45 +08:00
patrickgao	83fb04fdf9	add a tip for deleted libraries	2015-11-05 14:22:17 +08:00
patrickgao	fc57ce8a84	add HD file icons for grid view	2015-11-05 13:26:25 +08:00
xiez	5b9e03c45f	Merge pull request #882 from haiwen/notice ... add try-except when set notice seen by id	2015-11-05 11:08:23 +08:00
Daniel Pan	96cbe60eb0	Merge pull request #878 from haiwen/search ... [backbone] added 'Search files in this library'	2015-11-05 10:59:20 +08:00
lian	3eba328e18	add try-except when set notice seen by id	2015-11-04 11:46:10 +08:00
lian	cac171ecff	update list shared folders	2015-11-03 17:27:27 +08:00
xiez	9e7ca85416	Merge pull request #877 from haiwen/file-preview ... disable office/pdf file preview in encrypted repo	2015-11-03 16:52:25 +08:00
lian	251a5fbca3	disable office/pdf file preview in encrypted repo	2015-11-03 15:06:06 +08:00
zhengxie	05bf93824f	[tests] Add file view tests	2015-11-03 14:43:26 +08:00
zhengxie	c035744735	[i18n] Update locales to 5.0	2015-11-03 11:15:38 +08:00
zhengxie	68d5d057be	[locale] Update a few strings in source files	2015-11-03 11:11:49 +08:00
zhengxie	42eaa94dc4	Update a few strings	2015-11-03 11:07:18 +08:00
llj	5d2600c8c0	[backbone] added 'Search files in this library'	2015-11-03 11:06:24 +08:00
llj	d070a4d7d3	[add-repo] bugfix	2015-11-02 17:11:11 +08:00
zhengxie	4b03a55685	Fix circular import and add test case	2015-11-02 15:08:52 +08:00
zhengxie	0b3292b038	Fix shared upload link email bug	2015-11-02 13:49:43 +08:00
llj	216bea2b4b	[share.js] modified 'delete link'	2015-10-30 16:27:16 +08:00
zhengxie	2c04a75881	[i18n] Update source files	2015-10-30 11:29:03 +08:00
xiez	197594be01	Merge pull request #875 from haiwen/grid ... Grid	2015-10-30 11:24:23 +08:00
xiez	b541966461	Merge pull request #872 from haiwen/trash ... add trash page for folder & update indentation	2015-10-30 11:18:34 +08:00
lian	722b5c3d74	add exception check when load trash page	2015-10-30 11:12:49 +08:00
lian	3bcd5810d0	add trash page for folder & update indentation	2015-10-30 10:38:02 +08:00
xiez	c09defec56	Merge pull request #873 from haiwen/dl-zipped ... use "real_path" when download sub-folder in shared dir	2015-10-29 17:45:18 +08:00
llj	40ddb4ea4b	[view_shared_dir] added 'grid view'	2015-10-29 17:17:40 +08:00
xiez	2448871ada	Merge pull request #874 from haiwen/file-access-msg ... update send file access msg	2015-10-29 10:32:29 +08:00
lian	b50430683b	update send file access msg	2015-10-29 10:06:04 +08:00
zhengxie	116cc16d13	[share] Fix share quota bug	2015-10-28 17:16:25 +08:00
lian	59961ea9dd	use "real_path" when download sub-folder in shared dir	2015-10-28 15:15:47 +08:00