molong 6f3ddf4dd8 Merge branch 'master' of https://git.oschina.net/sentcms/sentcms ...

# Conflicts:
#	application/common/view/default/ad/sider.html
#	core/convention.php
#	core/library/think/Route.php
#	core/library/think/Url.php

2016-07-10 23:50:02 +08:00

..

behavior

内核更新，多余文件清理

2016-07-01 18:04:46 +08:00

controller

1、bug的修复

2016-07-10 23:48:24 +08:00

model

1、bug的修复

2016-07-10 23:48:24 +08:00

validate

内核更新，多余文件清理

2016-07-01 18:04:46 +08:00

view/default

Merge branch 'master' of https://git.oschina.net/sentcms/sentcms

2016-07-10 23:50:02 +08:00

widget

管理功能升级

2016-06-27 17:53:01 +08:00