Michael RICOIS
|
be6b195f00
|
Merge branch 'fix/soapclient-500' into develop
|
2017-12-11 16:28:56 +01:00 |
|
Michael RICOIS
|
5b675cdaa0
|
Prefer number
|
2017-12-11 16:28:16 +01:00 |
|
Michael RICOIS
|
851bb2cd1f
|
Merge branch 'fix/soapclient-500' into develop
|
2017-12-11 16:19:28 +01:00 |
|
Michael RICOIS
|
a1752d2d68
|
Config var
|
2017-12-11 16:18:49 +01:00 |
|
Michael RICOIS
|
1a50acf40a
|
Prepare wsdl locally
|
2017-12-11 15:18:58 +01:00 |
|
Michael RICOIS
|
af269cc4b2
|
CS
|
2017-12-11 15:18:32 +01:00 |
|
Michael RICOIS
|
b4128a0629
|
Enable flag to load locally the wsdl
|
2017-12-11 14:57:43 +01:00 |
|
Michael RICOIS
|
1d685e47cc
|
Use local wsdl file
|
2017-12-11 14:50:25 +01:00 |
|
Michael RICOIS
|
66c4bfbdb9
|
Fix SoapClient emit 500
|
2017-12-11 12:33:36 +01:00 |
|
Michael RICOIS
|
429cdd12fa
|
Button
|
2017-12-11 11:35:20 +01:00 |
|
Marion Muszynski
|
17d8298afd
|
Merge branch 'ticket-15084-FixReport'
|
2017-12-11 11:28:00 +01:00 |
|
Marion Muszynski
|
bebb9461d9
|
fix sort comment by id_sale
|
2017-12-11 11:27:44 +01:00 |
|
Michael RICOIS
|
52e5e80b9c
|
Front : Availability status
|
2017-12-11 10:39:49 +01:00 |
|
Michael RICOIS
|
0ac2323f2a
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2017-12-11 10:25:58 +01:00 |
|
Michael RICOIS
|
20e81b9fc4
|
Align add_to_cart to the right
|
2017-12-11 10:18:19 +01:00 |
|
Michael RICOIS
|
334eb49372
|
Check quantity
|
2017-12-08 17:25:11 +01:00 |
|
Michael RICOIS
|
bbfff8035f
|
Align quantity alert
|
2017-12-08 16:50:46 +01:00 |
|
Michael RICOIS
|
1494653b77
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2017-12-08 16:04:25 +01:00 |
|
Michael RICOIS
|
f20c7fce78
|
Space
|
2017-12-08 16:04:06 +01:00 |
|
Michael RICOIS
|
d43307329a
|
Mobile design achat express
|
2017-12-08 15:27:31 +01:00 |
|
Michael RICOIS
|
ef46eba0b7
|
Merge branch 'ticket/15057-lang2' into develop
|
2017-12-08 10:21:12 +01:00 |
|
Michael RICOIS
|
0ca284d62c
|
Translation ES
|
2017-12-08 10:18:16 +01:00 |
|
Michael RICOIS
|
a9c95eab80
|
Translate title
|
2017-12-08 09:59:39 +01:00 |
|
Michael RICOIS
|
d9fd71e0c6
|
Change translation
|
2017-12-07 18:05:33 +01:00 |
|
Michael RICOIS
|
f1fc24897b
|
text
|
2017-12-07 17:37:52 +01:00 |
|
Michael RICOIS
|
36705c3da3
|
Merge branch 'ticket/15014-invite_credits' into develop
|
2017-12-07 17:30:17 +01:00 |
|
Michael RICOIS
|
850652caf7
|
Forget to add file
|
2017-12-07 17:28:47 +01:00 |
|
Michael RICOIS
|
f53db8d1f7
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-12-07 17:19:02 +01:00 |
|
Michael RICOIS
|
2e8afda268
|
Merge branch 'ticket/15014-invite_credits' into develop
|
2017-12-07 17:18:55 +01:00 |
|
Michael RICOIS
|
4841e02436
|
Display credit
|
2017-12-07 17:17:52 +01:00 |
|
Marion Muszynski
|
42dfa81f9a
|
Merge branch 'ticket-15062-confirmAlert'
|
2017-12-07 16:31:15 +01:00 |
|
Marion Muszynski
|
62ad2de197
|
Merge branch 'ticket-15062-confirmAlert' into develop
|
2017-12-07 16:29:50 +01:00 |
|
Marion Muszynski
|
0d3ed321cf
|
add confirm box on paypal refund button
|
2017-12-07 16:29:31 +01:00 |
|
root
|
78df0048af
|
fix from prod
|
2017-12-07 15:08:30 +01:00 |
|
Marion Muszynski
|
6e962ea6f8
|
Merge branch 'ticket-14716-PictoAppliAdminOrders'
|
2017-12-07 15:03:19 +01:00 |
|
Michael RICOIS
|
c3cf35571d
|
Remove .hg
|
2017-12-07 15:02:46 +01:00 |
|
Marion Muszynski
|
bc4e3353c2
|
Merge branch 'ticket-14716-PictoAppliAdminOrders' into develop
|
2017-12-07 14:49:56 +01:00 |
|
Marion Muszynski
|
46ec23fd24
|
fix column width
|
2017-12-07 14:49:40 +01:00 |
|
Marion Muszynski
|
b991cfa8fc
|
Merge branch 'ticket-14716-PictoAppliAdminOrders' into develop
|
2017-12-07 14:46:34 +01:00 |
|
Marion Muszynski
|
c85e23079b
|
add png image
|
2017-12-07 14:46:19 +01:00 |
|
Michael RICOIS
|
628bdd6917
|
Merge branch 'feature/canonical'
|
2017-12-07 12:22:26 +01:00 |
|
Michael RICOIS
|
e3710ac3be
|
As we don't use PS_SSL_ENABLED set directly an https
|
2017-12-07 12:21:26 +01:00 |
|
Michael RICOIS
|
8e55191a35
|
Merge branch 'feature/canonical'
|
2017-12-07 11:24:24 +01:00 |
|
Michael RICOIS
|
c041a8a1b3
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-12-07 11:14:23 +01:00 |
|
Michael RICOIS
|
4d5cc3ec00
|
Merge branch 'fix/sensefuel_https' into develop
|
2017-12-07 11:13:47 +01:00 |
|
Marion Muszynski
|
620b003d23
|
Merge branch 'ticket-14716-PictoAppliAdminOrders' into develop
|
2017-12-07 11:13:05 +01:00 |
|
Michael RICOIS
|
fe653e40c1
|
Be sure links are generated with https://
|
2017-12-07 11:12:46 +01:00 |
|
Marion Muszynski
|
e663de7dc6
|
add picto for appli orders in admin order listing
|
2017-12-07 11:10:14 +01:00 |
|
root
|
93fd9f929c
|
fix return condition
|
2017-12-07 10:55:49 +01:00 |
|
Michael RICOIS
|
439342dd50
|
Merge branch 'feature/canonical' into develop
|
2017-12-07 10:47:52 +01:00 |
|