Marion Muszynski
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
Marion Muszynski
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
8f07cd31c6
|
fix conflicts
|
2017-09-26 17:35:31 +02:00 |
|
Marion Muszynski
|
8fb28292b8
|
add drop shipping
|
2017-09-26 14:53:38 +02:00 |
|
Marion Muszynski
|
635e984d67
|
Merge branch 'add-CacheRedis' into develop
|
2017-09-25 12:29:11 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Michael RICOIS
|
8c1c166572
|
Merge branch 'ticket-13149' into develop
|
2017-09-18 17:45:29 +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
|
3aaf570fdc
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-15 10:09:51 +02:00 |
|
Marion Muszynski
|
deec098272
|
close wanted sale
|
2017-09-15 10:09:15 +02:00 |
|
Marion Muszynski
|
7b72d11da9
|
start of cacheRedis
|
2017-09-07 11:30:57 +02:00 |
|
Marion Muszynski
|
379bec4ab4
|
Merge branch 'task-imgForMobile' into develop
|
2017-09-01 12:00:07 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6e654a40632251017e8e60e1bc709d3.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28c6a00c47aa3079863fdc5c28fdcc33.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Marion Muszynski
|
a40c1d6347
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-31 15:26:01 +02:00 |
|
Marion Muszynski
|
a362ab1aaf
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-31 15:25:37 +02:00 |
|
Marion Muszynski
|
76e3fd9334
|
fix philea
|
2017-08-31 15:25:19 +02:00 |
|
Marion Muszynski
|
dcfd8aa511
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-28 18:09:23 +02:00 |
|
root
|
b9c24cbdbb
|
fixes and trad from prod
|
2017-08-28 11:00:40 +02:00 |
|
Marion Muszynski
|
a73f5cdf8c
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding' into develop
|
2017-08-24 16:10:37 +02:00 |
|
Marion Muszynski
|
eaefb7f8e4
|
printing multi invoices when products from other sale are completely refunded
|
2017-08-24 16:10:22 +02:00 |
|
Marion Muszynski
|
2d25c1470a
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-24 10:57:56 +02:00 |
|
Marion Muszynski
|
1713b36f29
|
fix
|
2017-08-23 10:58:54 +02:00 |
|
Marion Muszynski
|
fc2caf3df4
|
fix async ajax for dnd
|
2017-08-23 10:52:28 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +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
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +02:00 |
|
Marion Muszynski
|
1b1e303364
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-27 12:07:54 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
Marion Muszynski
|
cf80e281c7
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:50:15 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
8ebad0868b
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-21 11:17:21 +02:00 |
|
Marion Muszynski
|
8a1b3793da
|
resort sales after addition of new one
|
2017-07-21 11:17:05 +02:00 |
|
Marion Muszynski
|
6a88e687c0
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-20 16:51:38 +02:00 |
|
Marion Muszynski
|
e1663b365b
|
fixation of sale position
|
2017-07-20 16:51:19 +02:00 |
|
Marion Muszynski
|
4e0938b32e
|
fix sale position
|
2017-07-20 11:37:45 +02:00 |
|
Marion Muszynski
|
91536bdb4d
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 16:23:26 +02:00 |
|
Marion Muszynski
|
7999a3d8f3
|
fix conflict
|
2017-07-04 16:06:55 +02:00 |
|
Marion Muszynski
|
4435110d9d
|
little fix
|
2017-07-04 16:04:00 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
Marion Muszynski
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
7ef886ba82
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-27 18:22:46 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
8d98b4f8e1
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-06-16 17:51:35 +02:00 |
|
Marion Muszynski
|
dadf16f8fb
|
separate la poste invoices and mr invoices
|
2017-06-16 17:51:19 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|