Commit Graph

217 Commits

Author SHA1 Message Date
Marion Muszynski
801cb2af23 add delete function for category mobile image 2017-09-25 10:59:34 +02:00
Marion Muszynski
4b985fb501 Merge branch 'ticket-13943-ResetBOpassword' 2017-09-21 15:40:57 +02:00
Marion Muszynski
c962994c82 Merge branch 'ticket-14161-UncombinableSale' 2017-09-20 16:53:52 +02:00
Michael RICOIS
e35c4042ad Forget Category override 2017-09-18 17:49:08 +02:00
Marion Muszynski
2c4ff88262 fix 2017-09-18 11:51:23 +02:00
Marion Muszynski
0f5228f6e8 update error mess from add to cart 2017-09-18 11:47:26 +02:00
Marion Muszynski
d8c2c369c9 reset password 2017-09-18 11:00:12 +02:00
Marion Muszynski
ff0a9dd73a fix 2017-09-13 10:48:03 +02:00
Marion Muszynski
783d5c55e8 add exception to best seller query 2017-09-13 10:43:23 +02:00
root
61ed06dc22 Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
2017-09-01 11:22:11 +02:00
root
38a13c74d6 Revert "fix from prod"
This reverts commit cd44650b28.
2017-09-01 11:16:02 +02:00
root
cd44650b28 fix from prod 2017-09-01 11:06:24 +02:00
Marion Muszynski
a76dd668fe addition of resetbopassword module 2017-08-28 14:30:30 +02:00
Marion Muszynski
6caf8fbd99 fix 2017-08-25 10:54:46 +02:00
Marion Muszynski
b46e35c500 indication of order carrier in order list 2017-08-25 10:44:59 +02:00
Marion Muszynski
a4853d9043 updating Mail alert module 2017-08-22 11:30:56 +02:00
Marion Muszynski
13576c64d8 fix conflicts 2017-08-21 11:04:16 +02:00
Marion Muszynski
851ff949be Merge branch 'ticket-13225-SpecificDelivery' 2017-08-21 10:46:55 +02:00
Marion Muszynski
a1b13d71cc add mr shipping number in order detail tpl 2017-08-18 11:18:06 +02:00
Marion Muszynski
abd8e88343 addition of new delivery delay and cleaning of sale combination 2017-08-17 11:22:54 +02:00
Marion Muszynski
889259d031 fix async bug for saving gift message of cart 2017-08-16 11:04:23 +02:00
Marion Muszynski
4acbde0319 add module alerthack to prevent hacker to post 2017-07-26 11:09:47 +02:00
Marion Muszynski
0e5cbb2638 fix cart 2017-07-18 10:18:38 +02:00
Marion Muszynski
1084d47e72 fix validate gift message 2017-07-18 10:06:57 +02:00
Marion Muszynski
adf8bc8185 add module custom group 2017-07-12 17:14:30 +02:00
Marion Muszynski
deef10a0b2 update and fix braderie 2017-07-10 14:11:35 +02:00
Marion Muszynski
d775d69d33 fix mobile back from product 2017-07-07 11:03:51 +02:00
Marion Muszynski
92b2366ed1 fix 2017-07-06 17:30:16 +02:00
Marion Muszynski
13b68d20ae moving gift message to shopping cart step 2017-06-30 12:57:06 +02:00
Marion Muszynski
cd390c8fb9 add promo banner for ps 2017-06-28 12:18:03 +02:00
Marion Muszynski
86ccf2ef15 check if customer already exists to prevent fb tracking resending for registration 2017-06-19 11:05:46 +02:00
Marion Muszynski
cfe960cfa2 fix logo carrier when it is a dropshipping 2017-06-02 10:21:06 +02:00
root
38827b2287 fix from prod 2017-06-01 17:47:41 +02:00
Marion Muszynski
a04ec97082 fix 2017-06-01 17:44:43 +02:00
Marion Muszynski
d97e11d79c change logo and fix colissimo choice in carrier step 2017-06-01 12:26:41 +02:00
Marion Muszynski
abe46bae6c set id_customer to 0 on SAV when customer is removing 2017-06-01 10:53:07 +02:00
Marion Muszynski
e59142f7ce fix qty returnable for philea 2017-05-24 10:12:15 +02:00
Marion Muszynski
173b417714 fix img vp en sliders 2017-05-02 12:37:11 +02:00
Marion Muszynski
373d0e3864 Merge branch 'ticket-12487-HTTPS3' 2017-04-24 15:28:54 +02:00
Marion Muszynski
463cbb7ebb replace http to // for every descriptions 2017-04-24 15:28:08 +02:00
Marion Muszynski
3894ee9acd Merge branch 'ticket-12487-HTTPS3' 2017-04-24 15:21:42 +02:00
Marion Muszynski
d3a23e7f90 add str replace for img in descriptions 2017-04-24 15:20:41 +02:00
Marion Muszynski
90dd61b5bb add multilang on category img thumbs 2017-04-18 12:48:42 +02:00
Marion Muszynski
d72262dd99 add override employee 2017-04-13 13:01:51 +02:00
Marion Muszynski
8f62586369 fix conflict 2017-04-11 12:08:19 +02:00
Marion Muszynski
89f72c7045 Merge branch 'ticket-12462-returnMR' 2017-04-06 16:24:22 +02:00
Marion Muszynski
2b861808e0 addition of conversation history in customer thread 2017-04-06 16:10:25 +02:00
Marion Muszynski
33cd9f3d08 continuation 2017-03-09 11:37:44 +01:00
Marion Muszynski
f1e3151dac fix ssl 2017-03-09 10:53:26 +01:00
Marion Muszynski
8051a5e9c2 fix redirect loop 2017-03-08 18:05:04 +01:00