Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
root
|
115b1b5f61
|
fix cron
|
2017-09-28 16:45:54 +02:00 |
|
Marion Muszynski
|
f2b5face0a
|
Merge branch 'ticket-imgMobile'
|
2017-09-28 15:38:16 +02:00 |
|
Marion Muszynski
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
4b4a6d9f17
|
Merge branch 'fix-functions'
|
2017-09-28 10:40:16 +02:00 |
|
Marion Muszynski
|
7b97517690
|
fix extending save function
|
2017-09-28 10:39:08 +02:00 |
|
Marion Muszynski
|
1e4d91baec
|
Merge branch 'ticket-14301-ErrorApiPaypal'
|
2017-09-27 16:01:37 +02:00 |
|
Marion Muszynski
|
695cd7740c
|
fix direct payment paypal
|
2017-09-27 16:00:08 +02:00 |
|
Marion Muszynski
|
7ec18480b8
|
Merge branch 'fix-multiShippingNumberMR'
|
2017-09-27 12:29:29 +02:00 |
|
Marion Muszynski
|
d286b61147
|
select distinct shipp numbers
|
2017-09-27 12:29:13 +02:00 |
|
Marion Muszynski
|
1caec538ac
|
fix paypal api errors
|
2017-09-27 12:03:07 +02:00 |
|
Michael RICOIS
|
389c34f82e
|
Merge branch 'ticket-14162-returnwithqty'
|
2017-09-26 15:35:10 +02:00 |
|
Michael RICOIS
|
96fe0dcd67
|
Update product-box size and truncate
|
2017-09-26 15:26:48 +02:00 |
|
Michael RICOIS
|
91e7139f34
|
Manage quantity in return form
|
2017-09-25 17:58:47 +02:00 |
|
Marion Muszynski
|
e65b107313
|
Merge branch 'task-ImgMobileCategories'
|
2017-09-25 11:00:17 +02:00 |
|
Marion Muszynski
|
801cb2af23
|
add delete function for category mobile image
|
2017-09-25 10:59:34 +02:00 |
|
Marion Muszynski
|
063da75c27
|
Merge branch 'task-imgForMobile'
|
2017-09-25 10:22:22 +02:00 |
|
Marion Muszynski
|
8dec632958
|
Merge branch 'ticket-14292-expeDateInBoOrder'
|
2017-09-22 15:31:32 +02:00 |
|
Marion Muszynski
|
7bbcc3eb59
|
add expedition date on adminorder
|
2017-09-22 15:31:16 +02:00 |
|
Marion Muszynski
|
4b985fb501
|
Merge branch 'ticket-13943-ResetBOpassword'
|
2017-09-21 15:40:57 +02:00 |
|
Marion Muszynski
|
2eddfa25b7
|
fix install module
|
2017-09-21 15:37:41 +02:00 |
|
Marion Muszynski
|
31e6272a31
|
add mail for reset password
|
2017-09-21 15:26:55 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Marion Muszynski
|
da99ec2597
|
fix lang
|
2017-09-20 16:44:15 +02:00 |
|
Michael RICOIS
|
e694616107
|
Merge remote-tracking branch 'origin/ticket-13149'
|
2017-09-19 11:26:32 +02:00 |
|
Michael RICOIS
|
e35c4042ad
|
Forget Category override
|
2017-09-18 17:49:08 +02:00 |
|
Michael RICOIS
|
f0e00394fa
|
Clean ajax and add parameter to not loop in categoryUpdate hook
|
2017-09-18 17:44:09 +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
|
046a166499
|
Merge branch 'ticket-14209-AntAlert'
|
2017-09-18 11:17:13 +02:00 |
|
Marion Muszynski
|
7d297ca19b
|
fix AntAlert checking limits
|
2017-09-18 11:14:40 +02:00 |
|
root
|
9c2cce3d0b
|
fix from prod
|
2017-09-18 11:01:28 +02:00 |
|
Marion Muszynski
|
d8c2c369c9
|
reset password
|
2017-09-18 11:00:12 +02:00 |
|
Michael RICOIS
|
bfae895cf1
|
Fix currentIndex
|
2017-09-15 16:19:44 +02:00 |
|
Michael RICOIS
|
e8fbfd92af
|
Add root category
|
2017-09-15 16:13:15 +02:00 |
|
Michael RICOIS
|
8728d37bea
|
Display category children tree in a select
|
2017-09-15 10:57:16 +02:00 |
|
Marion Muszynski
|
deec098272
|
close wanted sale
|
2017-09-15 10:09:15 +02:00 |
|
Marion Muszynski
|
ede8721e84
|
Merge branch 'ticket-14197-ConstantSale'
|
2017-09-13 10:51:12 +02:00 |
|
Marion Muszynski
|
ff0a9dd73a
|
fix
|
2017-09-13 10:48:03 +02:00 |
|
Marion Muszynski
|
8f8a970b1c
|
Merge branch 'ticket-14197-ConstantSale'
|
2017-09-13 10:44:17 +02:00 |
|
Marion Muszynski
|
783d5c55e8
|
add exception to best seller query
|
2017-09-13 10:43:23 +02:00 |
|
root
|
91e4537e41
|
fix and trad from prod
|
2017-09-13 10:28:19 +02:00 |
|
Marion Muszynski
|
8f754edcc6
|
Merge branch 'ticket-14162-DecliInSAV'
|
2017-09-12 11:27:29 +02:00 |
|
Marion Muszynski
|
bb7f8474e7
|
fix css and show ordered quantity
|
2017-09-12 11:26:39 +02:00 |
|
Marion Muszynski
|
e272bede0e
|
select product name from order detail for sav
|
2017-09-12 11:12:31 +02:00 |
|
Marion Muszynski
|
a69acd27d6
|
Merge branch 'ticket-14138-ImageUrl'
|
2017-09-07 11:36:58 +02:00 |
|
Marion Muszynski
|
d1e1c62245
|
fix https on sale export
|
2017-09-07 11:36:48 +02:00 |
|
Marion Muszynski
|
ec35cf0474
|
addition of new image format for application
|
2017-09-01 11:59:40 +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 |
|