Michael RICOIS
|
834fbe9348
|
Merge branch 'ticket/r14647-welcome-mail'
Conflicts:
.gitignore
mails/es/account.html
mails/es/account.txt
|
2018-02-22 09:41:10 +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
|
3644f8968e
|
Fix link
|
2018-02-21 16:59:59 +01:00 |
|
Michael RICOIS
|
870b8ab4d5
|
Change invite link
|
2018-02-21 16:53:15 +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 |
|
Michael RICOIS
|
713c316914
|
Merge remote-tracking branch 'origin/ticket/r16108-test-sponsor'
|
2018-02-15 11:31:23 +01:00 |
|
Michael RICOIS
|
3b2bbeed4c
|
Merge remote-tracking branch 'origin/ticket/r15225-redirect-mobile'
|
2018-02-15 11:31:00 +01:00 |
|
Michael RICOIS
|
44e2c88319
|
rawurlencode
|
2018-02-15 11:27:33 +01:00 |
|
Michael RICOIS
|
ad9ad9d1f1
|
Update Itunes link
|
2018-02-15 10:34:47 +01:00 |
|
Michael RICOIS
|
12a9b24cad
|
Invert link app store
|
2018-02-15 10:25:29 +01:00 |
|
Michael RICOIS
|
d6107bf198
|
Remove <br>
|
2018-02-15 10:13:22 +01:00 |
|
David
|
88d1284171
|
Added new calculation for best sales
|
2018-02-14 18:53:23 +01:00 |
|
Michael RICOIS
|
c530d9324e
|
rawurlencode params
|
2018-02-14 17:07:37 +01:00 |
|
Michael RICOIS
|
1903c42573
|
Enable/Disable credit display
|
2018-02-14 14:54:13 +01:00 |
|
Michael RICOIS
|
7b734c9b60
|
Remove samrtbanner error
|
2018-02-14 12:46:25 +01:00 |
|
Michael RICOIS
|
8ff1af50df
|
Test
|
2018-02-14 12:16:16 +01:00 |
|
Michael RICOIS
|
a348fd8328
|
Exchange order pack first, single after
|
2018-02-14 09:36:36 +01:00 |
|
Michael RICOIS
|
bb7d8d133d
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-13 17:42:41 +01:00 |
|
Michael RICOIS
|
ee76fb5feb
|
Display action
|
2018-02-13 17:35:12 +01:00 |
|
Michael RICOIS
|
4e88bd364a
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-13 16:46:08 +01:00 |
|
Michael RICOIS
|
fb61d8b1ad
|
id_order
|
2018-02-13 16:45:38 +01:00 |
|
Michael RICOIS
|
d818d7f8ab
|
Change mail template
|
2018-02-13 15:51:59 +01:00 |
|
Michael RICOIS
|
7a207b2010
|
CS
|
2018-02-13 12:42:39 +01:00 |
|
Michael RICOIS
|
3851c2e70f
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-12 17:06:59 +01:00 |
|
Michael RICOIS
|
dbbb5a7817
|
Merge remote-tracking branch 'origin/ticket/r15670-email'
|
2018-02-12 09:57:24 +01:00 |
|
Michael RICOIS
|
4baf6925ed
|
Merge remote-tracking branch 'origin/ticket/r15225-redirect-mobile'
|
2018-02-12 09:41:58 +01:00 |
|
Michael RICOIS
|
e2a9475ec7
|
Vérification modification du compte, erreur si un compte existe déjà
|
2018-02-09 11:49:12 +01:00 |
|
Michael RICOIS
|
f53dee8581
|
CS
|
2018-02-09 10:10:22 +01:00 |
|
Michael RICOIS
|
0d6e609448
|
CS
|
2018-02-09 10:03:42 +01:00 |
|
Michael RICOIS
|
b67de1c311
|
CS
|
2018-02-09 09:30:13 +01:00 |
|
Michael RICOIS
|
20fd85c5fb
|
email strtolower
|
2018-02-08 17:39:33 +01:00 |
|
Michael RICOIS
|
ca461979c4
|
Var email
|
2018-02-08 17:31:49 +01:00 |
|
Michael RICOIS
|
54781041ee
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 16:48:32 +01:00 |
|
Michael RICOIS
|
3cc9394547
|
Form name
|
2018-02-06 16:47:39 +01:00 |
|
Michael RICOIS
|
a3c2e56824
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 15:50:33 +01:00 |
|
Michael RICOIS
|
1097c2111e
|
Fix ajax / https
|
2018-02-06 15:41:39 +01:00 |
|
Michael RICOIS
|
cd1d3caeb6
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 15:23:05 +01:00 |
|
Michael RICOIS
|
75633bb6e2
|
Domain + https
|
2018-02-06 15:21:12 +01:00 |
|
Michael RICOIS
|
d3077cf244
|
Merge remote-tracking branch 'origin/ticket/r15782-stats'
|
2018-02-06 14:49:48 +01:00 |
|
Michael RICOIS
|
1e0baff8cd
|
https
|
2018-02-06 14:47:52 +01:00 |
|