Commit Graph

9 Commits

Author SHA1 Message Date
Manuel Raynaud
54242eef43 clear cache at end process 2013-10-24 08:54:20 +02:00
Manuel Raynaud
3f7300bdee add some control for knwoing if user is in install mode 2013-10-24 08:31:49 +02:00
gmorel
b91a11536b Working : Image management set on Category 2013-09-22 20:50:42 +02:00
mespeche
72c0685bfa Setting of tinymce and filemanager 2013-09-18 18:00:44 +02:00
mespeche
742b90b24c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-18 11:55:04 +02:00
mespeche
c7a6fe060f - Setting dashboard view with jqplot plugin 2013-09-18 11:53:39 +02:00
Manuel Raynaud
387c0d00c3 test if cache directory exists before launching debug bar 2013-09-18 09:34:48 +02:00
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
2013-09-08 00:08:02 +02:00
mespeche
e5f8f65f77 WIP
Suite de mise en place de la page d'édition des coupons avec miniBrowser
2013-08-30 15:47:13 +02:00