franck
|
05aa284f4b
|
Fixed minor UI glithces
|
2013-09-19 17:06:10 +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 |
|
mespeche
|
1627b80df7
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 16:42:23 +02:00 |
|
mespeche
|
1d90e8ba54
|
Responsive management header
|
2013-09-19 16:42:03 +02:00 |
|
Etienne Roudeix
|
f74884e63c
|
Merge branch 'master' into template
|
2013-09-19 16:24:23 +02:00 |
|
Etienne Roudeix
|
4ac9a0afad
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:24:05 +02:00 |
|
mespeche
|
e1c2f8da0a
|
Add link on ref to edit customer
|
2013-09-19 16:10:14 +02:00 |
|
mespeche
|
1a92b8c92f
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 16:08:15 +02:00 |
|
mespeche
|
3fd5e4f3ad
|
Setting of modules index view
|
2013-09-19 16:07:45 +02:00 |
|
Etienne Roudeix
|
198bd9bec8
|
add abstract getDispatcher method to use CartTrai
|
2013-09-19 16:06:42 +02:00 |
|
Manuel Raynaud
|
b71c107f7e
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:04:00 +02:00 |
|
Etienne Roudeix
|
ec7d4471dc
|
payment process
|
2013-09-19 15:59:16 +02:00 |
|
Manuel Raynaud
|
65558e74e3
|
clean code in test suites
|
2013-09-19 15:50:47 +02:00 |
|
Manuel Raynaud
|
41bd8a7cec
|
icomplete product page
|
2013-09-19 15:39:36 +02:00 |
|
Etienne Roudeix
|
3c02a9d23c
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 15:12:37 +02:00 |
|
Etienne Roudeix
|
61fab3a62a
|
order creation
|
2013-09-19 15:11:54 +02:00 |
|
franck
|
0d13aa7b7d
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 14:03:16 +02:00 |
|
franck
|
e6d8e09886
|
Added product edition routing
|
2013-09-19 14:02:56 +02:00 |
|
mespeche
|
94aab3ea8a
|
Add modules routing and default action/view
|
2013-09-19 13:27:47 +02:00 |
|
mespeche
|
2640794af7
|
Change properties of bootstrap-select field
|
2013-09-19 13:21:42 +02:00 |
|
mespeche
|
f02505f6d4
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 12:51:35 +02:00 |
|
mespeche
|
260fc5b51a
|
Width 100% on bootstrap-select
|
2013-09-19 12:47:56 +02:00 |
|
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 |
|