525 Commits

Author	SHA1	Message	Date
llj	1182a80989	Merge branch '6.2'	2018-03-15 11:26:02 +08:00
zming	f870a6d556	trash event	2018-03-13 18:31:01 +08:00
llj	6d4000fc20	[fileupload] show error message when failed to get upload url	2018-03-02 16:11:27 +08:00
llj	88478dee1d	[upgrade jquery] modifications, & cleaned up code & files	2018-02-05 16:47:56 +08:00
llj	4fd7b7acd7	[share] fix	2018-01-30 18:04:50 +08:00
lian	ed8200b52a	add api for getting groups that user can share repo to	2018-01-17 18:22:48 +08:00
zhengxie	d37144ef75	Merge branch '6.2' ... Conflicts: seahub/templates/base.html static/scripts/app/views/dir.js static/scripts/common.js	2017-12-28 15:47:18 +08:00
llj	32019fe305	Merge pull request #1963 from haiwen/mv-multi-fix ... [dir view] mv multi: fix	2017-12-27 16:53:18 +08:00
llj	f88c9c5f74	[dir view] mv multi: fix	2017-12-27 16:49:11 +08:00
lian	2fe5db8c76	update lock feature ... Don't allow delete/rename/move a file when it is locked	2017-12-27 15:03:47 +08:00
xiez	baeb8ccacf	Merge pull request #1952 from haiwen/invite-multi ... [invite people] enable to invite multiple guests at one time	2017-12-25 13:32:42 +08:00
lian	d4cf67e324	multi storage backend ... 1. add multi storage backend support 2. add 'storage_ids' user role	2017-12-19 15:41:36 +08:00
llj	d621e79bba	[invite people] enable to invite multiple guests at one time	2017-12-19 12:05:51 +08:00
llj	a3600ff488	[fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page	2017-12-14 17:23:01 +08:00
llj	6b31bae382	[dir view] mv/cp multi dirents: add feedback msg	2017-12-11 16:55:21 +08:00
llj	07dea7eca4	new design	2017-12-05 17:53:45 +08:00
Daniel Pan	c35ca85e1f	Merge pull request #1895 from haiwen/click-to-select ... [share.js] download/upload link: added 'click to select' feature	2017-11-14 10:29:58 +08:00
llj	fbbfebe09a	[group] fix	2017-11-13 14:28:21 +08:00
llj	ac18d5ee85	[share.js] download/upload link: added 'click to select' feature	2017-11-13 13:45:40 +08:00
zMingGit	f5d1be1f59	share permission refactor (#1843) ... * rebuild * share admin * use seafile_api * rebase 6.2 * complete test * api changed * some error * break up to two method * review * js review	2017-11-01 18:13:51 +08:00
llj	1577275095	small fix	2017-11-01 15:42:03 +08:00
llj	946002b5c6	[dir view] file comment: fix	2017-10-13 18:00:37 +08:00
llj	b772a62b1a	[my libs] repo 'folder perm': fix	2017-10-13 16:08:43 +08:00
llj	101872d5c4	[my libs] repo 'share links': fixed 'icon url'	2017-10-13 14:53:26 +08:00
llj	6ac3f5ae6e	[devices] fix	2017-10-10 16:16:37 +08:00
Daniel Pan	5c095ee516	Merge pull request #1842 from haiwen/file-comment ... [dir view] added 'file comment'	2017-09-26 02:06:09 -05:00
llj	b55446551b	[dir view] added 'file comment'	2017-09-26 10:35:16 +08:00
llj	c66a0bf6a7	[fileupload] fixed error msg	2017-09-25 15:29:27 +08:00
llj	2b5b811ec3	[favourites] modified file icon	2017-09-18 15:38:26 +08:00
llj	45e053a2f2	[file tags] add translation	2017-09-13 16:58:34 +08:00
llj	dafedd5f7f	modified 'group-repo'	2017-09-06 16:14:27 +08:00
llj	667afb6a59	[share] share repo to group with 'admin' perm: fix	2017-09-06 16:02:12 +08:00
zming	dd7f5d5417	[API] share to groups, add test	2017-09-06 16:02:12 +08:00
llj	211d527e5a	[home side nav] modified 'share admin'	2017-08-31 17:26:52 +08:00
Daniel Pan	834fc13d76	Merge pull request #1751 from haiwen/share-admin-permission ... [share] add admin permission	2017-08-30 18:08:33 +08:00
llj	33266638ef	[share] share repo with 'admin' perm: modification	2017-08-30 17:59:14 +08:00
llj	ab5c066a74	[lib icons] use new lib icons	2017-08-26 11:07:12 +08:00
zming	160e0b3027	[API] share to admin permission	2017-08-26 10:38:12 +08:00
zhengxie	21701ef3b3	Merge branch 'setLibHistory' ... Conflicts: seahub/urls.py	2017-08-23 15:37:29 +08:00
lian	3e7275ec80	Merge branch '6.1'	2017-08-12 14:34:11 +08:00
llj	c6e8b64492	[system admin] libraries: added 'history setting'	2017-08-11 17:51:11 +08:00
llj	2409c7d938	[share] 'enable share to all groups': modification	2017-08-10 17:38:51 +08:00
zming	5d04ce0de2	[ share-repo ] can share repo to any groups	2017-08-10 17:35:39 +08:00
llj	11ddefb508	[repo snapshot labels] added 'label current state' for my libs; show labels in 'repo history' page	2017-08-02 15:07:44 +08:00
lian	89392f3061	Merge pull request #1693 from haiwen/gif ... Don't use 'big' thumbnail for gif files	2017-07-15 15:14:11 +08:00
lian	3dc584ea97	update notification interval ... set 3 * 60 as the default interval for the js value.	2017-07-15 11:05:58 +08:00
llj	a070329833	Don't use 'big' thumbnail for gif files	2017-07-12 16:35:09 +08:00
llj	8be017e917	[dirent details] add 'tags'	2017-07-12 10:47:52 +08:00
lian	96e2340a81	update user notifications ... 1. use cache to store user unseen notifications count 1. add UNREAD_NOTIFICATIONS_REQUEST_INTERVAL	2017-07-07 11:05:53 +08:00
llj	3905f7b3ef	[dirent details] improvement	2017-07-05 12:17:11 +08:00