Etienne Roudeix
|
ee6a2a645f
|
Merge branch 'master' of github.com:thelia/thelia
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
|
2013-07-26 15:45:26 +02:00 |
|
Etienne Roudeix
|
caf3a91ac6
|
address loop
title loop
|
2013-07-26 15:41:46 +02:00 |
|
Etienne Roudeix
|
9e663145b0
|
customer loop
|
2013-07-26 10:04:35 +02:00 |
|
franck
|
f7a635dbf7
|
Added DataAccess plugin, admin header completed
|
2013-07-25 22:59:46 +02:00 |
|
franck
|
182b13ceca
|
In an Action, errored forms are propagated via the ActionEvent
|
2013-07-24 20:08:00 +02:00 |
|
franck
|
94ee77f4f8
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-07-24 17:38:54 +02:00 |
|
franck
|
fabeab1822
|
An errorred form is now passed to the Form smarty plugin through the parser context instead of the
session
|
2013-07-24 17:31:20 +02:00 |
|
Etienne Roudeix
|
59f5b102c6
|
Merge branch 'master' into loops
|
2013-07-23 10:44:41 +02:00 |
|
Etienne Roudeix
|
c28ac536aa
|
accessory loop
product loop
order fix
|
2013-07-19 13:59:25 +02:00 |
|
franck
|
8296051937
|
Implemented front-office login
|
2013-07-17 18:49:23 +02:00 |
|
franck
|
3d5caa2341
|
Fix source header alignment
|
2013-07-17 15:06:53 +02:00 |
|
franck
|
21068f4c1f
|
Added UrlGenerator smarty plugin, to allow templates and url
manipulation in templates.
|
2013-07-17 11:36:28 +02:00 |
|
franck
|
e8bf47b929
|
Refactored Form system to get simple error handling and a clearer
interface
|
2013-07-16 16:34:47 +02:00 |
|
franck
|
75573b3652
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-07-12 14:22:58 +02:00 |
|
franck
|
385a83f896
|
Finalized admin security
|
2013-07-12 14:22:08 +02:00 |
|
Manuel Raynaud
|
2d13a28fbf
|
create command for generating sql from mosule schema
|
2013-07-11 17:06:12 +02:00 |
|
Manuel Raynaud
|
98589cc2b6
|
generate Model using Propel command in Thelia app
|
2013-07-11 16:44:18 +02:00 |
|
Manuel Raynaud
|
945a97ae78
|
initialize module part
|
2013-07-11 10:28:58 +02:00 |
|
franck
|
dd05888450
|
Added Auth loop
|
2013-07-09 11:42:25 +02:00 |
|
franck
|
2b0fdc670b
|
Merge
|
2013-07-08 13:25:08 +02:00 |
|
franck
|
6890482101
|
Working on security
|
2013-07-08 13:22:11 +02:00 |
|
franck
|
5bec576b9b
|
Integration of security
|
2013-07-08 13:20:44 +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 |
|
Manuel Raynaud
|
0b9d7d1d35
|
allow possibility to change PropelPDO class connection
|
2013-07-08 10:44:57 +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
|
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
|
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 |
|
Etienne Roudeix
|
3073f9a43c
|
fix thelia diese problems
|
2013-07-03 16:07:18 +02:00 |
|
Manuel Raynaud
|
bc6545e914
|
create class form for customer modification
|
2013-07-03 14:38:06 +02:00 |
|
Etienne Roudeix
|
40c0da5553
|
loop product
|
2013-07-02 16:33:43 +02:00 |
|
Manuel Raynaud
|
762b5bc71c
|
name all form field
|
2013-07-01 11:54:40 +02:00 |
|
Manuel Raynaud
|
200ace2fc0
|
add 404 rule in admin
|
2013-06-26 10:45:43 +02:00 |
|
Manuel Raynaud
|
8dd43d6779
|
add form_error block
|
2013-06-25 16:54:42 +02:00 |
|
Manuel Raynaud
|
f699686d13
|
create first class form and adapt config for injecting form process in
Smarty
|
2013-06-24 10:34:34 +02:00 |
|
Manuel Raynaud
|
e801717f0d
|
allow to activate debugging into Smarty
|
2013-06-21 10:48:57 +02:00 |
|
Manuel Raynaud
|
299c20c885
|
Merge branch 'admin' of github.com:thelia/thelia into admin
|
2013-06-21 10:37:32 +02:00 |
|
Manuel Raynaud
|
eff5529e1b
|
change smarty cache and compile directory
|
2013-06-21 10:37:08 +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
|
e2706515eb
|
refactor baseAdminController
|
2013-06-20 12:21:58 +02:00 |
|
Manuel Raynaud
|
617a814f0f
|
Merge branch 'admin' of github.com:thelia/thelia into admin
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
|
2013-06-19 17:18:00 +02:00 |
|
Manuel Raynaud
|
c5f73f441f
|
remove Tpex in config file
|
2013-06-19 17:17:01 +02:00 |
|
franck
|
391296d291
|
Beginning integration of template directives. Config xsd changed.
|
2013-06-19 17:12:32 +02:00 |
|
franck
|
cff9d3cb96
|
Added ThekliaLoop smarty plugin, and reorganized code a bit
|
2013-06-19 16:03:28 +02:00 |
|
franck
|
9e95f034ec
|
Removed AdminSmartyParser, to use directly SmartyParser
|
2013-06-19 11:52:55 +02:00 |
|
franck
|
2eca5464b7
|
Merge branch 'smarty' into admin
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
core/lib/Thelia/Core/EventListener/ViewListener.php
core/lib/Thelia/Core/Template/SmartyParser.php
templates/smarty-sample/index.html
|
2013-06-19 11:20:41 +02:00 |
|
franck
|
89abfaad48
|
Integration of Assetic in SmartyParser, extended it to Admin (we can now
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
|
2013-06-19 02:07:43 +02:00 |
|
Manuel Raynaud
|
dfafe36730
|
poc integrate smarty in DI
|
2013-06-18 23:32:47 +02:00 |
|
franck
|
797f0e2e38
|
Testing smarty parser
|
2013-06-18 15:31:32 +02:00 |
|