Commit Graph

97 Commits

Author SHA1 Message Date
Manuel Raynaud
9cc3162696 finishing creating lost password template 2013-09-11 17:22:23 +02:00
Manuel Raynaud
ccf35dd37c start creating lost password template 2013-09-11 16:28:26 +02:00
Manuel Raynaud
b03eb969ca add logo for beta version 2013-09-11 16:18:58 +02:00
Manuel Raynaud
755bf40b56 change metadata for product part 2013-09-11 16:05:05 +02:00
Manuel Raynaud
c1edc0e4ff update phpdebugbar dependency 2013-09-11 15:48:55 +02:00
Manuel Raynaud
858cc7f4f2 validate customer creation form 2013-09-11 14:32:57 +02:00
Manuel Raynaud
e1d48d2a28 finish registration form 2013-09-11 12:30:05 +02:00
Manuel Raynaud
3582ae4cf9 save register template 2013-09-11 08:51:34 +02:00
Manuel Raynaud
65a20381d9 Merge branch 'master' into template 2013-09-11 08:47:26 +02:00
Manuel Raynaud
8fa3ed287b Merge branch 'master' of github.com:thelia/thelia 2013-09-11 08:16:39 +02:00
Manuel Raynaud
fe8680ed76 refactor debugBar plugin 2013-09-10 22:15:55 +02:00
Manuel Raynaud
672b489418 Merge branch 'master' into template
Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html
2013-09-10 17:09:22 +02:00
Manuel Raynaud
66d6f86b9a replace <i> tag by <span> for displaying icons 2013-09-10 17:07:20 +02:00
Manuel Raynaud
5ab3d4fb88 replace smarty variable identifier by $ 2013-09-10 16:54:13 +02:00
Manuel Raynaud
3c67903bd7 add part of customer form in customer admin template 2013-09-10 15:46:19 +02:00
Manuel Raynaud
79e40013e2 updating customer form 2013-09-10 14:50:51 +02:00
Manuel Raynaud
9ef1b17ea5 strat regiter page 2013-09-10 12:22:35 +02:00
Manuel Raynaud
7eb3ec41fe complete login form 2013-09-10 12:16:19 +02:00
Manuel Raynaud
71928ec879 change link for homepage 2013-09-10 08:14:07 +02:00
Manuel Raynaud
f5e7467c86 start creating register and login pages 2013-09-09 21:40:58 +02:00
Manuel Raynaud
1bf2d02477 display good currency in template 2013-09-09 21:17:01 +02:00
Manuel Raynaud
bf46a937c0 defin currency at runtime 2013-09-09 21:00:28 +02:00
Manuel Raynaud
82602622e3 creating index page 2013-09-09 19:23:35 +02:00
Manuel Raynaud
02d758ae9a start integration default template 2013-09-09 17:30:18 +02:00
Manuel Raynaud
1e660cd930 Merge branch 'delivery'
Conflicts:
	composer.lock
	install/insert.sql
2013-09-07 16:37:54 +02:00
Manuel Raynaud
ed468ccb67 Merge branch 'master' into debugbar 2013-09-07 16:31:29 +02:00
Manuel Raynaud
5315e13ce9 add new event and new tag 2013-09-07 16:31:15 +02:00
Manuel Raynaud
0aad4baf26 create controller adding delivery module in session 2013-09-06 19:29:19 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
Etienne Roudeix
b6a216fd9b substitutions : product category folder content 2013-09-06 12:21:36 +02:00
Etienne Roudeix
a0f894d70f customer substitutions 2013-09-05 17:54:04 +02:00
Manuel Raynaud
40b524e9d6 add label_attr attribute to form smarty plugin 2013-09-05 14:22:28 +02:00
Manuel Raynaud
3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
2013-09-04 17:57:41 +02:00
Manuel Raynaud
ceb02841e1 validate create and update address in front context 2013-09-04 17:52:58 +02:00
Etienne Roudeix
e1965a5145 global outputs in loops 2013-09-04 14:45:14 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +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
e63ff065c7 product page 2013-08-30 15:04:08 +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
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
96b3de7c84 backend trasnlation in loops 2013-08-26 12:38:23 +02:00
Etienne Roudeix
2d810540ec loop review 2013-08-23 12:37:18 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +02:00
Etienne Roudeix
9dbd8a283b pse and combi loops 2013-08-21 12:50:49 +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
Etienne Roudeix
731a406d1c new product loop 2013-08-20 15:32:13 +02:00