Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Merge branch 'master' into chenyu
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'jingye' of https://github.com/yincart/basic into jingye

Conflicts:
	protected/backend/runtime/application.log
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' of https://github.com/yincart/basic
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into chenyu

Conflicts:
	assets/7b079340/pager.css
	assets/c5e0fde8/detailview/styles.css
	assets/c5e0fde8/gridview/bg.gif
	assets/c5e0fde8/gridview/delete.png
	assets/c5e0fde8/gridview/down.gif
	assets/c5e0fde8/gridview/jquery.yiigridview.js
	assets/c5e0fde8/gridview/loading.gif
	assets/c5e0fde8/gridview/styles.css
	assets/c5e0fde8/gridview/up.gif
	assets/c5e0fde8/gridview/update.png
	assets/c5e0fde8/gridview/view.png
	assets/c5e0fde8/listview/down.gif
	assets/c5e0fde8/listview/jquery.yiilistview.js
	assets/c5e0fde8/listview/loading.gif
	assets/c5e0fde8/listview/styles.css
	assets/c5e0fde8/listview/up.gif
	assets/e62acb1a/autocomplete/indicator.gif
	assets/e62acb1a/autocomplete/jquery.autocomplete.css
	assets/e62acb1a/jquery.ajaxqueue.js
	assets/e62acb1a/jquery.autocomplete.js
	assets/e62acb1a/jquery.ba-bbq.js
	assets/e62acb1a/jquery.ba-bbq.min.js
	assets/e62acb1a/jquery.bgiframe.js
	assets/e62acb1a/jquery.cookie.js
	assets/e62acb1a/jquery.history.js
	assets/e62acb1a/jquery.js
	assets/e62acb1a/jquery.maskedinput.js
	assets/e62acb1a/jquery.maskedinput.min.js
	assets/e62acb1a/jquery.metadata.js
	assets/e62acb1a/jquery.min.js
	assets/e62acb1a/jquery.multifile.js
	assets/e62acb1a/jquery.rating.js
	assets/e62acb1a/jquery.treeview.async.js
	assets/e62acb1a/jquery.treeview.edit.js
	assets/e62acb1a/jquery.treeview.js
	assets/e62acb1a/jquery.yii.js
	assets/e62acb1a/jquery.yiiactiveform.js
	assets/e62acb1a/jquery.yiitab.js
	assets/e62acb1a/jui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/e62acb1a/jui/css/base/images/ui-bg_flat_75_ffffff_40x100.png
	assets/e62acb1a/jui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	assets/e62acb1a/jui/css/base/images/ui-bg_glass_65_ffffff_1x400.png
	assets/e62acb1a/jui/css/base/images/ui-bg_glass_75_dadada_1x400.png
	assets/e62acb1a/jui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	assets/e62acb1a/jui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png
	assets/e62acb1a/jui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	assets/e62acb1a/jui/css/base/images/ui-icons_222222_256x240.png
	assets/e62acb1a/jui/css/base/images/ui-icons_2e83ff_256x240.png
	assets/e62acb1a/jui/css/base/images/ui-icons_454545_256x240.png
	assets/e62acb1a/jui/css/base/images/ui-icons_888888_256x240.png
	assets/e62acb1a/jui/css/base/images/ui-icons_cd0a0a_256x240.png
	assets/e62acb1a/jui/css/base/jquery-ui.css
	assets/e62acb1a/jui/css/base/jquery.ui.accordion.css
	assets/e62acb1a/jui/css/base/jquery.ui.autocomplete.css
	assets/e62acb1a/jui/css/base/jquery.ui.button.css
	assets/e62acb1a/jui/css/base/jquery.ui.core.css
	assets/e62acb1a/jui/css/base/jquery.ui.datepicker.css
	assets/e62acb1a/jui/css/base/jquery.ui.dialog.css
	assets/e62acb1a/jui/css/base/jquery.ui.menu.css
	assets/e62acb1a/jui/css/base/jquery.ui.progressbar.css
	assets/e62acb1a/jui/css/base/jquery.ui.resizable.css
	assets/e62acb1a/jui/css/base/jquery.ui.selectable.css
	assets/e62acb1a/jui/css/base/jquery.ui.slider.css
	assets/e62acb1a/jui/css/base/jquery.ui.spinner.css
	assets/e62acb1a/jui/css/base/jquery.ui.tabs.css
	assets/e62acb1a/jui/css/base/jquery.ui.theme.css
	assets/e62acb1a/jui/css/base/jquery.ui.tooltip.css
	assets/e62acb1a/jui/js/jquery-ui-i18n.min.js
	assets/e62acb1a/jui/js/jquery-ui.min.js
	assets/e62acb1a/punycode.js
	assets/e62acb1a/punycode.min.js
	assets/e62acb1a/rating/delete.gif
	assets/e62acb1a/rating/jquery.rating.css
	assets/e62acb1a/rating/star.gif
	assets/e62acb1a/treeview/images/ajax-loader.gif
	assets/e62acb1a/treeview/images/file.gif
	assets/e62acb1a/treeview/images/folder-closed.gif
	assets/e62acb1a/treeview/images/folder.gif
	assets/e62acb1a/treeview/images/minus.gif
	assets/e62acb1a/treeview/images/plus.gif
	assets/e62acb1a/treeview/images/treeview-black-line.gif
	assets/e62acb1a/treeview/images/treeview-black.gif
	assets/e62acb1a/treeview/images/treeview-default-line.gif
	assets/e62acb1a/treeview/images/treeview-default.gif
	assets/e62acb1a/treeview/images/treeview-famfamfam-line.gif
	assets/e62acb1a/treeview/images/treeview-famfamfam.gif
	assets/e62acb1a/treeview/images/treeview-gray-line.gif
	assets/e62acb1a/treeview/images/treeview-gray.gif
	assets/e62acb1a/treeview/images/treeview-red-line.gif
	assets/e62acb1a/treeview/images/treeview-red.gif
	assets/e62acb1a/treeview/jquery.treeview.css
	assets/e62acb1a/yiitab/jquery.yiitab.css
	themes/leather/views/article/index.php

Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Merge branch 'master' into chenyu

Conflicts:
	themes/leather/views/article/index.php

Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou
Signed-off-by: wucangzhou <wucangzhou@gmail.com>