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

275 Commits

Author SHA1 Message Date
gmorel
ced7b5e6dc WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields 2013-09-20 16:51:34 +02:00
gmorel
3627d96175 WIP : Upload management 2013-09-18 10:07:57 +02:00
franck
ecf4412fbd Changed getDefaultCategory in getDefaultCategoryId 2013-09-17 18:38:49 +02:00
franck
c8baa38fed Added missing files... 2013-09-17 17:31:22 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Manuel Raynaud
8122dc3084 Merge branch 'install_wizard' 2013-09-17 16:02:24 +02:00
Manuel Raynaud
072dec5cc9 nstall step Please enter the commit message for your changes. Lines starting 2013-09-17 15:43:15 +02:00
franck
13265182c2 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 13:50:23 +02:00
franck
3d78af8b97 Finished category related content management 2013-09-17 13:50:01 +02:00
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
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
7858e809b7 Added UrlRewritingTrait to manage URLs from model classes 2013-09-16 22:31:55 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +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
5ca7136e6d default country 2013-09-16 15:30:46 +02:00
Etienne Roudeix
e0a48df23e cart integration 2013-09-16 13:15:35 +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
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
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
gmorel
6118a68370 WIP : Coupon fix coupon creation issue 2013-09-13 18:03:08 +02:00
Manuel Raynaud
50a5fd166b create smarty attribute for cart 2013-09-13 15:17:43 +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
Manuel Raynaud
bad8a0439d fix test suite 2013-09-12 17:28:02 +02:00
Manuel Raynaud
22f42c8d9c don't delete address if this is address is a default one 2013-09-12 16:21:01 +02:00
Manuel Raynaud
b9338a7717 Merge branch 'master' of github.com:thelia/thelia 2013-09-12 15:44:29 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template' 
Conflicts:
	templates/admin/default/customer-edit.html
 2013-09-12 15:44:23 +02:00
franck
8ad0dc7b21 AttributesAv management 2013-09-12 15:43:37 +02:00
Manuel Raynaud
c9e455e3ea update cart model 2013-09-12 15:40:49 +02:00
franck
14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl
 2013-09-12 13:04:12 +02:00
franck
c85ec2a9e3 Created AbstractCrudController, and refactored existing controllers 2013-09-12 13:02:40 +02:00
Manuel Raynaud
9856528a94 valid customer removal 2013-09-12 12:40:14 +02:00
Etienne Roudeix
d5004071c9 pse ref 2013-09-12 11:56:00 +02:00
Manuel Raynaud
6b9db1a162 create test for customer creation 2013-09-12 09:23:50 +02:00
Manuel Raynaud
9304624708 fix title name in insert.sql file 2013-09-12 08:12:44 +02:00
Etienne Roudeix
ca16aa251e Merge branch 'master' into tax 2013-09-11 20:19:10 +02:00
Etienne Roudeix
fa5c1aaefc tax engine 2013-09-11 19:01:23 +02:00