Srv Privilege de marque
|
07f5841490
|
13388 - add cartsguru define
|
2017-05-31 15:50:01 +02:00 |
|
Rodney Figaro
|
a11116d493
|
13387 - fix cache with connected customer with groups
|
2017-05-31 15:04:39 +02:00 |
|
Srv Privilege de marque
|
8fc90b3f7e
|
add optimisation in theme/img, in js, fix clearcache in privatesales
|
2017-05-31 14:49:06 +02:00 |
|
Rodney Figaro
|
b5ecc2fff3
|
Merge branch 'ticket/r12613-optimisation-perfs'
|
2017-05-31 11:42:37 +02:00 |
|
Rodney Figaro
|
55b49e087c
|
Merge branch 'ticket/r12613-optimisation-perfs' into dev
|
2017-05-31 11:14:58 +02:00 |
|
Rodney Figaro
|
c35cc6824a
|
12613 - load ant_popover.js, fastclick.js and ganalytics.js async
|
2017-05-31 11:14:50 +02:00 |
|
Rodney Figaro
|
164deae8d5
|
Merge branch 'ticket/r13330-2-default-group-importcsv'
|
2017-05-30 17:03:57 +02:00 |
|
Rodney Figaro
|
b0e4e396e0
|
Merge branch 'ticket/r13330-2-default-group-importcsv' into dev
|
2017-05-30 17:03:42 +02:00 |
|
Rodney Figaro
|
fae7dc65a7
|
13330 - add 2 new default group when adding new category (in Category object)
|
2017-05-30 17:03:31 +02:00 |
|
Rodney Figaro
|
a013c267d7
|
Merge branch 'ticket/r12613-optimisation-perfs' into dev
|
2017-05-30 15:54:14 +02:00 |
|
Rodney Figaro
|
aac5a862b4
|
12613 - fs cache private sales home and homecat
|
2017-05-30 15:54:01 +02:00 |
|
Rodney Figaro
|
46462883bb
|
Merge branch 'fix_banner_sales' into dev
|
2017-05-29 17:38:07 +02:00 |
|
Rodney Figaro
|
edc744f5d5
|
fix warnings in private sales home (in "Démarque en vrac")
|
2017-05-29 17:37:53 +02:00 |
|
Rodney Figaro
|
d721f5dd43
|
Merge branch 'ticket/r13365-bug-prix-popup' into dev
|
2017-05-29 17:30:00 +02:00 |
|
Rodney Figaro
|
22644d8798
|
13365 - fix salecore metho getDeliveryDateRangeForProduct
|
2017-05-29 17:29:38 +02:00 |
|
Rodney Figaro
|
47406663d9
|
Merge branch 'ticket/r13365-bug-prix-popup' into dev
|
2017-05-29 17:22:59 +02:00 |
|
Rodney Figaro
|
7c34b09597
|
13365 - fix prices displayed in cart popup
|
2017-05-29 17:22:23 +02:00 |
|
Rodney Figaro
|
41b76f783e
|
Merge branch 'hot_fix_admin_category' into dev
|
2017-05-26 12:20:59 +02:00 |
|
Rodney Figaro
|
24c6105024
|
fix category parent, category tree disabled when adding a new category with error (caused the category to be affected to "root"
|
2017-05-26 12:20:46 +02:00 |
|
Rodney Figaro
|
45a35aef5c
|
Merge branch 'ticket/r13344-trackin-lien-desabo-newsletter' into dev
|
2017-05-23 18:35:08 +02:00 |
|
Rodney Figaro
|
24d51f825a
|
13344 - add tracking unsubscribing link
|
2017-05-23 18:34:59 +02:00 |
|
Rodney Figaro
|
47f90e546f
|
Merge branch 'ticket/r13330-sale-default-groups'
|
2017-05-23 18:28:32 +02:00 |
|
Rodney Figaro
|
095a2fece2
|
Merge branch 'ticket/r13341-remove-button-in-lostpassword' into dev
|
2017-05-23 18:26:03 +02:00 |
|
Rodney Figaro
|
ce39e9d229
|
13341 - remove connect button in lost password
|
2017-05-23 18:25:55 +02:00 |
|
Rodney Figaro
|
0bf9da7b1c
|
Merge branch 'ticket/r13330-sale-default-groups' into dev
|
2017-05-23 18:12:53 +02:00 |
|
Rodney Figaro
|
832456769d
|
13330 - add pro and production web group by default in new private sale
|
2017-05-23 18:12:22 +02:00 |
|
Rodney Figaro
|
e10fec8c83
|
13330 - add defaut pro and production web categories and fix bug form
|
2017-05-23 18:00:38 +02:00 |
|
Rodney Figaro
|
ddde3b5dfd
|
Merge branch 'hotfix_paypal_tls' into dev
|
2017-05-19 14:53:12 +02:00 |
|
Rodney Figaro
|
65f19d26a4
|
Paypal TLS upgrade : verifypeer and verifyhost
|
2017-05-19 14:52:58 +02:00 |
|
Rodney Figaro
|
0bfc480eba
|
Merge branch 'ticket/r12317-slider-dates' into dev
|
2017-05-18 16:50:56 +02:00 |
|
Rodney Figaro
|
c52564a49f
|
12317 - add checking entered dates
|
2017-05-18 16:50:47 +02:00 |
|
Rodney Figaro
|
bb0269dae1
|
Merge branch 'ticket/r12317-slider-dates' into dev
|
2017-05-18 16:37:10 +02:00 |
|
Rodney Figaro
|
d8cf353fce
|
12317 - add number to dates labels in privatesales pref
|
2017-05-18 16:37:03 +02:00 |
|
Rodney Figaro
|
39b4bb121e
|
Merge branch 'ticket/r12317-slider-dates' into dev
|
2017-05-18 16:33:21 +02:00 |
|
Rodney Figaro
|
9eb27f0c5d
|
12317 - limit private slides between dates
|
2017-05-18 16:33:10 +02:00 |
|
Rodney Figaro
|
6bafe82030
|
12317 - add dates in privatesales slider
|
2017-05-18 13:09:07 +02:00 |
|
Rodney Figaro
|
46abff675b
|
Merge branch 'fix_mailjet_delete' into dev
|
2017-05-17 15:47:14 +02:00 |
|
Rodney Figaro
|
898e4a4041
|
13280 - change mailjet method delete email from all lists processing
|
2017-05-17 15:47:00 +02:00 |
|
Rodney Figaro
|
8226458cd0
|
Merge branch 'fix_blocked' into dev
|
2017-05-17 12:49:35 +02:00 |
|
Rodney Figaro
|
8acf967aa8
|
13244 - fix previous changes : blocked emails are only unsubscribed from their list (not removed) and not added to "desabonnes"
|
2017-05-17 12:49:11 +02:00 |
|
Rodney Figaro
|
d6c4cafc5d
|
Merge branch 'fix_blocked' into dev
|
2017-05-17 12:41:12 +02:00 |
|
Rodney Figaro
|
cdcd449ab0
|
13244 - keep blocked emails in DESABONNE list
|
2017-05-17 12:40:49 +02:00 |
|
Rodney Figaro
|
45823d245a
|
Merge branch 'ticket/r13244-cron-mailjet-cleanup'
|
2017-05-17 12:02:05 +02:00 |
|
Rodney Figaro
|
04cb5b7f1b
|
Merge branch 'ticket/r13244-cron-mailjet-cleanup' into dev
|
2017-05-17 12:01:47 +02:00 |
|
Rodney Figaro
|
466041d15d
|
13244 - mailjet api : get emails from a given list, remove all emails in a given list
|
2017-05-17 12:01:34 +02:00 |
|
Rodney Figaro
|
ed966a8743
|
13280 - remove blocked contact from all lists
|
2017-05-16 18:16:59 +02:00 |
|
Rodney Figaro
|
7013a30cb3
|
13280 - does not add to "DESABONNE" when account deleted
|
2017-05-16 17:15:52 +02:00 |
|
Rodney Figaro
|
89ef13dbba
|
13244 - change "opener" to trihebdo
|
2017-05-15 16:49:32 +02:00 |
|
Rodney Figaro
|
efff5b133f
|
13244 - update mailjet lists through events and unsubscribing
|
2017-05-15 15:08:16 +02:00 |
|
Rodney Figaro
|
dbc6b8e762
|
fix bug in header with variables delivery_dates_*
|
2017-05-09 14:34:10 +02:00 |
|