TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,369 Commits 1 Branch 0 Tags
387c0d00c30b1d0f8e8a62f115ae3d8e52d5d39d
Commit Graph

1081 Commits

Author SHA1 Message Date
Etienne Roudeix
233c952b4e Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-17 12:44:34 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
Manuel Raynaud
edd84fb622 icreate install wizard 2013-09-17 12:17:48 +02:00
gmorel
67060c6367 Working : Updating model schema.xml 2013-09-17 11:56:46 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
franck
bff08dd581 Typo 2013-09-16 22:35:29 +02:00
franck
4721b6c1de Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 22:32:22 +02:00
franck
7858e809b7 Added UrlRewritingTrait to manage URLs from model classes 2013-09-16 22:31:55 +02:00
Manuel Raynaud
eeb9a0f9eb use sqlite database for install process 2013-09-16 20:42:18 +02:00
Manuel Raynaud
7a8dea28a6 fix typo 2013-09-16 19:08:01 +02:00
gmorel
63472b9f80 WIP : install wizard : step 1, 2, 3 2013-09-16 19:00:28 +02:00
franck
e473c64588 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 18:59:18 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +02:00
Etienne Roudeix
afa9a46abf order delivery form 2013-09-16 18:55:29 +02:00
Manuel Raynaud
67b6e5f07d add some php doc 2013-09-16 18:21:07 +02:00
Manuel Raynaud
874c5f6cac integrate swiftMailer as mailer solution 2013-09-16 18:20:15 +02:00
gmorel
cfc52c4e7f Working : install wizard : type inference 2013-09-16 18:15:09 +02:00
Etienne Roudeix
361e9e1126 delivery process 2013-09-16 16:12:04 +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
Etienne Roudeix
5399e08490 Merge branch 'master' of github.com:thelia/thelia 2013-09-16 15:31:07 +02:00
Etienne Roudeix
5ca7136e6d default country 2013-09-16 15:30:46 +02:00
Etienne Roudeix
d8b5df4162 delivery process 2013-09-16 15:24:08 +02:00
mespeche
798e5e94a5 Beautiful login page 2013-09-16 15:14:26 +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
Etienne Roudeix
c7b3aea7f0 cart integration 2013-09-16 14:31:34 +02:00
Etienne Roudeix
e0a48df23e cart integration 2013-09-16 13:15:35 +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
Etienne Roudeix
2857d0621c cart page 2013-09-16 11:14:23 +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