install
Signed-off-by: Hao Fan <bailuyunfan@163.com>
Signed-off-by: wucangzhou <443870279@qq.com>
Signed-off-by: Hao Fan <bailuyunfan@163.com>
assets
Signed-off-by: lctld92 <eg.clover@gmail.com>
Signed-off-by: lctld92 <eg.clover@gmail.com>
Signed-off-by: lctld92 <eg.clover@gmail.com>
--Fix issue #4

Signed-off-by: qiansen1386 <qiansen1386@gmail.com>
Fix Config of Frontend register wrong directory alias for Backend.

Signed-off-by: qiansen1386 <qiansen1386@gmail.com>
Tell Git stop tracking the runtime folder by using ``git rm --cached protected/runtime/\*`` AND ``git rm --cached protected/backend/runtime/\*``

Signed-off-by: qiansen1386 <qiansen1386@gmail.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'chengteng'

Conflicts:
	protected/backend/runtime/application.log
Merge branch 'cangZhou'

Conflicts:
	protected/backend/runtime/application.log
Merge branch 'lujie'

Conflicts:
	protected/backend/runtime/application.log
	protected/runtime/gii-1.1.15-dev/ModelCode.php
	protected/views/catalog/index.php
	protected/views/item/view.php
	protected/widgets/default/views/itemHistory.php
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/backend/runtime/application.log
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/modules/mall/views/itemCategory/_form.php
	protected/views/catalog/index.php
Merge branch 'lujie'
add messages
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/messages/bg/zii.php
	protected/messages/ca/zii.php
	protected/messages/cs/zii.php
	protected/messages/de/zii.php
	protected/messages/el/zii.php
	protected/messages/es/zii.php
	protected/messages/fi/msg.php
	protected/messages/fi/zii.php
	protected/messages/fr/zii.php
	protected/messages/he/zii.php
	protected/messages/hu/zii.php
	protected/messages/id/zii.php
	protected/messages/it/zii.php
	protected/messages/ja/zii.php
	protected/messages/kk/zii.php
	protected/messages/ko_kr/zii.php
	protected/messages/lv/zii.php
	protected/messages/nl/zii.php
	protected/messages/pl/zii.php
	protected/messages/pt/zii.php
	protected/messages/pt_br/zii.php
	protected/messages/ro/zii.php
	protected/messages/ru/zii.php
	protected/messages/sk/zii.php
	protected/messages/sv/zii.php
	protected/messages/uk/zii.php
	protected/messages/vi/zii.php
	protected/messages/zh_cn/zii.php
	protected/messages/zh_tw/zii.php
Merge branch 'lujie'