Commit Graph

1681 Commits

Author SHA1 Message Date
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
Manuel Raynaud
af532ea271 change link to home page in front template 2013-09-19 16:45:38 +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
Manuel Raynaud
cb20f5e38b add block more info in product template 2013-09-19 16:33:34 +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
Manuel Raynaud
466798e7af start creating folder management 2013-09-19 11:31:13 +02:00