Marion Muszynski
|
15cb213c18
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-22 17:12:01 +01:00 |
|
Marion Muszynski
|
e9aec9809c
|
opening in blockuserinfo
|
2017-03-22 17:11:46 +01:00 |
|
Marion Muszynski
|
45e607b627
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-22 17:00:55 +01:00 |
|
Marion Muszynski
|
53946880d9
|
opening to es version
|
2017-03-22 17:00:37 +01:00 |
|
Marion Muszynski
|
241e91c05b
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-03-21 16:29:36 +01:00 |
|
Marion Muszynski
|
2233093d7e
|
Mr fancy box css modif
|
2017-03-21 16:29:14 +01:00 |
|
Marion Muszynski
|
bb4e4c8249
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 15:46:02 +01:00 |
|
Marion Muszynski
|
647a917f7d
|
fix js id_category change
|
2017-03-21 15:45:45 +01:00 |
|
Marion Muszynski
|
62794cd4bc
|
fix conflicts
|
2017-03-21 15:17:25 +01:00 |
|
Marion Muszynski
|
c919001821
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:57:41 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
f0850ce461
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:54:27 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|
Marion Muszynski
|
bb9c991c2d
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:45:00 +01:00 |
|
Marion Muszynski
|
ac57693101
|
fix css
|
2017-03-21 14:44:39 +01:00 |
|
Marion Muszynski
|
7688c352e2
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:43:05 +01:00 |
|
Marion Muszynski
|
caa8a7a54f
|
fix size
|
2017-03-21 14:42:44 +01:00 |
|
Marion Muszynski
|
2e3d56135e
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:40:02 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
0aef5e434f
|
fix conflicts
|
2017-03-21 13:29:38 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
6b4b4c59ae
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-21 11:22:44 +01:00 |
|
Marion Muszynski
|
db43bc59df
|
modification of instructions
|
2017-03-21 11:22:28 +01:00 |
|
Marion Muszynski
|
f7cef155e6
|
Merge branch 'ticket-12804-CacheFooter'
|
2017-03-21 10:52:58 +01:00 |
|
Marion Muszynski
|
8fe32a145b
|
Merge branch 'ticket-12804-CacheFooter' into develop
|
2017-03-21 10:50:11 +01:00 |
|
Marion Muszynski
|
b7e014f924
|
fix https
|
2017-03-21 10:49:56 +01:00 |
|
Marion Muszynski
|
b23f1a0fa0
|
Merge branch 'ticket-12804-CacheFooter' into develop
|
2017-03-21 10:47:13 +01:00 |
|
Marion Muszynski
|
5aae2a217f
|
moving from ps cache to saved data in txt
|
2017-03-21 10:46:54 +01:00 |
|
Marion Muszynski
|
0cd71bde80
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 15:11:41 +01:00 |
|
Marion Muszynski
|
b343fc4666
|
fix ps_url paiement.php paybox
|
2017-03-09 15:11:22 +01:00 |
|
Marion Muszynski
|
8084e3cf36
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:48:53 +01:00 |
|
Marion Muszynski
|
862850afa1
|
fix facebook link
|
2017-03-09 12:48:38 +01:00 |
|
Marion Muszynski
|
06e546dfae
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:35:16 +01:00 |
|
Marion Muszynski
|
0b969badd1
|
fix protocol in paybox module
|
2017-03-09 12:35:04 +01:00 |
|
Marion Muszynski
|
b28f3dbd7e
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:17:21 +01:00 |
|
Marion Muszynski
|
fefd5442ac
|
fix protocol in soflexibilite module
|
2017-03-09 12:17:04 +01:00 |
|
Marion Muszynski
|
61ec78cab3
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:54:39 +01:00 |
|
Marion Muszynski
|
85b5bb049d
|
fix console log
|
2017-03-09 11:53:55 +01:00 |
|
Marion Muszynski
|
e87b0ce97b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:45:02 +01:00 |
|
Marion Muszynski
|
c73143d5b5
|
fix https in skinStatic module
|
2017-03-09 11:44:41 +01:00 |
|
Marion Muszynski
|
d847224f01
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:38:01 +01:00 |
|
Marion Muszynski
|
33cd9f3d08
|
continuation
|
2017-03-09 11:37:44 +01:00 |
|
Marion Muszynski
|
4823dd518b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:07:29 +01:00 |
|
Marion Muszynski
|
52a3477a1e
|
fix //static
|
2017-03-09 11:07:11 +01:00 |
|
Marion Muszynski
|
ba2adf4ec8
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:00:36 +01:00 |
|
Marion Muszynski
|
1bd2edfe4d
|
other fix getpagelink
|
2017-03-09 11:00:20 +01:00 |
|
Marion Muszynski
|
b38e5c87ab
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 10:54:11 +01:00 |
|
Marion Muszynski
|
f1e3151dac
|
fix ssl
|
2017-03-09 10:53:26 +01:00 |
|
Marion Muszynski
|
e9b9f368a1
|
Merge branch 'ticket-12659-PrintEan'
|
2017-03-09 10:36:14 +01:00 |
|
Marion Muszynski
|
bac4ebbbc2
|
modif with addition of product name and attribute name
|
2017-03-09 10:35:56 +01:00 |
|