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
|
f05331da1a
|
category link last stand
|
2013-07-24 14:51:36 +02:00 |
|
Etienne Roudeix
|
a1d5e275dd
|
Merge branch 'master' into loops
|
2013-07-24 11:33:38 +02:00 |
|
Etienne Roudeix
|
cf0d8b6f4e
|
loop fixe
|
2013-07-24 11:32:32 +02:00 |
|
Manuel Raynaud
|
7498c97f49
|
missing use statement
|
2013-07-23 16:18:02 +02:00 |
|
Etienne Roudeix
|
59f5b102c6
|
Merge branch 'master' into loops
|
2013-07-23 10:44:41 +02:00 |
|
Etienne Roudeix
|
0e9d918b84
|
product loop : given id exception
|
2013-07-22 09:36:06 +02:00 |
|
Etienne Roudeix
|
87dd416a1e
|
accessory loop
|
2013-07-19 14:12:13 +02:00 |
|
Etienne Roudeix
|
c28ac536aa
|
accessory loop
product loop
order fix
|
2013-07-19 13:59:25 +02:00 |
|
franck
|
9a1ee565de
|
changed role names to XXXX instead of ROLE_XXXX
|
2013-07-18 13:01:33 +02:00 |
|
franck
|
2c52df1034
|
Added title_id column in customer table
|
2013-07-18 09:40:21 +02:00 |
|
franck
|
b177367893
|
Capitalized template variables (index_page -> INDEX_PAGE)
|
2013-07-18 09:32:50 +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
|
466b402246
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-07-17 11:37:01 +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
|
0dfee8331b
|
Added an output filter to remove blank lines from generated HTML
|
2013-07-17 11:34:48 +02:00 |
|
Manuel Raynaud
|
a84e63e457
|
verify if file template really exists
|
2013-07-17 10:35:16 +02:00 |
|
Etienne Roudeix
|
56719a4c46
|
product loop : feature_values param + fix feature_av
|
2013-07-16 16:57:33 +02:00 |
|
franck
|
e8bf47b929
|
Refactored Form system to get simple error handling and a clearer
interface
|
2013-07-16 16:34:47 +02:00 |
|
Etienne Roudeix
|
4ddc7f12b1
|
loops
|
2013-07-15 11:21:25 +02:00 |
|
franck
|
f6cb119616
|
Initiated translation system
|
2013-07-12 14:24:55 +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 |
|
Etienne Roudeix
|
028a5d124e
|
unit tests
|
2013-07-11 16:25:03 +02:00 |
|
Etienne Roudeix
|
ba373e3fa1
|
Merge branch 'master' into loops
|
2013-07-11 11:27:21 +02:00 |
|
Etienne Roudeix
|
26b1806156
|
x right to 7
feature filter in product loop
|
2013-07-11 11:25:47 +02:00 |
|
Etienne Roudeix
|
ab7a9b3cd8
|
features in product loop
|
2013-07-10 16:59:34 +02:00 |
|
Etienne Roudeix
|
74f205831c
|
prod feature loop
|
2013-07-09 17:15:47 +02:00 |
|
Etienne Roudeix
|
a02ac99360
|
set x right to 7
|
2013-07-09 11:59:37 +02:00 |
|
Etienne Roudeix
|
938d5a52bf
|
product loop feature
|
2013-07-09 11:57:13 +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
|
25a8b28c61
|
track composer.lock file
|
2013-07-09 10:19:35 +02:00 |
|
Etienne Roudeix
|
fa66f3423f
|
Merge branch 'master' of github.com:thelia/thelia
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/Product.php
|
2013-07-09 09:38:37 +02:00 |
|
Etienne Roudeix
|
6752531e04
|
loop arguments
product loop
|
2013-07-09 09:29:40 +02:00 |
|
franck
|
7cea85b43e
|
Added magic method __call to access loop arguments using getArgname()
|
2013-07-08 20:04:53 +02:00 |
|
Etienne Roudeix
|
ab37da6eee
|
product loop
|
2013-07-08 14:15:18 +02:00 |
|
franck
|
a91d0e4c78
|
Fixed method name
|
2013-07-08 13:39:37 +02:00 |
|
franck
|
a3f7f53d22
|
Fixed merge problem
|
2013-07-08 13:32:35 +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
|
d68c50df95
|
Typo
|
2013-07-08 13:18:58 +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
|
8f894382f6
|
Fixed loop arguments
|
2013-07-08 11:03:54 +02:00 |
|
franck
|
7646c05cd4
|
Loop arguments should now be accessed using $this->getArgValue($argname),
or getArg($name)->value. Loop args initialisation is now located in
BaseLoop class
|
2013-07-08 10:57:05 +02:00 |
|
Manuel Raynaud
|
0e7ea83fac
|
add helper getLang in session
|
2013-07-08 10:21:58 +02:00 |
|
Manuel Raynaud
|
7b89469d06
|
add missing files
|
2013-07-08 10:20:57 +02:00 |
|
Manuel Raynaud
|
a2e40872c0
|
extends symfony session for adding some helpers
|
2013-07-08 10:10:05 +02:00 |
|