Marion Muszynski
|
faff854953
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:50:22 +02:00 |
|
Marion Muszynski
|
0b1f29d56f
|
Merge branch 'fix-uncombinable'
|
2017-10-02 12:49:54 +02:00 |
|
Marion Muszynski
|
6b2e8deea1
|
fix and addition
|
2017-10-02 12:49:45 +02:00 |
|
Christophe Latour
|
7e089dabe1
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-02 12:41:55 +02:00 |
|
Marion Muszynski
|
20b2adc944
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:41:38 +02:00 |
|
Marion Muszynski
|
2e70a3fcf0
|
Merge branch 'fix-uncombinable'
|
2017-10-02 12:41:12 +02:00 |
|
Marion Muszynski
|
e12e7616d7
|
fix when is same sale
|
2017-10-02 12:41:00 +02:00 |
|
Marion Muszynski
|
e451deb36c
|
Merge branch 'ticket-10170-CssandJsMinification'
|
2017-09-29 15:55:09 +02:00 |
|
Christophe Latour
|
456c661354
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-29 15:51:56 +02:00 |
|
Marion Muszynski
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
Christophe Latour
|
0f74d406d5
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-28 16:50:29 +02:00 |
|
Marion Muszynski
|
0462fda92b
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-28 16:50:18 +02:00 |
|
Marion Muszynski
|
4af060a724
|
fix
|
2017-09-28 16:50:03 +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 |
|
Christophe Latour
|
15f03de5da
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-28 10:40:01 +02:00 |
|
Marion Muszynski
|
32ca734375
|
Merge branch 'fix-functions' into develop
|
2017-09-28 10:39:24 +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 |
|
Christophe Latour
|
0b0c0f24fa
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-27 16:00:43 +02:00 |
|
Marion Muszynski
|
59f5489410
|
Merge branch 'ticket-14301-ErrorApiPaypal' into develop
|
2017-09-27 16:00:24 +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 |
|
Christophe Latour
|
ecc020d101
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-27 12:05:01 +02:00 |
|
Marion Muszynski
|
72f4b5f05a
|
fix conflicts
|
2017-09-27 12:04:46 +02:00 |
|
Marion Muszynski
|
1caec538ac
|
fix paypal api errors
|
2017-09-27 12:03:07 +02:00 |
|
Christophe Latour
|
49289b80b0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-26 17:55:01 +02:00 |
|
Marion Muszynski
|
a1742a806c
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-26 17:54:53 +02:00 |
|
Marion Muszynski
|
d31496b1fd
|
fix sale name
|
2017-09-26 17:54:36 +02:00 |
|
Christophe Latour
|
fd47c3cb8d
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-26 17:35:48 +02:00 |
|
Marion Muszynski
|
8f07cd31c6
|
fix conflicts
|
2017-09-26 17:35:31 +02:00 |
|
Marion Muszynski
|
a7e422af97
|
add mail sendind
|
2017-09-26 17:34:21 +02:00 |
|
Michael RICOIS
|
389c34f82e
|
Merge branch 'ticket-14162-returnwithqty'
|
2017-09-26 15:35:10 +02:00 |
|
Michael RICOIS
|
163b1bf5c4
|
Merge branch 'ticket-14162-returnwithqty' into develop
|
2017-09-26 15:27:37 +02:00 |
|
Michael RICOIS
|
96fe0dcd67
|
Update product-box size and truncate
|
2017-09-26 15:26:48 +02:00 |
|
Marion Muszynski
|
8fb28292b8
|
add drop shipping
|
2017-09-26 14:53:38 +02:00 |
|
Christophe Latour
|
a6c724badc
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-25 18:04:09 +02:00 |
|
Christophe Latour
|
16ecdac8fe
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-25 18:03:53 +02:00 |
|
Michael RICOIS
|
d78b6688fa
|
Merge remote-tracking branch 'origin/ticket-14162-returnwithqty' into develop
|
2017-09-25 18:00:36 +02:00 |
|
Michael RICOIS
|
91e7139f34
|
Manage quantity in return form
|
2017-09-25 17:58:47 +02:00 |
|
Christophe Latour
|
441c1f3134
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-25 12:30:47 +02:00 |
|
Marion Muszynski
|
635e984d67
|
Merge branch 'add-CacheRedis' into develop
|
2017-09-25 12:29:11 +02:00 |
|
Marion Muszynski
|
cab30809b1
|
add option to load the good db for redis
|
2017-09-25 12:24:44 +02:00 |
|
Christophe Latour
|
cb08580668
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-25 11:00:33 +02:00 |
|
Marion Muszynski
|
e65b107313
|
Merge branch 'task-ImgMobileCategories'
|
2017-09-25 11:00:17 +02:00 |
|
Marion Muszynski
|
80c6a3db16
|
Merge branch 'task-ImgMobileCategories' into develop
|
2017-09-25 10:59:58 +02:00 |
|