Michael RICOIS
|
3644f8968e
|
Fix link
|
2018-02-21 16:59:59 +01:00 |
|
Michael RICOIS
|
16dd993a97
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-02-21 16:54:03 +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
|
2c9155bc00
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-21 14:53:45 +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
|
34c1132f0d
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-20 15:53:44 +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
|
9fdbcb6eb1
|
Merge branch 'ticket-14436-excel-format' into develop
|
2018-02-20 11:59:42 +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
|
2df3466462
|
Merge branch 'ticket-15629-new-landing' into develop
|
2018-02-20 11:10:57 +01:00 |
|
David
|
d89616320f
|
Removed useless link
|
2018-02-20 11:09:45 +01:00 |
|
David
|
89bc626e0c
|
Merge branch 'ticket-15629-new-landing' into develop
# Conflicts:
# modules/invite/invite.php
|
2018-02-20 11:01:43 +01:00 |
|
David
|
9e706f18d4
|
Image integration
|
2018-02-20 10:42:38 +01:00 |
|
David
|
33753fc289
|
Allow now the combo between invite / sponsor email in landingpage module
Fix on desktop
|
2018-02-19 20:02:23 +01:00 |
|
David
|
2df6c80619
|
Removed dead code
|
2018-02-19 11:54:31 +01:00 |
|
Michael RICOIS
|
8ba1eee6bb
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2018-02-19 11:53:42 +01:00 |
|
Michael RICOIS
|
538292d158
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-19 11:53:24 +01:00 |
|
David
|
9e3eb8d991
|
Merge branch 'ticket-15629-new-landing' into develop
|
2018-02-19 11:16:48 +01:00 |
|
David
|
b4894392cd
|
Remaining png extensions in the code have been removed
|
2018-02-19 10:57:58 +01:00 |
|
Michael RICOIS
|
013e705e94
|
Use date_add
|
2018-02-16 16:32:15 +01:00 |
|
David
|
674d095cf0
|
Added file field in admin form
Finished page integration
|
2018-02-16 15:52:35 +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
|
e992d084da
|
Merge branch 'ticket/r15225-redirect-mobile' into develop
|
2018-02-15 11:28:02 +01:00 |
|
Michael RICOIS
|
44e2c88319
|
rawurlencode
|
2018-02-15 11:27:33 +01:00 |
|
Michael RICOIS
|
300fd94cf4
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-02-15 10:35:27 +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 |
|
Michael RICOIS
|
ee3d947936
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2018-02-15 09:52:24 +01:00 |
|
Michael RICOIS
|
1540c973eb
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-02-15 09:51:48 +01:00 |
|
David
|
b98a8c9d4a
|
Merge branch 'ticket-14436-excel-format' into develop
|
2018-02-14 18:54:23 +01:00 |
|
David
|
88d1284171
|
Added new calculation for best sales
|
2018-02-14 18:53:23 +01:00 |
|
Michael RICOIS
|
2e26b7a8fb
|
Merge remote-tracking branch 'origin/ticket/r16108-test-sponsor' into develop
|
2018-02-14 17:14:58 +01:00 |
|
Michael RICOIS
|
c530d9324e
|
rawurlencode params
|
2018-02-14 17:07:37 +01:00 |
|
Michael RICOIS
|
775f373994
|
Merge branch 'ticket/r16112-display-credit' into develop
|
2018-02-14 14:54:39 +01:00 |
|
Michael RICOIS
|
1903c42573
|
Enable/Disable credit display
|
2018-02-14 14:54:13 +01:00 |
|
Michael RICOIS
|
36d74c72d8
|
Merge branch 'ticket/r16108-test-sponsor' into develop
|
2018-02-14 12:47:33 +01:00 |
|
Michael RICOIS
|
7b734c9b60
|
Remove samrtbanner error
|
2018-02-14 12:46:25 +01:00 |
|
Michael RICOIS
|
688adfedb4
|
Merge branch 'ticket/r16108-test-sponsor' into develop
|
2018-02-14 12:25:46 +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 |
|