test
Merge branch 'develop'

Conflicts:
	protected/modules/mall/controllers/ItemController.php
	protected/modules/mall/views/item/_form_base.php
	themes/leather/views/catalog/index.php
	themes/pidiao/views/site/index.php

Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
no message
Fix the wrong url.
Merge pull request #43 in YIN/basic from bugfix/YIN-181-new-js-href to master

# By Chaozhang Xue (3) and others
# Via Changhai Lin (3) and others
* commit '885fead84f4a645eee5a1953d29971cf53e35d0a':
  Fix the wrong url.
  no message
  Home goods shows the first line of fabric products picture show.
  fixed update button can't use when manage member ship(add some necessary method and files in boot-strap)
  no message
  delete extra item"*的字段为必填项"
  fixed view profile
  "advanced search"button is invalid . delete it
  change   the   style
  fix the page of the Update paymethed. fix the yin-166,170,165
  pic
  no message
  Backend State 显示问题。
  1. fixed the product list can't show the item if item's attribute is_show equal true; 2. modify the product list header to display in chinese 3. fixed the submit button can't work
no message
Merge branch 'master' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YIN-194-banner

Conflicts:
	themes/leather/css/deal.css
	themes/leather/views/item/view.php
	themes/leather/views/site/index.php

Signed-off-by: haoxiangchen <haoxiang.chen@jago-ag.cn>
Merge pull request #45 in YIN/basic from bugfix/YIN-194-banner to master

# By changhai.lin (5) and others
# Via Changhai Lin (5) and others
* commit 'c47b76d597d1672e116c967ce5b446aeeb9b3a8d':
  no message
  change the database and add some pictures
  no message
  Manage Users page Advanced Search link is invalid.
  change the static html page into php. now, the data in the table can be changed.
  Change the route of bootstrap. now, it is in the /thems/leather/css/bootstrap. change the display of the photo.
  fixed product attributes can modify when view product
  change   the  style
  Friend links  section has been modified!
  Article list interface has been modified!
  Message will be repeated when creating a product sku.
  Message will be repeated when creating a product sku.
  Message will be repeated when creating a product sku.
  All links can not click on the bottom of the home page.
Merge branch 'develop'

Conflicts:
	protected/modules/cms/views/article/index.php
	protected/modules/cms/views/article/view.php
	themes/leather/css/deal.css
	themes/leather/views/item/view.php
	themes/leather/views/site/index.php

Signed-off-by: Chaozhang Xue <475990465@qq.com>
beautify the pages
Merge pull request #73 in YIN/basic from bugfix/YIN-208 to develop

* commit '68e42a4cd26e683b502261549d5946533935f8ba':
  beautify the pages
Merge pull request #75 in YIN/basic from bugfix/YIN-172-demo123 to develop

# By ShuaiDu
# Via ShuaiDu
* commit '8c4d6a0f8221408eb3bab80b574605b19f8c9a49':
  upload database
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YIN-206
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YIN-206
no message
Merge branch 'bugfix/YIN-206' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YIN-2066

Conflicts:
	themes/leather/views/item/view.php
no message
Merge pull request #78 in YIN/basic from bugfix/YIN-2066 to develop

# By Jiadong.Han
# Via Jiadong.Han
* commit '28e2d5d0891144b436332cc09988d824aee8afa3':
  no message
  no message
Registration page message not center