franck
|
1cf8c87d1a
|
Fixed product update process
|
2013-09-20 17:17:44 +02:00 |
|
Manuel Raynaud
|
369b7e1be1
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-20 17:15:07 +02:00 |
|
Etienne Roudeix
|
b7af3ebaa3
|
push model
|
2013-09-20 17:02:19 +02:00 |
|
Manuel Raynaud
|
bf11fa1958
|
re-add home link in menu
|
2013-09-20 16:56:23 +02:00 |
|
gmorel
|
ced7b5e6dc
|
WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields
|
2013-09-20 16:51:34 +02:00 |
|
Manuel Raynaud
|
defaadcd62
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-20 16:50:03 +02:00 |
|
Manuel Raynaud
|
44d6bbdb4a
|
comment dev menu in layout
|
2013-09-20 16:48:37 +02:00 |
|
Etienne Roudeix
|
c05496af53
|
Merge branch 'master' into template
|
2013-09-20 16:32:42 +02:00 |
|
Etienne Roudeix
|
d74fc0e1d3
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-20 16:32:32 +02:00 |
|
Manuel Raynaud
|
1a962d701d
|
translate some missing string
|
2013-09-20 16:31:25 +02:00 |
|
Etienne Roudeix
|
61191b9d32
|
fixes order integration
|
2013-09-20 16:31:19 +02:00 |
|
Etienne Roudeix
|
8541499302
|
order process
|
2013-09-20 16:25:46 +02:00 |
|
franck
|
5622a246b2
|
Added missing files
|
2013-09-20 15:59:19 +02:00 |
|
franck
|
e27b3cfbae
|
Working catalog branch
|
2013-09-20 15:54:50 +02:00 |
|
Manuel Raynaud
|
4e6aac8917
|
Merge branch 'integration'
|
2013-09-20 14:39:00 +02:00 |
|
Manuel Raynaud
|
30d02799b2
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-20 14:38:46 +02:00 |
|
Manuel Raynaud
|
2cf71f99a9
|
change some informations in layou
|
2013-09-20 14:38:11 +02:00 |
|
Manuel Raynaud
|
1649e4d76b
|
fix query in Thelia\Model\Folder::countAllContents
|
2013-09-20 14:26:36 +02:00 |
|
Manuel Raynaud
|
bb40086e2a
|
allow to order products on category page
|
2013-09-20 13:59:51 +02:00 |
|
mespeche
|
265da6a57e
|
Add default language & editing language default field
|
2013-09-20 12:00:39 +02:00 |
|
mespeche
|
93fd189198
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-20 10:39:34 +02:00 |
|
mespeche
|
b933a96c8e
|
Vertical align middle tables
|
2013-09-20 10:39:02 +02:00 |
|
franck
|
cb5f6d4c70
|
Fixed translations
|
2013-09-20 09:57:30 +02:00 |
|
franck
|
93abd3387c
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-20 09:39:26 +02:00 |
|
franck
|
f7d2c09c6d
|
Added producr attributes routes
|
2013-09-20 09:38:48 +02:00 |
|
mespeche
|
5abae4db7d
|
Setting profile update
|
2013-09-20 09:35:56 +02:00 |
|
Manuel Raynaud
|
16de9bbcc9
|
allow displaying how much product wanted in category page
|
2013-09-20 09:19:12 +02:00 |
|
Manuel Raynaud
|
c255548d9b
|
create dedicated file for menu
|
2013-09-20 08:45:38 +02:00 |
|
Etienne Roudeix
|
17548e3526
|
order tax tables
|
2013-09-20 08:23:02 +02:00 |
|
Manuel Raynaud
|
acffa60e50
|
awesome menu created in front office
|
2013-09-20 08:05:44 +02:00 |
|
gmorel
|
8e308d21e9
|
Working : Coupon : fix update effect (becomes type), update max usage
|
2013-09-19 23:25:01 +02:00 |
|
Manuel Raynaud
|
24f17bcb0f
|
fix count child on folder and category folder. Doubitch
|
2013-09-19 20:24:33 +02:00 |
|
Etienne Roudeix
|
6a990bf625
|
Merge branch 'template'
|
2013-09-19 20:07:57 +02:00 |
|
Etienne Roudeix
|
2959c37c2d
|
order payment email
|
2013-09-19 20:07:00 +02:00 |
|
Etienne Roudeix
|
6e9af59403
|
order creation
|
2013-09-19 19:56:59 +02:00 |
|
Manuel Raynaud
|
e1353a63a7
|
complete meta tag for product part
|
2013-09-19 19:05:56 +02:00 |
|
Manuel Raynaud
|
a7a755fab5
|
add isbn meta tag
|
2013-09-19 18:58:43 +02:00 |
|
Manuel Raynaud
|
a540626fff
|
fix product import
|
2013-09-19 18:47:12 +02:00 |
|
Etienne Roudeix
|
1d969e38ec
|
order tables
|
2013-09-19 18:30:13 +02:00 |
|
Manuel Raynaud
|
1f5cd1da62
|
create category template
|
2013-09-19 17:48:01 +02:00 |
|
mespeche
|
8731bf3c37
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 17:31:37 +02:00 |
|
mespeche
|
169b3c2659
|
Setting profile edition route and view
|
2013-09-19 17:30:57 +02:00 |
|
franck
|
e672677748
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/category-edit.html
|
2013-09-19 17:27:46 +02:00 |
|
franck
|
05aa284f4b
|
Fixed minor UI glithces
|
2013-09-19 17:06:10 +02:00 |
|
mespeche
|
2f4904e704
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 17:01:43 +02:00 |
|
mespeche
|
8a5f15c952
|
All tables are now responsive
|
2013-09-19 17:01:17 +02:00 |
|
Etienne Roudeix
|
6b25e14e83
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:56:14 +02:00 |
|
Etienne Roudeix
|
4ecf388d8b
|
refresh position in accessory
|
2013-09-19 16:55:50 +02:00 |
|
franck
|
3f6dc9046d
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 16:50:08 +02:00 |
|
franck
|
3ff1f7f9bb
|
Added accessories management events
|
2013-09-19 16:49:39 +02:00 |
|