TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,398 Commits 1 Branch 0 Tags
66536d0b3110426ab9ab8d8998a2336e662f6cfb
Commit Graph

1398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
16d0985718 payment modules 2013-09-18 17:06:08 +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
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
franck
48e2be57c6 Fixed some unit tests 2013-09-18 01:24:37 +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
Manuel Raynaud
5a64654ce5 move url generation to I18n entity 2013-09-17 20:45:29 +02:00
Etienne Roudeix
c659bc0e66 Merge branch 'master' of github.com:thelia/thelia 2013-09-17 20:33:08 +02:00
Etienne Roudeix
294c48f8ab fix content faker 2013-09-17 20:32:51 +02:00
Manuel Raynaud
7c340303f6 Merge branch 'master' of github.com:thelia/thelia 2013-09-17 20:29:47 +02:00
Manuel Raynaud
e4b36098c7 fix typo and remove url generation in postInsert model 2013-09-17 20:29:09 +02:00
franck
1e15142283 Added product creation 2013-09-17 20:18:53 +02:00
Manuel Raynaud
f068539e79 add covers annotation in ProductRewriteTest 2013-09-17 20:16:51 +02:00
Etienne Roudeix
9bce1cbabb Merge branch 'master' into template 2013-09-17 20:16:48 +02:00
Manuel Raynaud
da7f9e07c4 create test for UrlRewritingTrait 2013-09-17 20:15:28 +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