Etienne Roudeix
|
a02ac99360
|
set x right to 7
|
2013-07-09 11:59:37 +02:00 |
|
franck
|
dd05888450
|
Added Auth loop
|
2013-07-09 11:42:25 +02:00 |
|
franck
|
a91d0e4c78
|
Fixed method name
|
2013-07-08 13:39:37 +02:00 |
|
franck
|
6890482101
|
Working on security
|
2013-07-08 13:22:11 +02:00 |
|
franck
|
58796033fa
|
Integration of auth system
|
2013-07-08 13:19:36 +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
|
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 |
|
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 |
|
franck
|
18e49e7ebe
|
Introduction of loop scopes.
|
2013-07-02 19:18:41 +02:00 |
|
franck
|
b20c44b12b
|
Merge branch 'admin' of https://github.com/thelia/thelia into admin
|
2013-07-02 15:54:24 +02:00 |
|
franck
|
97f948e647
|
Added security
|
2013-07-02 15:49:29 +02:00 |
|
Manuel Raynaud
|
3b5b29c6e0
|
retrieve form error in front office
|
2013-07-01 11:10:52 +02:00 |
|
Manuel Raynaud
|
6809c5ba1c
|
reimplement form already created
|
2013-06-28 11:45:54 +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
|
21280569e6
|
add AdminLogin file
|
2013-06-25 14:47:01 +02:00 |
|
Manuel Raynaud
|
7bc1b4f513
|
integrate form into admin part
|
2013-06-25 14:30:35 +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
|
686cb0bff1
|
fix somme phpdoc and remove unused namespace
|
2013-06-20 14:05:01 +02:00 |
|
Manuel Raynaud
|
e2706515eb
|
refactor baseAdminController
|
2013-06-20 12:21:58 +02:00 |
|
Manuel Raynaud
|
e816595535
|
fix typo
|
2013-06-19 12:19:26 +02:00 |
|
franck
|
9e95f034ec
|
Removed AdminSmartyParser, to use directly SmartyParser
|
2013-06-19 11:52:55 +02:00 |
|
franck
|
8244efdb1d
|
Cleanup
|
2013-06-19 10:33:29 +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 |
|
franck
|
0719c8b740
|
Merge branch 'admin' of https://github.com/thelia/thelia into admin
Conflicts:
core/lib/Thelia/Admin/Templating/Template.class.php
|
2013-06-18 15:35:36 +02:00 |
|
franck
|
797f0e2e38
|
Testing smarty parser
|
2013-06-18 15:31:32 +02:00 |
|
Manuel Raynaud
|
fa69e6e7f0
|
change rule in .htaccess and fix link for asset
|
2013-06-18 12:24:45 +02:00 |
|
franck
|
9d8c07775b
|
Integration de assetic
|
2013-06-17 15:36:05 +02:00 |
|
franck
|
088f5a3402
|
Intégration de Assetic
|
2013-06-17 15:29:13 +02:00 |
|
franck
|
3bc7399fe8
|
added admin template
|
2013-06-10 17:03:02 +02:00 |
|
franck
|
a86122e90d
|
fix admin template location
|
2013-06-10 17:01:04 +02:00 |
|
franck
|
a84205f5ce
|
track admin ârt
|
2013-06-10 16:42:08 +02:00 |
|