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

194 Commits

Author SHA1 Message Date
Manuel Raynaud
f2acbed9d6 Merge branch 'master' of github.com:thelia/thelia 2013-09-18 21:12:12 +02:00
Manuel Raynaud
0002eff88d remove unused comment code 2013-09-18 20:27:45 +02:00
Manuel Raynaud
4be96d1c60 refactor category position and product_category assignment 2013-09-18 20:26:36 +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
Manuel Raynaud
2e32166118 remove some var_dump 2013-09-18 19:47:02 +02:00
Manuel Raynaud
f3367aed45 finish import 2013-09-18 19:33:29 +02:00
Manuel Raynaud
79a20cdec0 import product and images 2013-09-18 18:35:33 +02:00
Manuel Raynaud
3a323e7531 import brand successfully 2013-09-18 17:27:31 +02:00
Manuel Raynaud
a16b90f9ce import colors attributes 2013-09-18 17:18:13 +02:00
Manuel Raynaud
55097ca6f5 import categories done 2013-09-18 17:07:56 +02:00
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
Manuel Raynaud
71cbe984a2 impmort product's images 2013-09-18 16:54:45 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
 2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Model/Product.php
 2013-09-17 23:51:31 +02:00
Etienne Roudeix
294c48f8ab fix content faker 2013-09-17 20:32:51 +02:00
Manuel Raynaud
e1e383707b template is not mandatory in product table. 2013-09-17 19:19:52 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Etienne Roudeix
ddbced036f Merge branch 'master' of github.com:thelia/thelia 2013-09-17 15:02:38 +02:00
gmorel
654caf4c6e Working : Content : add faker default folder 2013-09-17 15:01:58 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
gmorel
63b3e0c3da Working : Product : add faker default category 2013-09-17 14:46:46 +02:00
gmorel
df6b3dbcd5 Merge branch 'master' of https://github.com/thelia/thelia 
# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
 2013-09-17 14:42:06 +02:00
gmorel
5509f08df8 Merge branch 'master' of https://github.com/thelia/thelia 
# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
 2013-09-17 14:40:28 +02:00
gmorel
f10842069c Working : Fixture : Product add default category 2013-09-17 14:15:23 +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
2bebb5697a Working : Fixture : fix coupon table not cleaned 2013-09-17 12:24:20 +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
Etienne Roudeix
bf3bc02f8b fix fixture dependant unit test 2013-09-16 16:46:12 +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
5ca7136e6d default country 2013-09-16 15:30:46 +02:00
Etienne Roudeix
d8b5df4162 delivery process 2013-09-16 15:24:08 +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
d68e1f3d4f Working : Fixture : cleaning 2013-09-16 12:03:22 +02:00
gmorel
f53c59bffc Working : Fixture : cleaning 2013-09-16 11:35:21 +02:00
Manuel Raynaud
77c0dd73d6 force charset in sql files 2013-09-16 11:10:25 +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
gmorel
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00