Franck Allimant
|
ca862b07e4
|
Merge branch 'master' into brands
Conflicts:
core/lib/Thelia/Tools/FileManager.php
setup/update/2.0.3.sql
|
2014-06-26 16:35:08 +02:00 |
|
Franck Allimant
|
114a55c1e8
|
Refactoring of images and documents management
|
2014-06-26 10:36:12 +02:00 |
|
Michaël Espeche
|
6661341eb4
|
Replace findOneById by findPk
|
2014-06-26 08:59:21 +02:00 |
|
Michaël Espeche
|
ed464db6fd
|
Add substitution
|
2014-06-25 16:43:06 +02:00 |
|
Manuel Raynaud
|
a5cfcf91ca
|
update changelog and fix cs
|
2014-02-22 19:01:37 +01:00 |
|
Franck Allimant
|
89653f452b
|
Removes container from all Thelia actions, but Modules (#198)
|
2014-01-31 20:06:42 +01:00 |
|
Manuel Raynaud
|
1974d3e3c3
|
fix psr
|
2014-01-22 12:52:36 +01:00 |
|
Etienne Roudeix
|
93537b8d71
|
in progress : reorder image
|
2013-12-12 15:30:10 +01:00 |
|
Franck Allimant
|
0fcbb409e3
|
Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete()
|
2013-12-06 12:26:39 +01:00 |
|
Etienne Roudeix
|
926ff410d1
|
fix #128
|
2013-12-06 11:50:29 +01:00 |
|
Manuel Raynaud
|
6d8e6e1921
|
reorder position on folder and category tables before delete action
|
2013-10-01 18:02:44 +02:00 |
|
Manuel Raynaud
|
3a7a76afe0
|
move folders action class to Folder directory
|
2013-09-25 17:53:38 +02:00 |
|
Manuel Raynaud
|
aa39d6300c
|
add dispatcher before/after for folder crud management
|
2013-09-20 19:57:25 +02:00 |
|
Manuel Raynaud
|
1649e4d76b
|
fix query in Thelia\Model\Folder::countAllContents
|
2013-09-20 14:26:36 +02:00 |
|
Manuel Raynaud
|
5a64654ce5
|
move url generation to I18n entity
|
2013-09-17 20:45:29 +02:00 |
|
Manuel Raynaud
|
e4b36098c7
|
fix typo and remove url generation in postInsert model
|
2013-09-17 20:29:09 +02:00 |
|
Manuel Raynaud
|
e1e383707b
|
template is not mandatory in product table.
|
2013-09-17 19:19:52 +02:00 |
|
Manuel Raynaud
|
60d09dc76e
|
refactor rewrriten method name
|
2013-09-17 19:11:44 +02:00 |
|
franck
|
bff08dd581
|
Typo
|
2013-09-16 22:35:29 +02:00 |
|
franck
|
7858e809b7
|
Added UrlRewritingTrait to manage URLs from model classes
|
2013-09-16 22:31:55 +02:00 |
|
franck
|
31c074d492
|
Fixed image tests
|
2013-09-04 17:59:07 +02:00 |
|
franck
|
6387182026
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Core/Template/Loop/Config.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Tools/URL.php
|
2013-09-04 17:34:23 +02:00 |
|
Etienne Roudeix
|
b910b0af86
|
fix URL::retrieve
|
2013-09-04 15:15:38 +02:00 |
|
Etienne Roudeix
|
43ff0b7297
|
rewriting
|
2013-09-03 16:51:41 +02:00 |
|
Etienne Roudeix
|
696b871acd
|
start rewriting
|
2013-08-29 08:49:48 +02:00 |
|
Etienne Roudeix
|
430baa6cda
|
url output in loops
|
2013-08-26 14:44:39 +02:00 |
|
Etienne Roudeix
|
fd82907209
|
folder and content fake
folder and content loops
|
2013-08-02 16:18:45 +02:00 |
|
Etienne Roudeix
|
a02ac99360
|
set x right to 7
|
2013-07-09 11:59:37 +02:00 |
|
Manuel Raynaud
|
5fda702b8d
|
migrte propel to propel 2
|
2013-07-04 19:31:09 +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
|
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
|
c3c7102f7b
|
move Base model to Base directory
|
2012-12-27 11:37:32 +01:00 |
|
Manuel Raynaud
|
6ba59276e1
|
delete propel auto generated files
|
2012-12-20 17:59:30 +01:00 |
|
Manuel Raynaud
|
481ac07994
|
integrate propel generate model
|
2012-12-17 16:40:47 +01:00 |
|