Commit Graph

1614 Commits

Author SHA1 Message Date
Michael RICOIS
e54395e5d1 Include file from server 2018-03-13 12:02:24 +01:00
Michael RICOIS
2343304d25 Merge remote-tracking branch 'origin/ticket/r15109-math-captcha' 2018-03-12 09:50:53 +01:00
Michael RICOIS
ffe8c187e8 Merge remote-tracking branch 'origin/ticket/r16492-bulkupdate' 2018-03-12 09:48:05 +01:00
Michael RICOIS
2985b1ed4f Find tax when update 2018-03-09 12:41:14 +01:00
Michael RICOIS
62139fe9fd Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' 2018-03-08 17:36:23 +01:00
Michael RICOIS
ba7f3d2223 Test 2018-03-08 17:35:26 +01:00
Michael RICOIS
887c687dd1 Change dimension 2018-03-08 17:30:25 +01:00
Michael RICOIS
eed8873dc5 Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' 2018-03-08 16:42:47 +01:00
Michael RICOIS
cab5635c8f Test format image 2018-03-08 16:29:11 +01:00
Michael RICOIS
fc107f5d6d Merge branch 'ticket/r16348-credit-expired' 2018-03-08 14:59:05 +01:00
Michael RICOIS
490baf50f4 Clean 2018-03-08 14:57:54 +01:00
Michael RICOIS
1d5eb5ec97 New label 2018-03-08 14:54:52 +01:00
Michael RICOIS
c86f90f0eb Clean 2018-03-08 11:44:37 +01:00
Michael RICOIS
9edb325f22 Error message 2018-03-06 17:09:30 +01:00
Michael RICOIS
0b835a3af5 New button 2018-03-06 14:34:46 +01:00
Michael RICOIS
c658d0ec75 Use description_short as description 2018-03-06 10:42:58 +01:00
Michael RICOIS
e7551ef018 session_start 2018-03-06 10:33:14 +01:00
Michael RICOIS
4a63488b51 Style 2018-03-05 17:28:11 +01:00
Michael RICOIS
2c870b56f4 Add captcha 2018-03-05 17:05:47 +01:00
Michael RICOIS
d7cce43d8f Merge branch 'ticket/r14810-dropshipping-tracking' 2018-03-05 12:59:56 +01:00
Michael RICOIS
633c8e77e4 Merge remote-tracking branch 'origin/fix/mobile_detect' 2018-03-05 12:59:15 +01:00
Michael RICOIS
322c019c5c Merge remote-tracking branch 'origin/ticket/r16159-customer-message' 2018-03-05 09:49:15 +01:00
Michael RICOIS
97f8d56b5e Update Mobile_Detect to version 2.8.31 2018-03-02 16:44:00 +01:00
Michael RICOIS
056d5a9f3f Country display 2018-03-02 10:44:07 +01:00
Michael RICOIS
9e010d63d6 Typo 2018-03-01 16:27:27 +01:00
Michael RICOIS
45d340ac64 Reset global value 2018-02-28 17:37:15 +01:00
Michael RICOIS
92415523d0 Merge branch 'ticket/r16112-display-credit' 2018-02-28 11:27:53 +01:00
Michael RICOIS
af201001f1 Display credit on standard customer 2018-02-28 11:14:09 +01:00
Michael RICOIS
5a6ff9c962 Remove credit expired 2018-02-27 17:48:02 +01:00
Michael RICOIS
95ff7a4323 Merge branch 'ticket/r16345-lang' 2018-02-27 16:18:11 +01:00
Michael RICOIS
63e1e1eae5 Merge branch 'ticket/r16112-display-credit' 2018-02-27 16:17:18 +01:00
Michael RICOIS
427258606c CS 2018-02-27 14:36:05 +01:00
Michael RICOIS
563bd0c7df Change display 2018-02-27 10:44:27 +01:00
Michael RICOIS
7cea4e23ba Language 2018-02-26 16:13:35 +01:00
Michael RICOIS
73563b0ca8 Remove .hg 2018-02-26 15:30:58 +01:00
Michael RICOIS
2cdfbdb833 Date update only if it's a thread 2018-02-22 17:56:47 +01:00
Michael RICOIS
48f2940d2d Merge branch 'ticket-14739-PackLogistic' 2018-02-22 09:35:41 +01:00
Michael RICOIS
d303a06b7e Merge branch 'ticket/r15587-refund-paypal' 2018-02-21 17:21:32 +01:00
Michael RICOIS
7163d60447 Detect if is a full refund 2018-02-21 16:42:43 +01:00
Michael RICOIS
af4f1270c8 Merge branch 'ticket/r15587-refund-paypal' 2018-02-21 14:54:23 +01:00
Michael RICOIS
8c24fe9fc6 Display items refund 2018-02-21 14:53:13 +01:00
Michael RICOIS
f82639ca09 Save refund message and transaction for shipping cost 2018-02-21 13:04:53 +01:00
Michael RICOIS
395aa0cd8a Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal' 2018-02-21 09:43:41 +01:00
Michael RICOIS
2a1c162040 Reload ajax page after submit 2018-02-20 15:46:42 +01:00
Michael RICOIS
f7a4656e9d Update libs multiselect 2018-02-20 14:41:46 +01:00
David
eba305a933 Merge branch 'ticket-14436-excel-format' 2018-02-20 12:00:35 +01:00
David
0c1e1a7b21 git export management 2018-02-20 11:46:34 +01:00
David
7f8f72089a Merge branch 'ticket-14436-excel-format' 2018-02-20 11:34:20 +01:00
David
88d1284171 Added new calculation for best sales 2018-02-14 18:53:23 +01:00
Michael RICOIS
1903c42573 Enable/Disable credit display 2018-02-14 14:54:13 +01:00