Commit Graph

1274 Commits

Author SHA1 Message Date
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
bca2b58e41 Merge master 2013-09-16 15:07:58 +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
64bd7e1786 Change error page design 2013-09-16 13:14:37 +02:00
mespeche
dc807c4df8 Add validation button on form 2013-09-16 13:02:57 +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
8d2fab911c fix faker 2013-09-16 12:41:19 +02:00
Manuel Raynaud
ae08f448cc Merge branch 'master' of github.com:thelia/thelia 2013-09-16 12:15:26 +02:00
Manuel Raynaud
8a19b8ec71 fix faker script 2013-09-16 12:15:04 +02:00
gmorel
5a2ca00ec9 Merge remote-tracking branch 'origin/master' 2013-09-16 12:03:31 +02:00
gmorel
d68e1f3d4f Working : Fixture : cleaning 2013-09-16 12:03:22 +02:00
Manuel Raynaud
541bd3a4da debugbar log query also use Tlog 2013-09-16 11:59:56 +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
f53c59bffc Working : Fixture : cleaning 2013-09-16 11:35:21 +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
Manuel Raynaud
77c0dd73d6 force charset in sql files 2013-09-16 11:10:25 +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
d4d876c783 Working : .gitignore phpmyadmin (vm) 2013-09-16 10:09:34 +02:00
gmorel
18f5f698e3 Merge branch 'coupon' of https://github.com/thelia/thelia
* 'coupon' of https://github.com/thelia/thelia:
  WIP : Coupon fix coupon creation issue
  WIP : Coupon fix coupon creation issue
  Working : bootstrap datepicker commented out to keep style for jquery.datepicker (Mika)
  Working : Coupon : fix links and errors display
  Working : Default lang in US, asset not processed by default
  Working : Coupon - update loop
  Working : Coupon Controller refactor
  Working : Coupon Controller refactor
  Working : Base controller now get type inference of Thelia2 Session component
  WIP : Coupon event dispatcher + action
  Working : Adding type inference to the Thelia2 Request->getSession()
  WIP : Coupon Adapter methods implementation
  WIP : Coupon event dispatcher + action
  Working - Coupon Add/Edit/Delete rule AJAX
  Working - Coupon Add/Edit/Delete rule AJAX
  WIP - Coupon Add/Edit/Delete rule AJAX
  Working - CasperJS : coupon rule
2013-09-16 10:04:56 +02:00
gmorel
5dcecb90f2 Merge branch 'master' of https://github.com/thelia/thelia
# By Manuel Raynaud (18) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (45 commits)
  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
  fix test suite
  fix current url bug + fix empty loop pagination exception
  add accessDenied method
  add helper checkXmlHttpRequest
  don't delete address if this is address is a default one
  AttributesAv management
  update cart model
  ...
2013-09-16 10:04:03 +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
gmorel
775fd09d7c WIP : Coupon fix coupon creation issue 2013-09-16 10:01:02 +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
Manuel Raynaud
df569d1071 save current work 2013-09-13 18:30:02 +02:00
Manuel Raynaud
4218fb8259 undo last commit 2013-09-13 18:21:41 +02:00