Marion Muszynski
|
5ea49b53b4
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 14:41:52 +01:00 |
|
Marion Muszynski
|
c25d0551cd
|
remove console log
|
2017-10-30 14:41:37 +01:00 |
|
Marion Muszynski
|
0b78ebc2f3
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 13:42:08 +01:00 |
|
Marion Muszynski
|
07dd8ab9c9
|
test flush cache sale
|
2017-10-30 13:41:50 +01:00 |
|
Marion Muszynski
|
aac4da9c0a
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:12:23 +02:00 |
|
Marion Muszynski
|
35e786058c
|
add mobile off img
|
2017-10-25 15:06:50 +02:00 |
|
Marion Muszynski
|
161673618e
|
Merge branch 'fix-resetpassword-include' into develop
|
2017-10-24 10:27:54 +02:00 |
|
Marion Muszynski
|
fc08dfd0eb
|
fix delay in admin privatesale
|
2017-10-23 10:10:05 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +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
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
Marion Muszynski
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
8f07cd31c6
|
fix conflicts
|
2017-09-26 17:35:31 +02:00 |
|
Marion Muszynski
|
8fb28292b8
|
add drop shipping
|
2017-09-26 14:53:38 +02:00 |
|
Marion Muszynski
|
3aaf570fdc
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-15 10:09:51 +02:00 |
|
Marion Muszynski
|
deec098272
|
close wanted sale
|
2017-09-15 10:09:15 +02:00 |
|
Marion Muszynski
|
2d25c1470a
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-24 10:57:56 +02:00 |
|
Marion Muszynski
|
1713b36f29
|
fix
|
2017-08-23 10:58:54 +02:00 |
|
Marion Muszynski
|
fc2caf3df4
|
fix async ajax for dnd
|
2017-08-23 10:52:28 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
Marion Muszynski
|
6a88e687c0
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-20 16:51:38 +02:00 |
|
Marion Muszynski
|
e1663b365b
|
fixation of sale position
|
2017-07-20 16:51:19 +02:00 |
|
Marion Muszynski
|
4e0938b32e
|
fix sale position
|
2017-07-20 11:37:45 +02:00 |
|
Marion Muszynski
|
7999a3d8f3
|
fix conflict
|
2017-07-04 16:06:55 +02:00 |
|
Marion Muszynski
|
4435110d9d
|
little fix
|
2017-07-04 16:04:00 +02:00 |
|
Marion Muszynski
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|
Marion Muszynski
|
35bcc57509
|
upload fr img for es when only fr sale bg is loaded
|
2017-06-08 11:51:34 +02:00 |
|
Marion Muszynski
|
fa68124dab
|
Merge branch 'ticket-12801-CarrierCleaning' into develop
|
2017-04-19 12:37:00 +02:00 |
|
Marion Muszynski
|
2bbc6d5fa6
|
addition of carrier filter for active ones
|
2017-04-19 12:36:41 +02:00 |
|
Marion Muszynski
|
c97bb8a413
|
Merge branch 'ticket-13015-modifAdminSale' into develop
|
2017-04-13 12:55:25 +02:00 |
|
Marion Muszynski
|
841b995299
|
clean admin ps
|
2017-04-13 12:55:09 +02:00 |
|
Marion Muszynski
|
35e33703b7
|
fix conflicts
|
2017-04-13 12:32:44 +02:00 |
|
Marion Muszynski
|
8d8c46d7b6
|
fix adminPrivateSaleSales
|
2017-04-12 09:52:43 +02:00 |
|
Marion Muszynski
|
01a8d528e2
|
fix sortable
|
2017-04-11 15:27:46 +02:00 |
|
Marion Muszynski
|
65ea663f75
|
fix conflict
|
2017-04-11 13:06:48 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
bb4e4c8249
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 15:46:02 +01:00 |
|
Marion Muszynski
|
647a917f7d
|
fix js id_category change
|
2017-03-21 15:45:45 +01:00 |
|
Marion Muszynski
|
c919001821
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:57:41 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
f0850ce461
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:54:27 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|