Michael RICOIS
|
5980a64743
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-26 12:45:37 +01:00 |
|
Michael RICOIS
|
197f4161d1
|
Add New Import
|
2018-02-26 11:46:03 +01:00 |
|
David
|
e10b13392d
|
Merge branch 'ticket-15629-new-landing' into develop
|
2018-02-23 18:48:15 +01:00 |
|
David
|
89f3aff521
|
image cache invalidation
breadcrumb visible on error
|
2018-02-23 18:46:48 +01:00 |
|
Michael RICOIS
|
094f382eb5
|
Enhance customer search for discount
|
2018-02-23 16:12:06 +01:00 |
|
Michael RICOIS
|
96352f3042
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:36:35 +01:00 |
|
Michael RICOIS
|
d307e50f7f
|
Get back to date_upd
|
2018-02-23 12:19:46 +01:00 |
|
Michael RICOIS
|
71d44a1eb6
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:11:05 +01:00 |
|
Michael RICOIS
|
a09de51ac2
|
Reset date_upd
|
2018-02-23 12:10:14 +01:00 |
|
Michael RICOIS
|
b87e937fbc
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-23 11:38:11 +01:00 |
|
Michael RICOIS
|
78ec506d8b
|
Change detection of complete order refund, and change state of order
|
2018-02-23 11:22:14 +01:00 |
|
Michael RICOIS
|
2cdfbdb833
|
Date update only if it's a thread
|
2018-02-22 17:56:47 +01:00 |
|
Michael RICOIS
|
cf142b7071
|
CS
|
2018-02-22 17:54:49 +01:00 |
|
Michael RICOIS
|
9fd729310a
|
Merge branch 'fix/imageResize' into develop
|
2018-02-22 16:24:06 +01:00 |
|
Michael RICOIS
|
a4edf0dbc1
|
Image lib
|
2018-02-22 16:23:41 +01:00 |
|
Michael RICOIS
|
57d8bc52c6
|
Merge branch 'fix/imageResize' into develop
|
2018-02-22 15:55:42 +01:00 |
|
Michael RICOIS
|
b5307d448a
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-22 15:54:47 +01:00 |
|
Michael RICOIS
|
06413abad5
|
Fix var
|
2018-02-22 15:54:25 +01:00 |
|
Michael RICOIS
|
3497ca7675
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-21 17:12:36 +01:00 |
|
Michael RICOIS
|
c3b0dafacf
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-02-21 17:02:03 +01:00 |
|
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
|
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
|
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
|
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
|
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 |
|