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

98 Commits

Author SHA1 Message Date
Manuel Raynaud
43a2c0ac7b refactor Lang table 2013-09-05 08:30:15 +02:00
Manuel Raynaud
0efe393e3c Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
 2013-09-04 10:50:13 +02:00
Etienne Roudeix
dffbf76cfd Merge branch 'master' into rewrite 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql
 2013-09-04 10:06:22 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
 2013-09-03 19:03:27 +02:00
Manuel Raynaud
483710afd2 update address model 2013-09-03 14:01:07 +02:00
franck
69f88db090 en_EN -> en_UK, the "en_EN" locale does not exists. 2013-09-03 11:32:13 +02:00
Manuel Raynaud
cf53e45ef0 remove sqlmap file 2013-09-03 07:57:14 +02:00
Manuel Raynaud
eeea885543 create new smarty function for displaying date in expected format 2013-09-02 23:36:34 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/default/login.html
 2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
Etienne Roudeix
2d370bf9b8 rewriting tables 2013-08-28 15:48:19 +02:00
Etienne Roudeix
1de0e9f8a4 rewriting tables 2013-08-28 15:47:47 +02:00
Etienne Roudeix
61e13c416c rewriting tables 2013-08-28 15:35:10 +02:00
Etienne Roudeix
f8dfa64059 load test 2013-08-26 16:38:56 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
27f6612c32 associated content loop test 2013-08-23 10:58:10 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +02:00
Etienne Roudeix
7ef0339784 associated content for categories and products tables 2013-08-22 17:54:19 +02:00
Etienne Roudeix
2e6cbe637a working on loop translation 2013-08-21 16:32:48 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
Etienne Roudeix
6a14bef3de feature product loop + improve faker 2013-08-20 17:59:22 +02:00
Manuel Raynaud
ca954a3b81 fix insert.sql syntax and downgrade propel version for validator 
compatibility
 2013-08-16 11:45:03 +02:00
franck
87d3a4583b Faker generates images with Imagine instead of using placeholder.it 2013-08-16 09:46:51 +02:00
franck
f028d2b2db Added image-cache:clear console command 2013-08-15 21:18:16 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00
franck
e2083d4cbf Typo: fixed ProdutImage -> ProductImage 2013-08-15 11:10:32 +02:00
Etienne Roudeix
70f483ad97 availability instead of available 2013-08-14 14:02:14 +02:00
Etienne Roudeix
c9485075d4 new faker entries 
new category view
 2013-08-13 11:40:24 +02:00
Etienne Roudeix
2fa19d5ae5 new image and document management 2013-08-12 14:42:20 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00
Manuel Raynaud
7e5c296fb2 Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-08-08 10:11:22 +02:00
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00
Manuel Raynaud
3c87fa8bd0 Merge branch 'master' into cart 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php
 2013-08-07 10:23:44 +02:00
Manuel Raynaud
3fbb72b36c complete INTALL-TODO 2013-08-07 10:20:04 +02:00
Manuel Raynaud
b18a09b94b allow token to be null in cart table 2013-08-06 11:53:30 +02:00
Manuel Raynaud
c97f0e462a regenerate modeland sql fixing typo in CartItem table 2013-08-06 09:57:14 +02:00
Manuel Raynaud
33933a63cb update sql creation 2013-08-06 09:53:15 +02:00
Etienne Roudeix
5c4bba4ce9 feature and feature_av in faker 2013-08-02 16:26:30 +02:00
Etienne Roudeix
fd82907209 folder and content fake 
folder and content loops
 2013-08-02 16:18:45 +02:00
Etienne Roudeix
a117750ca8 Merge branch 'cart' into loops 2013-08-02 15:37:44 +02:00
Etienne Roudeix
aac1533e65 change faker 2013-08-02 15:35:06 +02:00
Manuel Raynaud
fe850718cc update schema, changin some relations between tables 2013-08-02 12:40:51 +02:00
Manuel Raynaud
8f46c57d72 update faker script 2013-08-01 11:53:40 +02:00