root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Marion Muszynski
|
508cf3359e
|
Merge branch 'ticket-14231-inteMobile'
|
2017-10-13 11:19:28 +02:00 |
|
Marion Muszynski
|
9823ff1d0b
|
inte order detail mobile
|
2017-10-13 11:17:27 +02:00 |
|
Marion Muszynski
|
b698be44f9
|
Merge branch 'ticket-14486-MRinvoice'
|
2017-10-12 15:05:04 +02:00 |
|
Marion Muszynski
|
ff34c7b32e
|
add mr and dropshipping sended check for invoice
|
2017-10-12 15:03:08 +02:00 |
|
Marion Muszynski
|
13843bc270
|
integration for white bg
|
2017-10-12 13:58:41 +02:00 |
|
Marion Muszynski
|
1bc46e9610
|
Merge branch 'ticket-14447-AF'
|
2017-10-12 10:01:13 +02:00 |
|
Marion Muszynski
|
8d0392bd44
|
fix pink color
|
2017-10-12 09:57:46 +02:00 |
|
Marion Muszynski
|
8b9c4b4812
|
Merge branch 'ticket-14460-BugReturnProcess'
|
2017-10-11 16:18:58 +02:00 |
|
Marion Muszynski
|
5600a6da36
|
fix returnable qty
|
2017-10-11 16:14:59 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|
Marion Muszynski
|
1e0b72be2c
|
Merge branch 'ticket-14392-BugUploadImg'
|
2017-10-10 15:29:49 +02:00 |
|
Marion Muszynski
|
bd9cdc9cad
|
add button to clean image positions
|
2017-10-10 15:29:25 +02:00 |
|
Marion Muszynski
|
c7053872c7
|
Merge branch 'ticket-14402-LimitCaractForAddress'
|
2017-10-09 16:00:31 +02:00 |
|
Marion Muszynski
|
e7af6fd655
|
limit address characters
|
2017-10-09 16:00:13 +02:00 |
|
Marion Muszynski
|
2575b6ffee
|
Merge branch 'ticket-updateTracking'
|
2017-10-04 18:00:06 +02:00 |
|
Marion Muszynski
|
61865a956c
|
fix style
|
2017-10-04 17:59:51 +02:00 |
|
Marion Muszynski
|
842315f516
|
Merge branch 'ticket-updateTracking'
|
2017-10-04 17:55:48 +02:00 |
|
Marion Muszynski
|
4d5dd0a75d
|
fix front
|
2017-10-04 17:55:35 +02:00 |
|
Marion Muszynski
|
d636934b5a
|
Merge branch 'ticket-frederic-updateStock'
|
2017-10-04 16:54:40 +02:00 |
|
Marion Muszynski
|
529b36298a
|
refont stat log
|
2017-10-04 16:54:25 +02:00 |
|
Marion Muszynski
|
6e95bd6d4d
|
Merge branch 'update-CreationCat'
|
2017-10-04 15:36:47 +02:00 |
|
Marion Muszynski
|
ab39a55b63
|
change trad
|
2017-10-04 15:36:36 +02:00 |
|
Marion Muszynski
|
e3b752ba76
|
Merge branch 'update-CreationCat'
|
2017-10-04 15:35:28 +02:00 |
|
Marion Muszynski
|
f7057346be
|
add creation category in adminprivatesalesale
|
2017-10-04 13:25:32 +02:00 |
|
Marion Muszynski
|
8627c2f53c
|
Merge branch 'fix-messageClient'
|
2017-10-04 12:59:08 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +02:00 |
|
Marion Muszynski
|
504721d8c0
|
Merge branch 'ticket-14392-BugUploadImg'
|
2017-10-04 11:08:23 +02:00 |
|
Marion Muszynski
|
d762e3e613
|
fix delete thumb image when uploading image cat
|
2017-10-04 11:06:59 +02:00 |
|
Michael RICOIS
|
c48408c2db
|
Add new value to detect full refund
|
2017-10-02 17:00:14 +02:00 |
|
Michael RICOIS
|
fe15bbc6cd
|
New voucher after refund
|
2017-10-02 17:00:13 +02:00 |
|
Marion Muszynski
|
c5db353391
|
fix sale conbination
|
2017-10-02 13:24:15 +02:00 |
|
Marion Muszynski
|
0b1f29d56f
|
Merge branch 'fix-uncombinable'
|
2017-10-02 12:49:54 +02:00 |
|
Marion Muszynski
|
6b2e8deea1
|
fix and addition
|
2017-10-02 12:49:45 +02:00 |
|
Marion Muszynski
|
2e70a3fcf0
|
Merge branch 'fix-uncombinable'
|
2017-10-02 12:41:12 +02:00 |
|
Marion Muszynski
|
e12e7616d7
|
fix when is same sale
|
2017-10-02 12:41:00 +02:00 |
|
Marion Muszynski
|
e451deb36c
|
Merge branch 'ticket-10170-CssandJsMinification'
|
2017-09-29 15:55:09 +02:00 |
|
Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
Marion Muszynski
|
4af060a724
|
fix
|
2017-09-28 16:50:03 +02:00 |
|
root
|
115b1b5f61
|
fix cron
|
2017-09-28 16:45:54 +02:00 |
|
Marion Muszynski
|
f2b5face0a
|
Merge branch 'ticket-imgMobile'
|
2017-09-28 15:38:16 +02:00 |
|
Marion Muszynski
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
4b4a6d9f17
|
Merge branch 'fix-functions'
|
2017-09-28 10:40:16 +02:00 |
|
Marion Muszynski
|
7b97517690
|
fix extending save function
|
2017-09-28 10:39:08 +02:00 |
|
Marion Muszynski
|
1e4d91baec
|
Merge branch 'ticket-14301-ErrorApiPaypal'
|
2017-09-27 16:01:37 +02:00 |
|
Marion Muszynski
|
695cd7740c
|
fix direct payment paypal
|
2017-09-27 16:00:08 +02:00 |
|