TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,025 Commits 1 Branch 0 Tags
2f7dcb7f51223fd0bc3fdbc656d99bbbf5a84adc
Commit Graph

43 Commits

Author SHA1 Message Date
Manuel Raynaud
9d794e229d Merge branch 'master' into module_management 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
 2013-10-21 09:19:08 +02:00
Manuel Raynaud
d354ed96ad don't use alternative Logger in debugbar if debug is disabled 2013-10-18 15:59:49 +02:00
Manuel Raynaud
e602884ce0 end module activation 2013-10-18 10:06:42 +02:00
Manuel Raynaud
6d791f5bf7 process module toggle activation 2013-10-17 18:50:00 +02:00
Manuel Raynaud
1b0de7144a end updating module list 2013-10-17 17:20:29 +02:00
Manuel Raynaud
1b865d71a3 crowl all module descriptor file for discovering new modules 2013-10-17 15:36:11 +02:00
Manuel Raynaud
a9d5554b7c create method for validating module file descriptor 2013-10-17 15:06:13 +02:00
Manuel Raynaud
c9dbb610c1 start validating module.xml file 2013-10-17 11:32:29 +02:00
Manuel Raynaud
fc0cac2cb9 fix usage of ProfilerConnectionWrapper 2013-09-30 15:35:46 +02:00
gmorel
b91a11536b Working : Image management set on Category 2013-09-22 20:50:42 +02:00
Etienne Roudeix
61191b9d32 fixes order integration 2013-09-20 16:31:19 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Etienne Roudeix
ec7d4471dc payment process 2013-09-19 15:59:16 +02:00
Etienne Roudeix
66536d0b31 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
 2013-09-18 20:03:13 +02:00
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
Etienne Roudeix
b8c2bdc8df cheque module 2013-09-18 16:23:10 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
Manuel Raynaud
387c0d00c3 test if cache directory exists before launching debug bar 2013-09-18 09:34:48 +02:00
Etienne Roudeix
4e053d1a57 payment plugins 2013-09-18 09:20:03 +02:00
Etienne Roudeix
bb246b3205 fix test 2013-09-18 08:55:12 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
Manuel Raynaud
8122dc3084 Merge branch 'install_wizard' 2013-09-17 16:02:24 +02:00
Etienne Roudeix
84204cbf05 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php
 2013-09-16 15:32:17 +02:00
gmorel
b3df29a788 Merge branch 'master' of https://github.com/thelia/thelia into install_wizard 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (29 commits)
  feed loop is now countable
  Change error page design
  Add validation button on form
  - Edit country view creation - Delete and edit modalbox creation - Countries routes management
  Completed template management
  fix faker
  fix faker script
  Working : Fixture : cleaning
  debugbar log query also use Tlog
  update CartAdd form
  Working : Fixture : cleaning
  Working : Coupon : Fix unit tests @todo refactor
  force charset in sql files
  Countries view and routing creation
  save if producSaleElements is in promo or not
  Finished Features management
  add promo column in cart_item
  dispatch event when default currency change
  add return statement in clear cache method
  create cache for config entity
  ...
 2013-09-16 15:08:09 +02:00
gmorel
bca2b58e41 Merge master 2013-09-16 15:07:58 +02:00
Etienne Roudeix
c7b3aea7f0 cart integration 2013-09-16 14:31:34 +02:00
Manuel Raynaud
8a19b8ec71 fix faker script 2013-09-16 12:15:04 +02:00
Manuel Raynaud
541bd3a4da debugbar log query also use Tlog 2013-09-16 11:59:56 +02:00
Manuel Raynaud
91f5cb12cd Merge branch 'master' into template 2013-09-11 15:28:38 +02:00
Manuel Raynaud
769993cc96 add TimeDataCollector 2013-09-11 15:26:47 +02:00
Manuel Raynaud
1ec9e7486d just add Propel information in phpDebugBar 2013-09-11 15:21:43 +02:00
Manuel Raynaud
ec24586232 add some information in propelcollector 2013-09-11 15:04:47 +02:00
Manuel Raynaud
fe8680ed76 refactor debugBar plugin 2013-09-10 22:15:55 +02:00
Manuel Raynaud
c4bc273ad5 save duration and memory in debugBar 2013-09-10 21:03:48 +02:00
Manuel Raynaud
04ec683021 add PropelDataCollector to debugbar, still missing some informations 2013-09-07 17:37:24 +02:00
Manuel Raynaud
b036f16437 integrate debugbar module 2013-09-07 16:39:52 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
Manuel Raynaud
2dee65727d set good module delivery id in session 2013-09-06 16:12:57 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles 
change composer required PHP version from 5.4 to 5.3
 2013-06-20 15:21:16 +02:00
Manuel Raynaud
1ac5c86afd move Loop Element from Tpex to Template namespace 2013-06-20 10:52:22 +02:00
Manuel Raynaud
20d1655c9d rename plugins to modules 2013-05-16 11:13:09 +02:00