Marion Muszynski
|
529b36298a
|
refont stat log
|
2017-10-04 16:54:25 +02:00 |
|
Marion Muszynski
|
ab39a55b63
|
change trad
|
2017-10-04 15:36:36 +02:00 |
|
Marion Muszynski
|
2a5b0712e9
|
Merge branch 'update-CreationCat' into develop
|
2017-10-04 13:25:50 +02:00 |
|
Marion Muszynski
|
f7057346be
|
add creation category in adminprivatesalesale
|
2017-10-04 13:25:32 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +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
|
97ec6492c6
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-02 13:24:32 +02:00 |
|
Marion Muszynski
|
c5db353391
|
fix sale conbination
|
2017-10-02 13:24:15 +02:00 |
|
Marion Muszynski
|
faff854953
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:50:22 +02:00 |
|
Marion Muszynski
|
6b2e8deea1
|
fix and addition
|
2017-10-02 12:49:45 +02:00 |
|
Marion Muszynski
|
20b2adc944
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:41:38 +02:00 |
|
Marion Muszynski
|
e12e7616d7
|
fix when is same sale
|
2017-10-02 12:41:00 +02:00 |
|
Marion Muszynski
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
Marion Muszynski
|
0462fda92b
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-28 16:50:18 +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
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
32ca734375
|
Merge branch 'fix-functions' into develop
|
2017-09-28 10:39:24 +02:00 |
|
Marion Muszynski
|
7b97517690
|
fix extending save function
|
2017-09-28 10:39:08 +02:00 |
|
Marion Muszynski
|
59f5489410
|
Merge branch 'ticket-14301-ErrorApiPaypal' into develop
|
2017-09-27 16:00:24 +02:00 |
|
Marion Muszynski
|
695cd7740c
|
fix direct payment paypal
|
2017-09-27 16:00:08 +02:00 |
|
Marion Muszynski
|
72f4b5f05a
|
fix conflicts
|
2017-09-27 12:04:46 +02:00 |
|
Marion Muszynski
|
1caec538ac
|
fix paypal api errors
|
2017-09-27 12:03:07 +02:00 |
|
Marion Muszynski
|
a1742a806c
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-26 17:54:53 +02:00 |
|
Marion Muszynski
|
d31496b1fd
|
fix sale name
|
2017-09-26 17:54:36 +02:00 |
|
Marion Muszynski
|
8f07cd31c6
|
fix conflicts
|
2017-09-26 17:35:31 +02:00 |
|
Marion Muszynski
|
a7e422af97
|
add mail sendind
|
2017-09-26 17:34:21 +02:00 |
|
Michael RICOIS
|
389c34f82e
|
Merge branch 'ticket-14162-returnwithqty'
|
2017-09-26 15:35:10 +02:00 |
|
Marion Muszynski
|
8fb28292b8
|
add drop shipping
|
2017-09-26 14:53:38 +02:00 |
|
Michael RICOIS
|
d78b6688fa
|
Merge remote-tracking branch 'origin/ticket-14162-returnwithqty' into develop
|
2017-09-25 18:00:36 +02:00 |
|
Michael RICOIS
|
91e7139f34
|
Manage quantity in return form
|
2017-09-25 17:58:47 +02:00 |
|
Marion Muszynski
|
635e984d67
|
Merge branch 'add-CacheRedis' into develop
|
2017-09-25 12:29:11 +02:00 |
|
Marion Muszynski
|
80c6a3db16
|
Merge branch 'task-ImgMobileCategories' into develop
|
2017-09-25 10:59:58 +02:00 |
|
Marion Muszynski
|
801cb2af23
|
add delete function for category mobile image
|
2017-09-25 10:59:34 +02:00 |
|
Marion Muszynski
|
4b985fb501
|
Merge branch 'ticket-13943-ResetBOpassword'
|
2017-09-21 15:40:57 +02:00 |
|
Marion Muszynski
|
b2d1f7bf90
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:37:57 +02:00 |
|
Marion Muszynski
|
2eddfa25b7
|
fix install module
|
2017-09-21 15:37:41 +02:00 |
|
Marion Muszynski
|
2add8ce479
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:28:25 +02:00 |
|
Marion Muszynski
|
31e6272a31
|
add mail for reset password
|
2017-09-21 15:26:55 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Marion Muszynski
|
26ab7a6a5e
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-20 16:44:36 +02:00 |
|
Marion Muszynski
|
da99ec2597
|
fix lang
|
2017-09-20 16:44:15 +02:00 |
|
Michael RICOIS
|
e694616107
|
Merge remote-tracking branch 'origin/ticket-13149'
|
2017-09-19 11:26:32 +02:00 |
|
Michael RICOIS
|
8c1c166572
|
Merge branch 'ticket-13149' into develop
|
2017-09-18 17:45:29 +02:00 |
|
Michael RICOIS
|
f0e00394fa
|
Clean ajax and add parameter to not loop in categoryUpdate hook
|
2017-09-18 17:44:09 +02:00 |
|
Marion Muszynski
|
cf246105b7
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:47:40 +02:00 |
|
Marion Muszynski
|
0f5228f6e8
|
update error mess from add to cart
|
2017-09-18 11:47:26 +02:00 |
|
Marion Muszynski
|
28aea397b5
|
Merge branch 'ticket-14209-AntAlert' into develop
|
2017-09-18 11:15:04 +02:00 |
|