TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
This commit is contained in:
gmorel
2013-09-04 16:11:51 +02:00
parent a461420c67 ba645764fc
commit 0ea7beb70f
96 changed files with 10440 additions and 10917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
reset_install.sh
View File

@@ -27,5 +27,5 @@ php install/faker.php
echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n"
php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2
echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n"
echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n"
fi