antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,174 Commits 124 Branches 0 Tags 108 MiB
bc37b6c906
Commit Graph

508 Commits

Author SHA1 Message Date
Marion Muszynski
b3e04efabe Merge branch 'evo-10581' into develop 2016-08-23 12:32:54 +02:00
Marion Muszynski
e02097858b fix css conflicts 2016-08-23 12:31:28 +02:00
Rodney Figaro
b335e6adf1 fix original text in product info size in french rather than in spanish 2016-08-23 12:17:56 +02:00
Rodney Figaro
b95db0bb8c change css of the size info popup for mobile version 2016-08-23 12:06:39 +02:00
Marion Muszynski
41845cd98d Merge branch 'ticket-8039' 2016-08-23 11:12:04 +02:00
Marion Muszynski
fe434095da modif for prod 2016-08-23 11:11:28 +02:00
Rodney Figaro
2a2949882d display informations on sizes in product details 2016-08-23 10:33:48 +02:00
Marion Muszynski
2a82114fa9 fix conflict 2016-08-22 17:10:12 +02:00
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Marion Muszynski
8053859bf4 fix 2016-07-29 13:32:38 +02:00
Marion Muszynski
9d3083eb23 update carrier name when es 2016-07-29 13:31:12 +02:00
Marion Muszynski
2ab551f44a fix conflict 2016-07-27 16:31:59 +02:00
Marion Muszynski
6711926ac3 fix conflicts 2016-07-25 15:26:26 +02:00
Marion Muszynski
0ccf7667a6 Merge branch 'ticket-deliveryDelay_cart' into develop 2016-07-25 12:20:03 +02:00
Marion Muszynski
e69073572e modif date 2016-07-25 12:19:36 +02:00
Marion Muszynski
c809342939 Merge branch 'ticket-deliveryDelay_product' into develop 2016-07-25 12:06:23 +02:00
Marion Muszynski
f4f144057d modif date calcul method to include we and check if the last day is a business day 2016-07-25 12:05:57 +02:00
Marion Muszynski
f1769755de Merge branch 'ticket-blockOrderSummary' into develop 2016-07-25 11:18:16 +02:00
Marion Muszynski
dd6a758e32 modif css 2016-07-25 11:17:40 +02:00
Marion Muszynski
a2e67137bf Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 11:45:49 +02:00
Marion Muszynski
fb51c877c4 suite save paybox info 2016-07-18 11:45:18 +02:00
Marion Muszynski
a21a7bbc0e Merge branch 'ticket-blockOrderSummary' into develop 2016-07-15 12:28:47 +02:00
Marion Muszynski
b8a4934278 adding delivery date estimation 2016-07-15 12:26:58 +02:00
Marion Muszynski
205a9c0aa2 Merge branch 'ticket-deliveryDelay_cart' into develop 2016-07-15 10:33:34 +02:00
Marion Muszynski
e07186fe27 modif css 2016-07-15 10:32:16 +02:00
Marion Muszynski
ba60aeacb9 Merge branch 'ticket-deliveryDelay_product' into develop 2016-07-15 10:21:51 +02:00
Marion Muszynski
6e14b286c2 update css 2016-07-15 10:21:24 +02:00
Marion Muszynski
64a8296a57 Merge branch 'ticket-deliveryDelay_cart' into develop 2016-07-13 17:41:53 +02:00
Marion Muszynski
a6ec43bb68 showing estimation delivery date in cart 2016-07-13 17:40:13 +02:00
Marion Muszynski
7fe43c37b0 fix conflict 2016-07-13 16:38:47 +02:00
Marion Muszynski
02af220b58 showing delivery delay estimation on product tpl 2016-07-13 16:37:00 +02:00
Marion Muszynski
370fb8dd18 Merge branch 'ticket-blockOrderSummary' into develop 2016-07-13 15:39:52 +02:00
Marion Muszynski
e33d2da73d adjusting for delivery delay part 2016-07-13 15:35:00 +02:00
Marion Muszynski
951ffd3e4b Merge branch 'ticket-blockOrderSummary' into develop 2016-07-13 15:17:13 +02:00
Marion Muszynski
dee3c2ba2c ajusting css 2016-07-13 15:16:48 +02:00
Marion Muszynski
98b264471c Merge branch 'ticket-blockOrderSummary' into develop 2016-07-13 15:10:48 +02:00
Marion Muszynski
67314cbf25 hide bestsellers at payment step 2016-07-13 15:09:33 +02:00
Marion Muszynski
489b94cff5 suite block order summary 2016-07-12 14:50:52 +02:00
Dylan Travers
c2d4fb13c9 Show only if product.quantity > 0 2016-07-08 15:37:30 +02:00
Marion Muszynski
281e562edf Merge branch 'ticket-10377' into develop 2016-07-06 11:18:41 +02:00
Marion Muszynski
0ee8479f3c remove grey border on shipping menu of product tpl 2016-07-06 11:18:06 +02:00
Marion Muszynski
ff715abd60 Merge branch 'modif-css' 2016-07-01 16:44:13 +02:00
Marion Muszynski
47335062aa Merge branch 'ticket-ecotax' 2016-07-01 12:27:13 +02:00
Marion Muszynski
1bb5ccc889 Merge branch 'modif-css' into develop 2016-07-01 11:29:20 +02:00
Marion Muszynski
6a87ea0460 modif add button 2016-07-01 11:29:00 +02:00
Marion Muszynski
c7aa42f883 fix conflict 2016-07-01 11:20:49 +02:00
Marion Muszynski
e40768c734 modif img reduction on product list 2016-07-01 11:18:52 +02:00
Marion Muszynski
155dd48cad fix conflict 2016-07-01 11:02:09 +02:00
Srv Bebeboutik
c48e673922 fix prod 2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
e695afb543 Merge branch 'ticket-simplemulti_front' into develop 2016-06-30 10:48:06 +02:00
Marion Muszynski
f99cacd293 small update for mobile site 2016-06-30 10:47:46 +02:00
Marion Muszynski
e7f0c678de fix conflict 2016-06-29 15:53:34 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
7fa45bf40f Merge branch 'ticket-simplemulti_front' into develop 2016-06-29 09:59:37 +02:00
Marion Muszynski
20896d3bbf adding popup error for mobile 2016-06-29 09:59:03 +02:00
Marion Muszynski
dd9831daa5 Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 15:55:39 +02:00
Marion Muszynski
7f2ebe23f4 Merge branch 'ticket-simplemulti_front' into develop 2016-06-28 15:19:53 +02:00
Marion Muszynski
f8af1f0a71 modif tpl trad 2016-06-28 15:19:31 +02:00
Marion Muszynski
757c557a07 fix conflict 2016-06-28 14:47:38 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Dylan Travers
c3f3e05427 Change pink color and modify comportement (Use All_quantities and not product_quantity 2016-06-27 12:25:22 +02:00
Marion Muszynski
fffeec4f63 Merge branch 'ticket-ecotax' into develop 2016-06-24 14:35:12 +02:00
Marion Muszynski
ced379c219 ecotax sentence 2016-06-24 14:34:15 +02:00
Marion Muszynski
a72fdf8da2 Merge branch 'ticket-blockbestsellerProduct' into develop 2016-06-24 14:03:16 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +02:00
Marion Muszynski
f57b04dbde fix conflict 2016-06-24 12:43:26 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Srv Bebeboutik
3b72e67b19 fix from prod 2016-06-24 10:09:27 +02:00
Marion Muszynski
03dd90bec5 update product tpl css 2016-06-23 10:16:07 +02:00
Marion Muszynski
d8307d12ef Merge branch 'ticket-8039' into develop 2016-06-22 17:51:17 +02:00
Marion Muszynski
d2d845a4d8 small fix 2016-06-22 17:50:52 +02:00
Marion Muszynski
22a8b5cac1 Merge branch 'ticket-8039' into develop 2016-06-22 17:23:56 +02:00
Marion Muszynski
7043f4b24a other fix 2016-06-22 17:23:34 +02:00
Marion Muszynski
224267f45c Merge branch 'ticket-8039' into develop 2016-06-22 17:08:37 +02:00
Marion Muszynski
a6c46f9077 petit fix before prod 2016-06-22 17:08:09 +02:00
Marion Muszynski
f3fdc49173 fix conflict 2016-06-22 16:11:15 +02:00
Marion Muszynski
3e65d4ed6d fix css 2016-06-22 15:50:00 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
53af527187 Merge branch 'tiket-productTemplate' into develop 2016-06-22 12:53:47 +02:00
Marion Muszynski
f5cb833c6e put description more over description short 2016-06-22 12:53:17 +02:00
Marion Muszynski
fcc0b6e2fc Merge branch 'ticket-10254' into develop 2016-06-20 15:13:43 +02:00
Marion Muszynski
a11f4ad97e modif button color 2016-06-20 15:13:18 +02:00
Dylan Travers
1e674c4adf Add 'X item(s) in stock' from ticket n°9890 2016-06-14 10:40:57 +02:00
Marion Muszynski
62009ba633 Merge branch 'ticket-8039' into develop 2016-06-10 16:50:05 +02:00
Marion Muszynski
7af6d9ccd7 adding bg for sale 2016-06-10 16:49:43 +02:00
Marion Muszynski
62a5f4cc32 Merge branch 'tiket-productTemplate' into develop 2016-06-09 11:49:55 +02:00
Marion Muszynski
7945d0c0ad modif for ecotax style 2016-06-09 11:49:33 +02:00
Marion Muszynski
cf10bd3be0 fix conflicts 2016-06-08 17:15:28 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
1b2020f041 Merge branch 'ticket-fidelite' into develop 2016-06-08 16:28:25 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
0fcd71ee7d Merge branch 'tiket-productTemplate' into develop 2016-06-08 14:29:52 +02:00
Marion Muszynski
2b2ae3fa8a modif zoomdiv 2016-06-08 14:29:19 +02:00
Marion Muszynski
ab21f10643 Merge branch 'ticket-fidelite' 2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6 modif trad 2016-06-08 12:53:38 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
8fc47d1d6e Merge branch 'ticket-fidelite' into develop 2016-06-08 11:44:35 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
f92562ca53 Merge branch 'ticket-fidelite' into develop 2016-06-08 10:38:22 +02:00
Marion Muszynski
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Marion Muszynski
4148656a60 Merge branch 'ticket-8041' into develop 2016-06-07 17:43:19 +02:00
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Marion Muszynski
1c2c54f808 fix conflict 2016-06-07 14:51:10 +02:00
Marion Muszynski
5a7e53a116 fix conflicts 2016-06-07 14:45:26 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Dylan Travers
d099294e5f Fix error alert message of ticket 9198 2016-06-07 10:20:29 +02:00
Dylan Travers
57584df3c0 Fix bug sentence. Ticket N° 9891 2016-06-07 09:51:09 +02:00
Dylan Travers
9b8795607a Ajout de la phrase du ticket N°9891 2016-06-06 18:10:47 +02:00
Dylan Travers
54b10d9432 Ajout de la phrase demandée dans le ticket N°9891 2016-06-06 18:02:02 +02:00
Marion Muszynski
7065edffe4 fix conflict 2016-06-06 17:42:00 +02:00
Marion Muszynski
a966ed080e Merge branch 'ticket-fidelite' into develop 2016-06-06 15:56:56 +02:00
Marion Muszynski
768c3dea8b petit fix 2016-06-06 15:56:25 +02:00
Marion Muszynski
79c1381705 Merge branch 'ticket-fidelite' into develop 2016-06-06 15:53:52 +02:00
Marion Muszynski
cd3761a104 modif for site_mobile 2016-06-06 15:53:23 +02:00
Srv Bebeboutik
3ec698aa01 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-06-06 12:03:14 +02:00
Srv Bebeboutik
1fab58c2d6 trad fr 2016-06-06 11:36:03 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
76f698ee8f Merge branch 'tiket-productTemplate' into develop 2016-06-03 12:07:42 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
15871cea67 Merge branch 'tiket-productTemplate' into develop 2016-06-01 14:40:11 +02:00
Marion Muszynski
289a55b5e4 small update 2016-06-01 14:39:30 +02:00
Marion Muszynski
349aa65a7d Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:57:39 +02:00
Marion Muszynski
e04cd105b8 modif code hex 2016-06-01 12:57:10 +02:00
Marion Muszynski
d0217bf4f6 Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:52:13 +02:00
Marion Muszynski
700c5dc9e0 css modif 2016-06-01 12:51:53 +02:00
Marion Muszynski
fd42b0425b Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:48:12 +02:00
Marion Muszynski
71ba5e170a small update 2016-06-01 12:47:48 +02:00
Marion Muszynski
83ac3dbe3f fix conflcit 2016-06-01 12:45:33 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
5bf7b1f7e1 Merge branch 'ticket-dropshipping' into develop 2016-06-01 11:24:01 +02:00
Marion Muszynski
3e0ad8592d update link 2016-06-01 11:23:37 +02:00
Marion Muszynski
42c7bf13b4 Merge branch 'ticket-dropshipping' into develop 2016-06-01 10:58:05 +02:00
Marion Muszynski
96ca86fe85 modif error message 2016-06-01 10:57:31 +02:00
Marion Muszynski
79964293be Merge branch 'tiket-productTemplate' into develop 2016-05-31 16:34:15 +02:00
Marion Muszynski
ed9658e97e comment facebook like 2016-05-31 16:33:28 +02:00
Marion Muszynski
aeb00544fb Merge branch 'tiket-productTemplate' into develop 2016-05-30 18:07:07 +02:00
Marion Muszynski
cd56c49c48 modif css 2016-05-30 18:06:19 +02:00
Marion Muszynski
6c1d54467b Merge branch 'ticket-fidelite' into develop 2016-05-30 17:52:52 +02:00
Marion Muszynski
725251f138 fix css 2016-05-30 17:52:18 +02:00
Marion Muszynski
df3661299e Merge branch 'ticket-fidelite' into develop 2016-05-30 17:46:30 +02:00
Marion Muszynski
ed698c66f8 modif css 2016-05-30 17:45:51 +02:00
Marion Muszynski
66171d1e76 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:42:05 +02:00
Marion Muszynski
0cf8ac97a9 modif css 2016-05-30 17:41:17 +02:00
Marion Muszynski
5dda7b4685 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:17:26 +02:00
Marion Muszynski
fd0de8d0aa other fix tpl 2016-05-30 17:16:54 +02:00
Marion Muszynski
17c8bd6122 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:14:05 +02:00
Marion Muszynski
633643d0c7 fix pagination 2016-05-30 17:13:22 +02:00
Marion Muszynski
85c2d3b45d Merge branch 'ticket-fidelite' into develop 2016-05-30 16:33:46 +02:00
Marion Muszynski
93344e1770 fix shopping-cart tpl 2016-05-30 16:33:03 +02:00
Marion Muszynski
2b14f9bd61 Merge branch 'ticket-dropshipping' into develop 2016-05-30 15:42:50 +02:00
Marion Muszynski
d63a2d7d5a addind field to config if delivery of sale is enabled only in fr 2016-05-30 15:42:20 +02:00
Marion Muszynski
c9265f1116 Merge branch 'tiket-productTemplate' into develop 2016-05-30 12:07:47 +02:00
Marion Muszynski
a4ad9d98b0 modif tpl product css 2016-05-30 12:07:24 +02:00
Marion Muszynski
1af459d215 Merge branch 'tiket-productTemplate' into develop 2016-05-26 14:36:00 +02:00
Marion Muszynski
122cea0bc5 modif img product 2016-05-26 14:35:35 +02:00
Marion Muszynski
bee4986a9f Merge branch 'tiket-productTemplate' into develop 2016-05-20 15:02:56 +02:00
Marion Muszynski
f479a0f9a7 modif css 2016-05-20 15:02:22 +02:00
Marion Muszynski
da375df311 Merge branch 'tiket-productTemplate' into develop 2016-05-20 12:38:50 +02:00
Marion Muszynski
a356edf0df modif picto 2016-05-20 12:38:25 +02:00
Marion Muszynski
f59fe988c6 fix conflict 2016-05-20 10:50:27 +02:00
Marion Muszynski
b68de72f86 add postcode autocomplete for mobile 2016-05-20 10:48:35 +02:00
Marion Muszynski
64cfa67dbf clean js console 2016-05-19 14:47:38 +02:00
Marion Muszynski
5c6f243d6b fix conflict 2016-05-19 13:17:54 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +02:00
Marion Muszynski
3db1f64164 Merge branch 'ticket-modifAddress' into develop 2016-05-17 17:43:49 +02:00
Marion Muszynski
2030584c84 modif img site mobile 2016-05-17 16:36:28 +02:00
Marion Muszynski
9eda48a6b4 modif img payment_2 2016-05-17 16:33:20 +02:00
Marion Muszynski
1cb1c7398e fix conflict css 2016-05-17 15:57:59 +02:00
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00
Marion Muszynski
348be7d6f4 Merge branch 'ticket-modifCarriers' into develop 2016-05-13 15:41:23 +02:00
Marion Muszynski
70d2b78a74 modif site_mobile 2016-05-13 14:47:22 +02:00
Marion Muszynski
44829771cf fix conflict css 2016-05-13 13:33:44 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
1fef6beb19 modif css site et mobile 2016-05-13 11:41:40 +02:00
Marion Muszynski
56683972c7 Merge branch 'tiket-productTemplate' into develop 2016-05-10 16:14:11 +02:00
Marion Muszynski
183ad376d0 modif for delay flag 2016-05-10 16:13:48 +02:00
Marion Muszynski
944fe22c8d Merge branch 'tiket-productTemplate' into develop 2016-05-04 16:20:10 +02:00
Marion Muszynski
8e8e2793ae modif arroaw slider 2016-05-04 16:19:18 +02:00
Marion Muszynski
653d0031a6 Merge branch 'tiket-productTemplate' into develop 2016-05-04 16:00:55 +02:00
Marion Muszynski
e85b593e35 modif trad 2016-05-04 16:00:32 +02:00
Marion Muszynski
d54abebb29 Merge branch 'tiket-productTemplate' into develop 2016-05-04 15:37:03 +02:00
Marion Muszynski
231dbe444e modif css 2016-05-04 15:36:41 +02:00
Marion Muszynski
de66d55c55 Merge branch 'tiket-productTemplate' into develop 2016-05-04 15:31:51 +02:00
Marion Muszynski
402ac44f49 slider blockbestsellers in product page 2016-05-04 15:31:28 +02:00
Marion Muszynski
b88d79c1cc Merge branch 'ticket-fidelite' into develop 2016-05-03 15:58:00 +02:00
Marion Muszynski
c8fb4bf96b petite modif 2016-05-03 15:57:35 +02:00
Marion Muszynski
13bcd0d8c6 Merge branch 'ticket-fidelite' into develop 2016-05-03 15:48:39 +02:00
Marion Muszynski
831cdefdf8 modif translation 2016-05-03 15:48:17 +02:00
Marion Muszynski
2a10c6a2fe fix conflict in css 2016-05-03 15:40:01 +02:00
Marion Muszynski
63db0cc73c adding in blocuserinfo 2016-05-03 15:38:20 +02:00
Marion Muszynski
b7f2c64d64 Merge branch 'tiket-productTemplate' into develop 2016-05-03 15:04:27 +02:00
Marion Muszynski
60cb1752c7 modif tpl product mobile 2016-05-03 15:03:54 +02:00
Thibault UBUNTU
80206ad452 Merge branch 'paypal_billing' into develop 2016-05-03 12:09:10 +02:00
Thibault UBUNTU
25bf39f711 trad es 2016-05-03 12:08:55 +02:00
Marion Muszynski
e69dd75074 Merge branch 'tiket-productTemplate' into develop 2016-05-02 17:49:43 +02:00
Marion Muszynski
77f391e66d Merge branch 'ticket-fidelite' into develop 2016-05-02 17:48:42 +02:00
Marion Muszynski
bf39d6aa82 modif css 2016-05-02 17:48:16 +02:00
Marion Muszynski
388a6bfc10 modif css 2016-05-02 17:46:53 +02:00
Marion Muszynski
f1a4d79daf Merge branch 'tiket-productTemplate' into develop 2016-05-02 17:20:51 +02:00
Marion Muszynski
990ddefe16 border radius add to cart 2016-05-02 17:20:18 +02:00
Thibault UBUNTU
7e778b24b6 Merge branch 'paypal_billing' into develop 2016-05-02 16:01:44 +02:00
Thibault UBUNTU
23c26bf0ee back to account mobile 2016-05-02 16:01:29 +02:00
Thibault UBUNTU
e1b79f1d23 fix conflit 2016-05-02 15:31:24 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Marion Muszynski
73ceb55254 fix conflict site_mobile css 2016-05-02 15:23:47 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
75bf1e0ec4 Merge branch 'tiket-productTemplate' into develop 2016-04-29 16:15:04 +02:00
Marion Muszynski
2033c1e937 update flag position 2016-04-29 16:14:41 +02:00
Marion Muszynski
5da6bd1c3f Merge branch 'tiket-productTemplate' into develop 2016-04-29 16:04:45 +02:00
Marion Muszynski
f4597e397e modif flag expe in product tpl 2016-04-29 16:04:17 +02:00
Marion Muszynski
fd7e18fc32 Merge branch 'tiket-productTemplate' into develop 2016-04-27 16:35:32 +02:00
Marion Muszynski
9f104f2c8f modif tpl product 2016-04-27 16:35:02 +02:00
Marion Muszynski
baee8d8c10 Merge branch 'ticket-fidelite' into develop 2016-04-27 16:25:03 +02:00
Marion Muszynski
73a43c2042 modif tpl product 2016-04-27 16:24:35 +02:00
Marion Muszynski
95b51d3389 fix conflict css 2016-04-27 16:13:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
b3e4aa78ab Merge branch 'tiket-productTemplate' into develop 2016-04-26 17:06:40 +02:00
Marion Muszynski
20beed5ed7 modif css 2016-04-26 17:06:16 +02:00
Marion Muszynski
3a5edf328a Merge branch 'tiket-productTemplate' into develop 2016-04-26 17:02:11 +02:00
Marion Muszynski
2217bf5414 modif tpl 2016-04-26 17:01:44 +02:00
Marion Muszynski
b294276498 Merge branch 'tiket-productTemplate' into develop 2016-04-26 16:52:26 +02:00
Marion Muszynski
e85ce5fb93 modif next for thumb 2016-04-26 16:52:04 +02:00
Marion Muszynski
3aa40ff214 Merge branch 'tiket-productTemplate' into develop 2016-04-26 16:43:52 +02:00
Marion Muszynski
82a536aa5f modif tpl 2016-04-26 16:43:28 +02:00
Marion Muszynski
02fe6acca8 Merge branch 'tiket-productTemplate' into develop 2016-04-26 16:39:22 +02:00
Marion Muszynski
5b40878629 modif tpl 2016-04-26 16:39:06 +02:00
Marion Muszynski
21f418dd84 fix confict css 2016-04-26 16:22:26 +02:00
Marion Muszynski
cbf6deeb91 begin new product tpl 2016-04-26 16:19:40 +02:00
Marion Muszynski
423b9fbcc0 Merge branch 'ticket-fidelite' into develop 2016-04-25 16:05:33 +02:00
Marion Muszynski
c4052dc0f0 modif css mobile 2016-04-25 16:04:51 +02:00
Marion Muszynski
6926224b43 Merge branch 'ticket-fidelite' into develop 2016-04-25 12:45:37 +02:00
Marion Muszynski
be4026ba1a modif tpl 2016-04-25 12:45:13 +02:00
Marion Muszynski
bd74ed03d7 Merge branch 'ticket-fidelite' into develop 2016-04-22 16:31:11 +02:00
Marion Muszynski
cd742921f3 update tpl 2016-04-22 16:30:18 +02:00
Marion Muszynski
d3f7d66f95 fix conflict css 2016-04-21 17:44:16 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
02bff329ca Merge branch 'ticket-fidelite' into develop 2016-04-21 12:01:36 +02:00
Marion Muszynski
15f3b6fa20 modif tpl 2016-04-21 12:01:10 +02:00
Marion Muszynski
042d42d578 Merge branch 'ticket-fidelite' into develop 2016-04-21 11:32:06 +02:00
Marion Muszynski
c8befd1ede total modification of loyalty module 2016-04-21 11:14:33 +02:00
Thibault UBUNTU
6827513a88 Merge branch 'paypal_billing' into develop 2016-04-20 17:39:02 +02:00
Thibault UBUNTU
fa60d253e8 box paypal 2016-04-20 17:38:57 +02:00
Thibault UBUNTU
3cd9af191d Merge branch 'paypal_billing' into develop 2016-04-20 17:35:17 +02:00
Thibault UBUNTU
bbee57249a version mobile 2016-04-20 17:35:03 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
fd5bccadd7 begin loyalty 2016-04-20 15:33:56 +02:00
Thibault UBUNTU
c37df06d47 add reassurance text 2016-04-20 15:32:12 +02:00
Thibault UBUNTU
6512b4aaaa Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-04-20 14:20:40 +02:00