TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,437 Commits 1 Branch 0 Tags
2cf71f99a90c3dae389fd486fcdf997f49f9749a
Commit Graph

491 Commits

Author SHA1 Message Date
Manuel Raynaud
2cf71f99a9 change some informations in layou 2013-09-20 14:38:11 +02:00
Manuel Raynaud
bb40086e2a allow to order products on category page 2013-09-20 13:59:51 +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
Manuel Raynaud
acffa60e50 awesome menu created in front office 2013-09-20 08:05:44 +02:00
Manuel Raynaud
24f17bcb0f fix count child on folder and category folder. Doubitch 2013-09-19 20:24:33 +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
Manuel Raynaud
1f5cd1da62 create category template 2013-09-19 17:48:01 +02:00
Manuel Raynaud
af532ea271 change link to home page in front template 2013-09-19 16:45:38 +02:00
Manuel Raynaud
cb20f5e38b add block more info in product template 2013-09-19 16:33:34 +02:00
Manuel Raynaud
b71c107f7e Merge branch 'master' of github.com:thelia/thelia 2013-09-19 16:04:00 +02:00
Manuel Raynaud
41bd8a7cec icomplete product page 2013-09-19 15:39:36 +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
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
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
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
Etienne Roudeix
b8c2bdc8df cheque module 2013-09-18 16:23:10 +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
franck
0214836a54 Added {url file='...'} to get file pathes 2013-09-18 12:15:17 +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
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
 2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Model/Product.php
 2013-09-17 23:51:31 +02:00
Etienne Roudeix
5ffb737c50 Merge branch 'master' into template 2013-09-17 20:14:17 +02:00
Etienne Roudeix
03375a65b3 payment loop 2013-09-17 20:07:50 +02:00
Etienne Roudeix
347e5e5089 fix postage display 2013-09-17 19:52:20 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Etienne Roudeix
21df630d27 Merge branch 'master' into template 2013-09-17 16:53:57 +02:00
Etienne Roudeix
4a6adf532a cart billing integration 2013-09-17 16:53:20 +02:00
Etienne Roudeix
acaa4a969e empty cart or delivery exception 2013-09-17 16:38:16 +02:00
Manuel Raynaud
79e508524d remove isntall routing and template 2013-09-17 16:30:15 +02:00