TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,448 Commits 1 Branch 0 Tags
5abae4db7dd117d37b35634d6511bb06b352f8dd
Commit Graph

1126 Commits

Author SHA1 Message Date
mespeche
5abae4db7d Setting profile update 2013-09-20 09:35:56 +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
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
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
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
Manuel Raynaud
5a79c6c016 force_return as default value tue in Image loop 2013-09-19 12:45:02 +02:00
mespeche
78067575fa Merge branch 'master' of https://github.com/thelia/thelia 2013-09-19 10:16:10 +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
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
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +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
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +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
Etienne Roudeix
bb246b3205 fix test 2013-09-18 08:55:12 +02:00
Manuel Raynaud
8f95fe1b8b remove all tables before inserting tables creation 2013-09-18 08:25:20 +02:00
Manuel Raynaud
826ad83584 Merge branch 'master' of github.com:thelia/thelia 2013-09-18 08:11:08 +02:00