Ares's first commit
Ares's first commit
Merge pull request #1 from Demonsu/searchcenter

debuged the act.class
Merge pull request #2 from Demonsu/searchcenter

search center php complete and merged to master
Wang Yaojing:index and act
Merge branch 'master' into activity_center

Conflicts:
	public/act.php
	public/assets/js/act.js
	public/tpls/templates/act.html
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/b50b7562c6d0bda8d5967293bd62cebc8b3648b0.file.footer.html.php
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php

Signed-off-by: Demonsu <245681117@qq.com>
Merge branch 'searchcenter' into activity_center

Conflicts:
	public/tpls/templates_c/065819e33f80626bdc30cb4be17a49ec08988f18.file.act_apply.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	public/tpls/templates_c/98ac2491da6aa96dd5b95ddfd79f9643e04a48d2.file.act_handle.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php

Signed-off-by: Demonsu <245681117@qq.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer.git into activity_center
handle the master act.php conflict

Signed-off-by: Demonsu <245681117@qq.com>
Update act.php
Signed-off-by: Demonsu <245681117@qq.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer.git
Signed-off-by: Demonsu <245681117@qq.com>