Commit Graph

1021 Commits

Author SHA1 Message Date
Manuel Raynaud
072dec5cc9 nstall step Please enter the commit message for your changes. Lines starting 2013-09-17 15:43:15 +02:00
Manuel Raynaud
35299dd6be config step 2013-09-17 14:22:32 +02:00
Manuel Raynaud
edd84fb622 icreate install wizard 2013-09-17 12:17:48 +02:00
Manuel Raynaud
eeb9a0f9eb use sqlite database for install process 2013-09-16 20:42:18 +02:00
gmorel
63472b9f80 WIP : install wizard : step 1, 2, 3 2013-09-16 19:00:28 +02:00
gmorel
cfc52c4e7f Working : install wizard : type inference 2013-09-16 18:15:09 +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
b151325e57 WIP : Install wizard : step 2 file permission 2013-09-16 15:07:41 +02:00
Etienne Roudeix
2021ddfc9e feed loop is now countable 2013-09-16 14:42:00 +02:00
mespeche
4929e6f88a Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 12:56:47 +02:00
mespeche
5e8749e054 - Edit country view creation
- Delete and edit modalbox creation
- Countries routes management
2013-09-16 12:55:34 +02:00
franck
dd2ba89a4c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 12:52:59 +02:00
franck
696a2be8ba Completed template management 2013-09-16 12:52:35 +02:00
Manuel Raynaud
c9d0e2b2b3 Merge branch 'master' of github.com:thelia/thelia 2013-09-16 11:47:19 +02:00
Manuel Raynaud
3675428ecc update CartAdd form 2013-09-16 11:47:03 +02:00
gmorel
55890e1498 Merge remote-tracking branch 'origin/master' 2013-09-16 11:26:48 +02:00
gmorel
c49bfa4b25 Working : Coupon : Fix unit tests @todo refactor 2013-09-16 11:26:37 +02:00
Manuel Raynaud
42ade8a45a Merge branch 'master' of github.com:thelia/thelia 2013-09-16 11:12:37 +02:00
mespeche
76dc9609b6 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
2013-09-16 11:01:00 +02:00
mespeche
15d9b55284 Countries view and routing creation 2013-09-16 10:59:30 +02:00
gmorel
b6bc6994fc WIP : Install wizard 2013-09-16 10:53:15 +02:00
Manuel Raynaud
da60359c15 save if producSaleElements is in promo or not 2013-09-16 10:49:42 +02:00
franck
657456109b Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 10:41:22 +02:00
franck
2cf1c62b06 Finished Features management 2013-09-16 10:40:52 +02:00
Manuel Raynaud
365d90b4a8 Merge branch 'master' into template
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-16 10:19:40 +02:00
Manuel Raynaud
2468db3a00 Merge branch 'master' of github.com:thelia/thelia 2013-09-16 10:17:35 +02:00
Manuel Raynaud
5e3c10cd4f add promo column in cart_item 2013-09-16 10:16:54 +02:00
gmorel
970d6b6ff7 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
2013-09-16 10:01:34 +02:00
franck
71c1cee66d Implemented "Remember Me" feature on admin. Started template management 2013-09-16 09:23:44 +02:00
Manuel Raynaud
a4c8df366b dispatch event when default currency change 2013-09-16 09:07:53 +02:00
Manuel Raynaud
6120d4e69d add return statement in clear cache method 2013-09-16 09:02:48 +02:00
Manuel Raynaud
0d0d542d8b create cache for config entity 2013-09-16 08:56:44 +02:00
franck
9cdf1a0376 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-13 20:22:03 +02:00
franck
a0f09057c4 Added Templates events 2013-09-13 20:21:47 +02:00
Manuel Raynaud
7f4a69fcfb allowing adding product to cart 2013-09-13 19:41:12 +02:00
mespeche
8b0c8bd760 First version of installation wizard 2013-09-13 18:03:45 +02:00
gmorel
6118a68370 WIP : Coupon fix coupon creation issue 2013-09-13 18:03:08 +02:00
Manuel Raynaud
86e727c2fb force_return is a global loop parameter and default value is false 2013-09-13 16:32:24 +02:00
Manuel Raynaud
50a5fd166b create smarty attribute for cart 2013-09-13 15:17:43 +02:00
Etienne Roudeix
ac40705c80 Merge branch 'master' into tax 2013-09-13 14:02:39 +02:00
Etienne Roudeix
ecc419fbdf tax engine retriever 2013-09-13 13:59:16 +02:00
gmorel
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00
Manuel Raynaud
ea1ee4932d Merge branch 'master' into template
Conflicts:
	core/lib/Thelia/Controller/Front/AddressController.php
2013-09-13 12:36:56 +02:00
Manuel Raynaud
8367863b48 allow address removal from front 2013-09-13 12:33:13 +02:00
Manuel Raynaud
ddf175f361 allow update customer address in front tempalte 2013-09-13 11:31:12 +02:00
Manuel Raynaud
2d8656e45b allow to create a new address 2013-09-13 10:55:45 +02:00
Manuel Raynaud
275b20ac77 allow to make an address as default on update action 2013-09-13 10:17:45 +02:00
franck
ca7d1f7c85 Finished attributes management 2013-09-13 00:19:53 +02:00
franck
7cd44c3867 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-13 00:16:56 +02:00
franck
6a66a3f99a Fixed duplication parameter check regexp 2013-09-13 00:16:29 +02:00