TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,370 Commits 1 Branch 0 Tags
891ebcd491e560f6937efc96f29e4a1c95c0db5e
Commit Graph

16 Commits

Author SHA1 Message Date
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
gmorel
f10842069c Working : Fixture : Product add default category 2013-09-17 14:15:23 +02:00
Manuel Raynaud
aa4e0636e8 use dump autoloader in all compser scripts 2013-09-16 16:31:13 +02:00
gmorel
49be95a2e7 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
 2013-09-06 19:38:08 +02:00
gmorel
eea29cba06 WIP 
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
 2013-09-05 20:07:17 +02:00
gmorel
0ea7beb70f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# 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
 2013-09-04 16:11:51 +02:00
mespeche
ba645764fc Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh
 2013-09-04 16:05:25 +02:00
mespeche
2cd2c6bc59 Working : Fix script reset 2013-09-04 15:52:16 +02:00
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
 2013-09-04 15:42:38 +02:00
Manuel Raynaud
1496f51c0e refactor reset_install script 2013-09-03 11:14:44 +02:00
gmorel
19ea6d25df WIP 
Merge on master
 2013-09-03 11:02:36 +02:00
Manuel Raynaud
eeea885543 create new smarty function for displaying date in expected format 2013-09-02 23:36:34 +02:00
gmorel
451dc93eb3 Working 
- Fully automatic reset script
 2013-09-02 17:09:14 +02:00
Manuel Raynaud
58484b6c80 add file reset_install.sh 2013-09-02 13:20:26 +02:00
gmorel
059317c266 Working 
- Add reset_instal.sh reseting Model/SQL/DB creation/Insert/Admin creation
Usage :
chmod +x reset_install.sh
./ reset_install.sh
 2013-08-28 16:35:14 +02:00