28 Commits

Author	SHA1	Message	Date
zhengxie	105e51575f	Merge branch 'develop' ... Conflicts: templates/base.html	2013-04-22 20:19:40 +08:00
Phillip Thelen	c692ee8ec2	added possibility to let resetted passwords be generated	2013-04-18 15:13:04 +02:00
zhengxie	a957a616f6	Handle case that get_commits returns empty	2013-04-16 11:32:58 +08:00
zhengxie	002d22eab2	Added upgrade link and change function	2013-04-13 17:02:45 +08:00
zhengxie	9b6d7387da	Show 20 users per-page in pubuser	2013-04-11 17:33:45 +08:00
llj	efeb4d5ea5	rm unused code & file for 'file comment'	2013-04-05 14:50:09 +08:00
zhengxie	355d461521	Removed org	2013-04-02 19:56:44 +08:00
zhengxie	4274ddf69a	Clean code	2013-04-02 15:13:19 +08:00
lins05	53d0187117	don't count block download into traffic stat	2013-04-01 16:13:33 +08:00
llj	1514abe25d	[pubuser] added 'add as contact'	2013-04-01 15:12:59 +08:00
zhengxie	000e9aa0ea	Fixed typos	2013-03-30 21:08:50 +08:00
zhengxie	574c62d7af	Remove user from check_group_staff	2013-03-30 11:39:43 +08:00
lins05	fb00077554	import seahub.XXX instead of XXX	2013-03-29 20:41:13 +08:00
zhengxie	08fc2f50d4	Raise http404 when get repo returns none	2013-03-29 14:51:10 +08:00
zhengxie	d7eadc41eb	Move repo and history repo from views/__init__.py to views/repo.py	2013-03-28 14:53:53 +08:00
zhengxie	56c779b3b3	Move file edit from views/__init__.py to views/file.py	2013-03-28 14:18:55 +08:00
lins05	428d88c331	add shared dir download to traffic stat	2013-03-27 15:59:53 +08:00
zhengxie	0d0c654142	Redirect to wiki page when cancle editing	2013-03-26 10:43:26 +08:00
zhengxie	97c10bc6f6	Fixed bug in give/take admin	2013-03-25 11:43:50 +08:00
lins05	f617866a91	add traffic stat from view_file_via_shared_dir	2013-03-20 13:58:54 +08:00
lins05	f3d0e46d42	add user traffic stat	2013-03-18 20:37:29 +08:00
zhengxie	a4a499140d	Modified logging	2013-03-18 16:16:25 +08:00
lins05	1177fae87f	send stats message when shared link is viewed/downloaded	2013-03-18 13:10:32 +08:00
zhengxie	b30aff9bf8	Modified wiki link parsing and add icon to wiki links.	2013-03-15 16:45:06 +08:00
zhengxie	661c3543ec	Update wiki tips, enable image linking and return to wiki page when finishing editing page	2013-03-15 16:45:06 +08:00
plt	71fec8a3b2	Remove seaserv	2013-03-09 10:35:53 +08:00
llj	9693be76ca	[repo share] fixed bug for ClOUD MODE	2013-03-08 10:23:33 +08:00
zhengxie	151a158f4a	Move views.py to views/, and refactor file view	2013-03-08 10:21:34 +08:00