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

58 Commits

Author SHA1 Message Date
Etienne Roudeix
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
franck
aa6fe04eec Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
 2013-07-09 11:45:01 +02:00
franck
dd05888450 Added Auth loop 2013-07-09 11:42:25 +02:00
Manuel Raynaud
07b64d7429 return $this on setPassword 2013-07-08 14:49:00 +02:00
franck
abdff9bc1a Merge branch 'admin' 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
 2013-07-08 11:27:37 +02:00
franck
d3a505906b Added missing MAP directory 2013-07-06 11:00:33 +02:00
franck
162084140e Merge remote-tracking branch 'origin/master' into admin 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
 2013-07-06 10:34:09 +02:00
franck
6e5b259d44 Added Feed loop to retreive feeds using SimplePie 2013-07-06 10:18:19 +02:00
Etienne Roudeix
ddc6d02f80 Merge branch 'loops' 2013-07-05 17:16:10 +02:00
Manuel Raynaud
85bb7594ee change compatibility for propel2 2013-07-05 15:59:41 +02:00
Etienne Roudeix
f003312f82 Merge branch 'master' into loops 2013-07-05 11:55:23 +02:00
Manuel Raynaud
9ed14bf7a3 change default locale to en_US 2013-07-05 11:21:31 +02:00
Etienne Roudeix
55a309c00a Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
 2013-07-05 11:16:55 +02:00
Manuel Raynaud
5fbb923e40 end propel 2 migration 2013-07-05 09:43:49 +02:00
Manuel Raynaud
715e7ac294 Merge branch 'customer' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
 2013-07-04 19:46:08 +02:00
Manuel Raynaud
5fda702b8d migrte propel to propel 2 2013-07-04 19:31:09 +02:00
Manuel Raynaud
ca44544f84 manage lang for customer 2013-07-04 18:21:24 +02:00
Manuel Raynaud
0d1e0c6a2c fiw typo in schema model 2013-07-03 15:05:08 +02:00
Etienne Roudeix
b4a2862131 product loop 2013-07-03 13:20:55 +02:00
Manuel Raynaud
8b8ea994ef allow to reuse creation customer method for modification. Password is 
not mandatory
 2013-07-03 10:33:25 +02:00
Manuel Raynaud
42c41d4de1 add some phpdoc 2013-07-03 09:54:17 +02:00
Etienne Roudeix
32f1fb3441 Merge branch 'admin' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	templates/smarty-sample/category.html
 2013-07-03 09:52:06 +02:00
franck
18e49e7ebe Introduction of loop scopes. 2013-07-02 19:18:41 +02:00
Manuel Raynaud
dcb3baaf4c change text name event by using TheliaEvents constant 2013-07-02 17:26:41 +02:00
Manuel Raynaud
09e8cb4a98 change return in customer::preInsert model 2013-07-02 17:23:45 +02:00
Manuel Raynaud
1128c10fa8 fix typo 2013-07-02 17:22:54 +02:00
Manuel Raynaud
aa2ebdc56c allow to change programmatically customer ref using event dispatcher 2013-07-02 17:18:10 +02:00
Etienne Roudeix
40c0da5553 loop product 2013-07-02 16:33:43 +02:00
Manuel Raynaud
363e0ab8ae fiw non saving customer title 2013-07-02 15:00:34 +02:00
Manuel Raynaud
33aba6b3d5 add missing field to customerCreation field 2013-07-02 14:35:18 +02:00
Manuel Raynaud
e15c53625e complete CustomerCreation form 2013-07-02 11:48:34 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles 
change composer required PHP version from 5.4 to 5.3
 2013-06-20 15:21:16 +02:00
Manuel Raynaud
78dd8514d1 add all substitution for loop category 2013-05-06 15:22:33 +02:00
Manuel Raynaud
7d766c68ff delete table before inserting faker data 2013-04-30 14:56:23 +02:00
Manuel Raynaud
5b4daf0659 create a faker for adding some fixtures 2013-04-30 14:12:52 +02:00
Manuel Raynaud
879a2e09a8 start to create config process for Thelia 2013-03-28 16:43:01 +01:00
Manuel Raynaud
2154bbc1ed update propel schema fixing some typos 2013-03-27 15:48:18 +01:00
Manuel Raynaud
4764118f3a update propel in V.1.6.8 2013-02-18 14:39:45 +01:00
Manuel Raynaud
96f5e2e9cf initialize session process 
session by default are save in local/session
 2013-02-11 12:44:52 +01:00
Manuel Raynaud
ccee45c48a move auto generate documentation to documentation/api folder 
start to create a new file for insertion in database
add locale column to lang table
 2013-02-11 10:59:31 +01:00
Manuel Raynaud
9a7e33078b use propel versionnable behavior 2013-01-30 17:29:17 +01:00
Manuel Raynaud
4a199173f0 use i18n propel behavior instead of manual model for traduction 2013-01-30 14:49:53 +01:00
Manuel Raynaud
efe364dfc0 regenerate propel model and change TlogDescrionationConfig 2013-01-29 16:46:34 +01:00
Manuel Raynaud
c72c13551c add Propel generated files 2013-01-16 10:58:36 +01:00
Manuel Raynaud
8279cc37b4 remove notnorm gen model 2013-01-15 10:39:16 +01:00
Manuel Raynaud
2bbbd74ea4 change place for some properties in Config model 2013-01-10 16:51:37 +01:00
Manuel Raynaud
dc8984b306 remove _get and _set magic method on Base model 2013-01-10 16:49:47 +01:00
Manuel Raynaud
673d8b13da reimplemeting parsing return query 2013-01-10 11:25:29 +01:00
Manuel Raynaud
eede41048a add sql file 2013-01-10 10:23:32 +01:00
Manuel Raynaud
c5bed85462 create first method for CRUD 2013-01-09 17:23:46 +01:00