823 Commits

Author SHA1 Message Date
Michael RICOIS
dcf683e949 Test 2017-08-30 15:59:31 +02:00
Michael RICOIS
4d1f0bbbf9 Replace image 2017-08-08 09:27:58 +02:00
Michael RICOIS
7e66761e52 Merge remote-tracking branch 'origin/ticket/r13541-h5div' 2017-07-21 09:35:44 +02:00
Michael RICOIS
bcb2c2f5a5 Authorization 2017-07-11 14:28:07 +02:00
Michael RICOIS
8de3efa44d Replace Api Token by Authorization 2017-07-11 14:22:11 +02:00
Michael RICOIS
9247e48096 Typo 2017-07-11 14:21:40 +02:00
ToutPratique
26b5a6a3ad fix product-list 2017-06-29 12:49:17 +02:00
Michael RICOIS
6d8090d708 Close div 2017-06-22 11:49:04 +02:00
Michael RICOIS
6950fdaf14 h5 to div 2017-06-22 11:43:09 +02:00
Michael RICOIS
d430d73bcd Revert "Newsletter H5 to div"
This reverts commit 9452a93d641d78065aabc91e7e4c873e33b55d39.
2017-06-22 10:32:14 +02:00
Michael RICOIS
7c8e4b5314 Revert "Newsletter h5 to div"
This reverts commit 951ba2791331364e1d29b3d02403f6c936bfd6c9.
2017-06-22 10:32:11 +02:00
Michael RICOIS
6ba413fd18 Revert "CSS"
This reverts commit ac3b1c638fda2a23f9038f445e913e29cb3fb40c.
2017-06-22 10:30:56 +02:00
Michael
50e5ac74b7 Merge branch 'ticket/r13185-productpack' into 'master'
Ticket/r13185 productpack

See merge request !15
2017-06-20 10:02:04 +02:00
Michael
07e0cbeaf9 Merge branch 'ticket/r13457-flag-new-product' into 'master'
Ticket/r13457 flag new product

See merge request !14
2017-06-20 10:00:59 +02:00
Michael
2cb1f2c30e Merge branch 'ticket/r13360-validate-email' into 'master'
Ticket/r13360 validate email

See merge request !13
2017-06-20 09:58:24 +02:00
Michael RICOIS
5b8377f936 Check before merge 2017-06-20 09:46:28 +02:00
Michael RICOIS
ac3b1c638f CSS 2017-06-15 16:19:38 +02:00
Michael RICOIS
951ba27913 Newsletter h5 to div 2017-06-15 16:08:59 +02:00
Michael RICOIS
9452a93d64 Newsletter H5 to div 2017-06-15 16:04:39 +02:00
Romu
59e2be81e4 css 2017-06-15 01:14:25 -07:00
Romu
ec1e33bcb7 css 2017-06-15 01:01:18 -07:00
Romu
4c0bc31577 css 2017-06-15 00:58:06 -07:00
Michael RICOIS
b5f083a63a New regex to validate email 2017-06-13 11:41:14 +02:00
Michael RICOIS
b7c11c5ae5 h5 to h2 on product (category "marque") 2017-06-13 10:25:08 +02:00
Romu
1cd90dd595 label promo 2017-06-13 01:18:47 -07:00
Michael RICOIS
e5e0c9575b Delete price product on pack 2017-06-13 10:11:54 +02:00
Romu
95af59f476 skin nouveau fiche produit 2017-06-13 00:59:36 -07:00
Michael RICOIS
1febb99865 Add preg_match (emailregex.com) to better email validation 2017-06-06 17:07:55 +02:00
Michael RICOIS
8381e4a407 Fix error 500 - Product 2017-06-06 15:44:41 +02:00
Michael RICOIS
da073e3da1 Add set_time_limit(600) 2017-06-06 15:05:37 +02:00
Michael
0777852615 Merge branch 'ticket/r13253-module-upela' into 'master'
Ticket/r13253 module upela

See merge request !11
2017-06-06 15:04:35 +02:00
Michael
4561da74fd Merge branch 'ticket/r13185-product-new' into 'master'
Ticket/r13185 product new

See merge request !10
2017-06-06 15:02:54 +02:00
Michael RICOIS
59e057bccc Ticket r13417 - change max_execution_time 2017-06-06 10:30:38 +02:00
Michael RICOIS
dc9199e255 Merge branch 'ticket/r13253-module-upela' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into ticket/r13253-module-upela 2017-06-01 15:02:06 +02:00
Michael RICOIS
166361c3fa Add module Upela 2017-06-01 15:01:40 +02:00
Michael RICOIS
12b56d401a Merge remote-tracking branch 'origin/master' into develop 2017-06-01 14:59:59 +02:00
Michael RICOIS
650a9eff67 Add module Upela 2017-06-01 14:49:31 +02:00
Michael RICOIS
632379a2a0 Be sure div only display on CMS page (ticket/r13361) 2017-05-29 14:38:10 +02:00
Rémy
39a6557714 suppression margin-bottom sur h1 catégorie 2017-05-29 10:18:28 +02:00
Rémy
b7b4865353 prix en baisse et nouveautés sur product list 2017-05-26 16:09:33 +02:00
ToutPratique
9dd16f8b65 remove one file js voting 2017-05-26 15:19:11 +02:00
ToutPratique
b5fc8defed remove one js file 2017-05-26 15:18:35 +02:00
ToutPratique
54b55fbd6b optim image 2017-05-26 12:37:54 +02:00
ToutPratique
13632959bb remove tags 2017-05-26 10:23:40 +02:00
Michael RICOIS
907eb96440 Merge branch 'ticket/r13185-product-new' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into ticket/r13185-product-new 2017-05-18 10:11:14 +02:00
Michael RICOIS
cac71f077f Fix texte on failling product 2017-05-18 10:10:52 +02:00
Michael RICOIS
c6fe06e24b Fix texte on failling product 2017-05-18 10:09:27 +02:00
Michael RICOIS
93f24be05a Merge branch 'master' into develop 2017-05-18 10:05:56 +02:00
Michael RICOIS
fca769f29b Merge remote-tracking branch 'origin/ticket/r13185-product-new' into develop 2017-05-17 17:52:07 +02:00
Michael RICOIS
d588f03f92 Change label 2017-05-17 16:16:11 +02:00