6245 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Pan	b912c69c5a	Merge pull request #1735 from haiwen/new-lib-icons ... [lib icons] use new lib icons	2017-08-26 11:44:55 +08:00
llj	dcfdafcc43	[lib icons] modified some icons	2017-08-26 11:07:12 +08:00
llj	85bb89d1b9	[lib icons] use 2X icons for non-backbone pages	2017-08-26 11:07:12 +08:00
llj	ab5c066a74	[lib icons] use new lib icons	2017-08-26 11:07:12 +08:00
llj	df40bee1d5	Merge pull request #1773 from haiwen/login-bg-image ... background image of login page	2017-08-26 10:51:31 +08:00
llj	0f8ee85063	[system admin] settings: modified 'Login Background Image'	2017-08-25 12:05:14 +08:00
zming	d23a17424c	[API] background image of login page	2017-08-25 11:50:50 +08:00
zming	b460d89f5a	[test] pro -> master	2017-08-23 16:28:51 +08:00
zhengxie	277061c677	Sort language list	2017-08-23 16:03:51 +08:00
zhengxie	21701ef3b3	Merge branch 'setLibHistory' ... Conflicts: seahub/urls.py	2017-08-23 15:37:29 +08:00
zhengxie	60da1ed10a	Merge branch '6.1'	2017-08-23 14:51:56 +08:00
zhengxie	1a581a2d5d	Update travis	2017-08-23 14:51:30 +08:00
xiez	7e03135e45	Merge pull request #1777 from haiwen/migrate-two-factor ... [MIGRATE] migrate two-factor	2017-08-23 14:49:30 +08:00
zhengxie	f15aa06978	[two factor] Refactor code	2017-08-23 14:46:02 +08:00
zhengxie	55d3839da8	[profile] Remove unused template include	2017-08-23 11:55:31 +08:00
zming	d0975c7836	migrate two-factor	2017-08-21 14:02:57 +08:00
Daniel Pan	63c2944390	Merge pull request #1776 from haiwen/api_return_lock_owner_name ... api: include lock_owner_name if a file is locked	2017-08-19 01:12:26 +08:00
Shuai Lin	705e010be4	api: include lock_owner_name if a file is locked	2017-08-18 19:13:33 +08:00
xiez	5cf93f2b5a	Merge pull request #1772 from haiwen/travis-to-slack ... [notification] send travis message to slack	2017-08-17 12:09:57 +08:00
zming	23ad613ed8	[notification] send travis message to slack	2017-08-17 12:02:26 +08:00
xiez	3be404e818	Merge pull request #1768 from haiwen/master-sharing-groups-f ... [api] fix setting don't work	2017-08-17 10:08:23 +08:00
zming	4133d33854	[api] fix setting don't work	2017-08-16 18:48:37 +08:00
xiez	7ceae060a3	Merge pull request #1767 from haiwen/master-sharing-groups-test-f ... [api] fix share to all groups test	2017-08-16 18:10:06 +08:00
zming	9dc68b75d0	[api] fix share to all groups test	2017-08-16 17:55:52 +08:00
Daniel Pan	46e206be74	Merge pull request #1764 from haiwen/check-name ... check if name is valid when create folder/file	2017-08-16 16:22:01 +08:00
Daniel Pan	1bac6302cd	Merge pull request #1760 from haiwen/check-quota ... return 443 http code when above quota	2017-08-16 15:37:35 +08:00
lian	9d9beb3f1e	check if name is valid when create folder/file	2017-08-15 17:26:44 +08:00
Daniel Pan	8ced28759f	Merge pull request #1762 from haiwen/file-upload-btns ... [UI] modified some 'file upload' buttons	2017-08-15 16:35:37 +08:00
lian	b46b0f33cf	return 443 http code when above quota	2017-08-15 16:22:56 +08:00
xiez	30e0375e63	Merge pull request #1761 from haiwen/resotre-test ... restore-library test	2017-08-15 16:01:34 +08:00
llj	cb0aacd89d	[UI] modified some 'file upload' buttons	2017-08-15 15:43:37 +08:00
zming	897eced17f	restore-library test	2017-08-15 11:43:05 +08:00
lian	fa2141e81c	[locale] Update source files	2017-08-14 16:35:14 +08:00
Daniel Pan	d99e7b6270	Merge pull request #1738 from haiwen/restore-repo ... permission check, check whether repo is exists	2017-08-14 15:09:25 +08:00
zming	1be9c34071	error msg: repo -> library	2017-08-14 14:44:05 +08:00
zming	f2b2ec3c43	delete redundant code	2017-08-14 14:36:12 +08:00
Daniel Pan	b5e653b255	Merge pull request #1759 from haiwen/statistic ... [system admin] statistic: modification	2017-08-14 12:28:24 +08:00
llj	d9b4953e6f	[system admin] statistic: modification	2017-08-14 11:33:50 +08:00
Daniel Pan	c23b6de1a9	Merge pull request #1747 from haiwen/export-users ... python manage.py export_users	2017-08-14 10:00:12 +08:00
Daniel Pan	f937dbe0b7	Merge pull request #1758 from haiwen/system-settings ... [system admin] settings: fix & improvement	2017-08-12 19:50:12 +08:00
llj	cca91db5fc	[system admin] settings: fix & improvement	2017-08-12 17:58:21 +08:00
xiez	78954f2399	Merge pull request #1753 from haiwen/tag-send-message-fix ... update variable name	2017-08-12 14:56:12 +08:00
lian	3e7275ec80	Merge branch '6.1'	2017-08-12 14:34:11 +08:00
Daniel Pan	7b0b8b82eb	Merge pull request #1757 from haiwen/share-to-group ... check if is group member when share repo to group	2017-08-12 10:43:52 +08:00
llj	c6e8b64492	[system admin] libraries: added 'history setting'	2017-08-11 17:51:11 +08:00
lian	057b6960be	check if is group member when share repo to group	2017-08-11 16:11:35 +08:00
xiez	8ddaa34863	Merge pull request #1756 from haiwen/master-sharing-groups-f ... [share-group] add judege of global config	2017-08-11 16:04:25 +08:00
zming	71976f998d	[share-group] add judege of global config	2017-08-11 15:51:03 +08:00
xiez	49605e79ff	Merge pull request #1743 from haiwen/master-sharing-groups ... [ share-repo ] can share repo to any groups	2017-08-11 13:32:12 +08:00
llj	2409c7d938	[share] 'enable share to all groups': modification	2017-08-10 17:38:51 +08:00