Michael RICOIS
|
71d44a1eb6
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:11:05 +01:00 |
|
Michael RICOIS
|
2cdfbdb833
|
Date update only if it's a thread
|
2018-02-22 17:56:47 +01:00 |
|
Michael RICOIS
|
3497ca7675
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-21 17:12:36 +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
|
89bc626e0c
|
Merge branch 'ticket-15629-new-landing' into develop
# Conflicts:
# modules/invite/invite.php
|
2018-02-20 11:01:43 +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 |
|
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 |
|
David
|
674d095cf0
|
Added file field in admin form
Finished page integration
|
2018-02-16 15:52:35 +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
|
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
|
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 |
|
Michael RICOIS
|
f512725399
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-13 17:42:16 +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
|
31047b7014
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-13 12:44:55 +01:00 |
|
Michael RICOIS
|
7a207b2010
|
CS
|
2018-02-13 12:42:39 +01:00 |
|
Michael RICOIS
|
5d8b7ba155
|
Oups
|
2018-02-13 10:41:59 +01:00 |
|
Michael RICOIS
|
c4de0d3e8e
|
Oups
|
2018-02-13 09:56:36 +01:00 |
|
Michael RICOIS
|
3851c2e70f
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-12 17:06:59 +01:00 |
|
Michael RICOIS
|
3f1d411ce6
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-12 17:05:19 +01:00 |
|
Michael RICOIS
|
6aebf9206a
|
Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal' into develop
|
2018-02-12 11:58:09 +01:00 |
|
Michael RICOIS
|
54781041ee
|
Merge branch 'ticket/r15782-stats'
|
2018-02-06 16:48:32 +01:00 |
|
Michael RICOIS
|
e22919778d
|
Merge branch 'ticket/r15782-stats' into develop
|
2018-02-06 16:48:04 +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
|
de3d84758a
|
Merge branch 'ticket/r15782-stats' into develop
|
2018-02-06 15:42:35 +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
|
b59f0e70b1
|
Merge remote-tracking branch 'origin/ticket/r15782-stats' into develop
|
2018-02-06 15:21:35 +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
|
e02ddd8dee
|
Merge branch 'ticket/r15782-stats' into develop
|
2018-02-06 14:48:36 +01:00 |
|
Michael RICOIS
|
1e0baff8cd
|
https
|
2018-02-06 14:47:52 +01:00 |
|