Manuel Raynaud
|
42e43de9a6
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 12:45:50 +02:00 |
|
Manuel Raynaud
|
5a79c6c016
|
force_return as default value tue in Image loop
|
2013-09-19 12:45:02 +02:00 |
|
mespeche
|
b1af4debe1
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 12:32:34 +02:00 |
|
mespeche
|
0ebaf458ed
|
- Adding of bootstrap-select
- Finish shipping_configuration view
- bootstrap-select on shipping_zones view
|
2013-09-19 12:31:46 +02:00 |
|
Manuel Raynaud
|
96ffe88938
|
fix loop image argument
|
2013-09-19 12:30:35 +02:00 |
|
mespeche
|
78067575fa
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 10:16:10 +02:00 |
|
mespeche
|
a02ba364be
|
Change background image to simple background color
|
2013-09-19 10:15:14 +02:00 |
|
mespeche
|
18d9e03172
|
Finish shipping configuration default view
|
2013-09-18 23:14:29 +02:00 |
|
Manuel Raynaud
|
f2acbed9d6
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-18 21:12:12 +02:00 |
|
Manuel Raynaud
|
0002eff88d
|
remove unused comment code
|
2013-09-18 20:27:45 +02:00 |
|
Manuel Raynaud
|
4be96d1c60
|
refactor category position and product_category assignment
|
2013-09-18 20:26:36 +02:00 |
|
Etienne Roudeix
|
66536d0b31
|
Merge branch 'master' into template
Conflicts:
core/lib/Thelia/Core/Template/Loop/Product.php
|
2013-09-18 20:03:13 +02:00 |
|
Etienne Roudeix
|
891ebcd491
|
fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar
|
2013-09-18 19:51:01 +02:00 |
|
Manuel Raynaud
|
2e32166118
|
remove some var_dump
|
2013-09-18 19:47:02 +02:00 |
|
Manuel Raynaud
|
f3367aed45
|
finish import
|
2013-09-18 19:33:29 +02:00 |
|
mespeche
|
86078d3054
|
- Edit shipping_zone routes
- Create shipping_configuration routes
|
2013-09-18 19:33:24 +02:00 |
|
mespeche
|
42ad62d2cd
|
Shipping zones views and routes creation
|
2013-09-18 19:20:51 +02:00 |
|
Manuel Raynaud
|
79a20cdec0
|
import product and images
|
2013-09-18 18:35:33 +02:00 |
|
mespeche
|
8841958646
|
Add languages files and set english by default
|
2013-09-18 18:09:07 +02:00 |
|
mespeche
|
72c0685bfa
|
Setting of tinymce and filemanager
|
2013-09-18 18:00:44 +02:00 |
|
Manuel Raynaud
|
3a323e7531
|
import brand successfully
|
2013-09-18 17:27:31 +02:00 |
|
Manuel Raynaud
|
a16b90f9ce
|
import colors attributes
|
2013-09-18 17:18:13 +02:00 |
|
Manuel Raynaud
|
55097ca6f5
|
import categories done
|
2013-09-18 17:07:56 +02:00 |
|
Etienne Roudeix
|
16d0985718
|
payment modules
|
2013-09-18 17:06:08 +02:00 |
|
Manuel Raynaud
|
71cbe984a2
|
impmort product's images
|
2013-09-18 16:54:45 +02:00 |
|
Etienne Roudeix
|
b8c2bdc8df
|
cheque module
|
2013-09-18 16:23:10 +02:00 |
|
Etienne Roudeix
|
45106f24bd
|
module image
|
2013-09-18 15:58:58 +02:00 |
|
mespeche
|
9fdf648451
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-18 15:39:03 +02:00 |
|
mespeche
|
25becbe0cc
|
WIP : Setting Folders management
|
2013-09-18 15:38:08 +02:00 |
|
Manuel Raynaud
|
8e8b55a208
|
refactor product rewriting test case
|
2013-09-18 14:33:54 +02:00 |
|
Manuel Raynaud
|
7c53eeea2f
|
create base class for testing rewriting method on each object
|
2013-09-18 14:32:49 +02:00 |
|
Manuel Raynaud
|
84813ced1e
|
dispatch event when generate new url
|
2013-09-18 13:15:36 +02:00 |
|
Manuel Raynaud
|
79e4672c01
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-18 12:30:38 +02:00 |
|
Manuel Raynaud
|
fd74703658
|
create test rewritten url for category
|
2013-09-18 12:24:36 +02:00 |
|
franck
|
0214836a54
|
Added {url file='...'} to get file pathes
|
2013-09-18 12:15:17 +02:00 |
|
Manuel Raynaud
|
4eaf7288ba
|
create helper for retrieving passed url view
|
2013-09-18 12:10:56 +02:00 |
|
Manuel Raynaud
|
f36cba3381
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-18 12:03:59 +02:00 |
|
Manuel Raynaud
|
e638a927c0
|
add more test for rewriten url
|
2013-09-18 12:03:02 +02:00 |
|
mespeche
|
742b90b24c
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-18 11:55:04 +02:00 |
|
mespeche
|
c7a6fe060f
|
- Setting dashboard view with jqplot plugin
|
2013-09-18 11:53:39 +02:00 |
|
Etienne Roudeix
|
9b37bbb862
|
module image
|
2013-09-18 11:20:29 +02:00 |
|
Manuel Raynaud
|
6483813a35
|
rtrime rewritten url
|
2013-09-18 11:07:15 +02:00 |
|
Manuel Raynaud
|
41f7b817c6
|
remove unused classes
|
2013-09-18 10:54:22 +02:00 |
|
Manuel Raynaud
|
e7fa896866
|
remove unused classes
|
2013-09-18 10:52:07 +02:00 |
|
Manuel Raynaud
|
a041273b80
|
remove unused classes
|
2013-09-18 10:34:31 +02:00 |
|
Manuel Raynaud
|
55961a2e45
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-18 10:06:55 +02:00 |
|
Manuel Raynaud
|
387c0d00c3
|
test if cache directory exists before launching debug bar
|
2013-09-18 09:34:48 +02:00 |
|
Etienne Roudeix
|
4e053d1a57
|
payment plugins
|
2013-09-18 09:20:03 +02:00 |
|
Etienne Roudeix
|
f32f16e833
|
fix product without pse in loop
|
2013-09-18 09:17:49 +02:00 |
|
Etienne Roudeix
|
a27405e0cc
|
Merge branch 'template'
|
2013-09-18 08:57:13 +02:00 |
|