Jitendra Singh
|
7b5930f8bc
|
Merge pull request #2686 from jitendra-webkul/1.0
Issue #2613 fixed
|
2020-03-18 14:54:31 +05:30 |
|
Jitendra Singh
|
663a679a5d
|
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
Order workflow improvements and tests
|
2020-03-18 14:50:48 +05:30 |
Jitendra Singh
|
bc39a19f49
|
Issue #2613 fixed
|
2020-03-18 14:50:20 +05:30 |
|
Jitendra Singh
|
3002723e78
|
Merge pull request #2683 from phillipcodes/patch-1
Fix cart discount naming in API
|
2020-03-18 13:41:12 +05:30 |
|
Jitendra Singh
|
45ce9b03db
|
Merge pull request #2685 from jitendra-webkul/1.0
Issue #2677 fixed
|
2020-03-18 13:34:29 +05:30 |
|
Jitendra Singh
|
17abfdb1d6
|
Issue #2677 fixed
|
2020-03-18 13:24:12 +05:30 |
phillipcodes
|
7fdc8fd4a6
|
Update Cart.php
|
2020-03-17 15:05:00 +01:00 |
Vivek
|
ad76426fb5
|
[Updated: Shop & admin email setting added in configuration.]
|
2020-03-17 16:10:47 +05:30 |
shubhammehrotra.symfony@webkul.com
|
e96c6011e0
|
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
|
2020-03-17 15:48:29 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
c06aeadb37
|
product add to cart issue resolved on PDP
|
2020-03-17 15:48:10 +05:30 |
|
Jitendra Singh
|
279ab5b237
|
Merge pull request #2679 from jitendra-webkul/1.0
Issue #2669 fixed
|
2020-03-17 15:38:48 +05:30 |
|
Jitendra Singh
|
d76a8d8dec
|
Issue #2669 fixed
|
2020-03-17 15:34:33 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
d5b1e84fdb
|
#2678
|
2020-03-17 14:00:07 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
32701de737
|
#2666
|
2020-03-17 13:34:44 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
ca4ae665f1
|
#2667
|
2020-03-17 13:13:24 +05:30 |
|
Jitendra Singh
|
8ac4946352
|
Merge pull request #2676 from jitendra-webkul/1.0
Issue #2671 fixed
|
2020-03-17 13:02:41 +05:30 |
|
Jitendra Singh
|
cdc1eb7bc1
|
Issue #2671 fixed
|
2020-03-17 13:01:37 +05:30 |
|
Jitendra Singh
|
df9611d030
|
Merge pull request #2673 from jitendra-webkul/1.0
Issue #2672 fixed
|
2020-03-17 12:26:23 +05:30 |
|
Jitendra Singh
|
bf5ad13dac
|
Issue #2672 fixed
|
2020-03-17 12:25:04 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
f354d0aafa
|
shimmer effect added in wishlist and comparison
|
2020-03-17 11:44:22 +05:30 |
mohd asif
|
47c4a5ef42
|
upadated missing translation for dutch and protoguese in velocity package
|
2020-03-17 10:12:33 +05:30 |
|
mohd asif
|
d2caa2af98
|
resolved commit
|
2020-03-17 09:36:45 +05:30 |
|
mohd asif
|
255b50454b
|
updated missing translation for the Persia for the shop front
|
2020-03-16 19:09:38 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
ce90035edb
|
hide compare, wishlist icon
|
2020-03-16 18:52:37 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
d83bc00289
|
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
|
2020-03-16 18:47:10 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
61f949f43e
|
#2646
|
2020-03-16 18:46:56 +05:30 |
|
mohd asif
|
8ac262ffa8
|
updated the missing translation for shop front for arabic and removed repated translation from english
|
2020-03-16 18:09:32 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
bc362144c3
|
added shimmer effect product cards
|
2020-03-16 16:33:53 +05:30 |
|
mohd asif
|
e7a9303b51
|
updated missing translation for portoguese in admin package
|
2020-03-16 16:24:04 +05:30 |
|
Jitendra Singh
|
1eb1954a4f
|
Merge pull request #2665 from shubhwebkul/velocity-updated
misc. bug fixes
|
2020-03-16 15:10:48 +05:30 |
|
mohd asif
|
65814e0f04
|
upadated missing translation for Dutch for admin package
|
2020-03-16 14:07:08 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
cc12549336
|
#2636
|
2020-03-16 13:40:21 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
ee4f81004c
|
#2639
|
2020-03-16 13:34:01 +05:30 |
|
mohd asif
|
9901209a4b
|
upadated missing translation for persian in admin package
|
2020-03-16 13:25:14 +05:30 |
|
Vivek
|
e1ed114d74
|
[Updated: Core/Config.php modified.]
|
2020-03-16 13:13:57 +05:30 |
|
Jitendra Singh
|
96ab5e390e
|
Merge pull request #2662 from jitendra-webkul/1.0
Issue #2660 fixed
|
2020-03-16 11:57:51 +05:30 |
|
Jitendra Singh
|
282545e1c4
|
Issue #2660 fixed
|
2020-03-16 11:53:39 +05:30 |
|
Vivek
|
1572075443
|
[Updated: worked on conflict.]
|
2020-03-16 11:10:07 +05:30 |
|
Jitendra Singh
|
355a6a5c5d
|
Merge pull request #2659 from jitendra-webkul/1.0
Issue #2658 fixed
|
2020-03-16 11:03:00 +05:30 |
|
Jitendra Singh
|
7182400059
|
Issue #2658 fixed
|
2020-03-16 11:02:14 +05:30 |
|
mohd asif
|
1e5baab3a4
|
added missed translation for arabic
|
2020-03-16 10:56:10 +05:30 |
|
Jitendra Singh
|
7072a60cda
|
Merge pull request #2657 from jitendra-webkul/1.0
Issue #2654 fixed
|
2020-03-13 19:16:48 +05:30 |
|
Jitendra Singh
|
7413e1577e
|
Issue #2654 fixed
|
2020-03-13 19:15:59 +05:30 |
|
Jitendra Singh
|
65b34add4b
|
Merge pull request #2656 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:08:08 +05:30 |
|
Jitendra Singh
|
e38a95cb3f
|
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:07:14 +05:30 |
|
Jitendra Singh
|
cae24088da
|
Merge pull request #2655 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:04:20 +05:30 |
|
Jitendra Singh
|
4e10d706f5
|
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:03:19 +05:30 |
|
mohd asif
|
ae1215834b
|
upadated remaining translation for ar
|
2020-03-13 18:43:14 +05:30 |
|
Jitendra Singh
|
195344e8a2
|
Merge pull request #2653 from jitendra-webkul/1.0
Issue #2638 fixed
|
2020-03-13 18:31:15 +05:30 |
|
Jitendra Singh
|
9b60f0b8ec
|
Issue #2638 fixed
|
2020-03-13 17:51:46 +05:30 |
|
Jitendra Singh
|
46ab49c489
|
Merge pull request #2652 from jitendra-webkul/1.0
Issue #2649 fixed
|
2020-03-13 17:43:57 +05:30 |
|
Jitendra Singh
|
fd15942132
|
Issue #2649 fixed
|
2020-03-13 17:37:25 +05:30 |
|
Jitendra Singh
|
c0f174e86b
|
Merge pull request #2651 from jitendra-webkul/1.0
Issue #2650 fixed
|
2020-03-13 17:21:36 +05:30 |
|
Jitendra Singh
|
ef7dac9fec
|
Issue #2650 fixed
|
2020-03-13 17:04:00 +05:30 |
|
Jitendra Singh
|
3a9fbbaff3
|
Merge pull request #2648 from jitendra-webkul/1.0
Issue #2643 fixed
|
2020-03-13 16:47:43 +05:30 |
|
Jitendra Singh
|
fbf4ffa1c3
|
Issue #2643 fixed
|
2020-03-13 16:42:04 +05:30 |
|
mohd asif
|
4c1f1ff738
|
translation updated for the velocity package
|
2020-03-13 14:52:30 +05:30 |
|
mohd asif
|
121dc5f395
|
updated translation for the shop package for arabic and persia
|
2020-03-13 13:56:39 +05:30 |
|
Jitendra Singh
|
c2633d06c0
|
Merge pull request #2647 from jitendra-webkul/1.0
Issues #2634, #2635 fixed
|
2020-03-13 12:56:41 +05:30 |
|
Jitendra Singh
|
557e619bdc
|
Issues #2634, #2635 fixed
|
2020-03-13 12:52:26 +05:30 |
|
mohd asif
|
dd4875004a
|
updated translation for arabic and persia for admin package
|
2020-03-13 12:29:51 +05:30 |
Herbert Maschke
|
c14b1c8946
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-12 16:26:27 +01:00 |
|
mohd asif
|
f01ab851fb
|
fixed some more language translation issue in arabic and persia
|
2020-03-12 19:30:39 +05:30 |
|
mohd asif
|
f797456d1a
|
added missing translation for the arabic of velocity packages
|
2020-03-12 17:39:17 +05:30 |
|
mohd asif
|
54d8ff9487
|
added tranlation fa for velocity package
|
2020-03-12 16:09:05 +05:30 |
|
mohd asif
|
ed2045b1b8
|
language for fa and pt_br
|
2020-03-12 15:29:11 +05:30 |
|
Jitendra Singh
|
30f94375f3
|
Merge pull request #2631 from Haendlerbund/show-multiple-flash-messages-in-admin-panel
bugfix: show multiple flash messages in admin panel
|
2020-03-12 14:53:46 +05:30 |
|
mohd asif
|
9e6ed6f09d
|
fixed translation in all packages
|
2020-03-12 13:32:56 +05:30 |
|
Jitendra Singh
|
00f8f7ddb0
|
Issue #2630 fixed
|
2020-03-11 16:45:06 +05:30 |
|
Jitendra Singh
|
ec3be668b6
|
Issue #2630 fixed
|
2020-03-11 15:36:45 +05:30 |
Annika Wolff
|
04c35bb88d
|
uncommented factory loading in TaxServiceProvider, bc. tests will miss it
|
2020-03-11 11:06:17 +01:00 |
|
Annika Wolff
|
65b5ec9232
|
bugfix: show multiple flash messages in admin panel
|
2020-03-11 10:45:18 +01:00 |
|
Jitendra Singh
|
6063c113bf
|
Removed static text from shop datagrid
|
2020-03-11 12:15:03 +05:30 |
|
Herbert Maschke
|
e20bb9cc97
|
remove <<<<HEAD merge conflict marker artifact
|
2020-03-10 10:00:04 +01:00 |
|
Vivek Sharma
|
ffd918af20
|
[Updated: Changed Velocity's models related code.]
|
2020-03-07 11:43:22 +05:30 |
|
Herbert Maschke
|
7a3a1726bc
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-06 15:50:26 +01:00 |
|
Jitendra Singh
|
5859d8dfc2
|
Merge pull request #2625 from jitendra-webkul/booking-product
Remove static text from grid
|
2020-03-06 20:06:21 +05:30 |
|
Jitendra Singh
|
101df848d6
|
Remove static text from grid
|
2020-03-06 20:03:32 +05:30 |
|
Jitendra Singh
|
8ca9bd864c
|
Remove static text from grid
|
2020-03-06 19:49:47 +05:30 |
|
Jitendra Singh
|
741c1f25ee
|
Merge pull request #2624 from jitendra-webkul/booking-product
Up down icon issue fixed
|
2020-03-06 19:10:54 +05:30 |
|
Jitendra Singh
|
27aa309754
|
Up down icon issue fixed
|
2020-03-06 19:04:58 +05:30 |
|
Jitendra Singh
|
9846fb9408
|
Merge pull request #2623 from jitendra-webkul/booking-product
Booking product added and improved code style and code comments
|
2020-03-06 17:51:25 +05:30 |
|
Jitendra Singh
|
2f9724e03d
|
attributeOptionRepository undefined variable issue fixed
|
2020-03-06 17:47:20 +05:30 |
|
Annika Wolff
|
f4f5d2ea71
|
make invoice factory php7.3 compatible
|
2020-03-06 12:52:35 +01:00 |
|
Jitendra Singh
|
fcf043ca6f
|
Improved code style
|
2020-03-06 16:09:53 +05:30 |
|
Jitendra Singh
|
73ce8a4dd7
|
Resolved conflicts
|
2020-03-06 16:04:17 +05:30 |
|
Jitendra Singh
|
010ae65691
|
Resolved conflicts
|
2020-03-06 16:02:52 +05:30 |
|
Jitendra Singh
|
276a2e288b
|
Merge pull request #2612 from Haendlerbund/revert-2603-development
Revert "Development"
|
2020-03-06 15:16:08 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
5ad2b9109f
|
use product flat instead of product entity
|
2020-03-06 14:41:33 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
d212536170
|
image resolution & quick view price issue resolved
|
2020-03-06 13:24:31 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
b564e63ad7
|
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
|
2020-03-06 12:26:13 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
8d167c7b76
|
#2609, #2602 & misc.
|
2020-03-06 12:25:59 +05:30 |
|
Herbert Maschke
|
e40d3ec619
|
fill in correct address attributes
|
2020-03-05 16:16:17 +01:00 |
|
Herbert Maschke
|
7c634046db
|
add ?? operator in case address data fails
|
2020-03-05 16:00:21 +01:00 |
|
Herbert Maschke
|
19ebc48fbc
|
further refactoring of Cart Component
|
2020-03-05 15:52:20 +01:00 |
|
Jitendra Singh
|
955da20b45
|
Improved comments in code
|
2020-03-05 19:49:14 +05:30 |
|
Jitendra Singh
|
b503c50e0b
|
Fixed bug
|
2020-03-05 19:40:47 +05:30 |
|
Jitendra Singh
|
3068ecd9ae
|
Improved comments in code
|
2020-03-05 19:34:30 +05:30 |
|
Jitendra Singh
|
10db1838f2
|
Removed author information from every class
|
2020-03-05 19:28:42 +05:30 |
|
Jitendra Singh
|
42c16cbbfd
|
Improved comments in code
|
2020-03-05 19:13:42 +05:30 |