Commit Graph

983 Commits

Author SHA1 Message Date
jitendra 8346f424cb Resolve conflict 2019-10-31 13:51:53 +05:30
jitendra 163ce17e34 Issue #1662 fixed 2019-10-31 13:50:17 +05:30
Jitendra Singh 2a00d797ca
Merge pull request #1703 from phillipcodes/bugfix-979/image-scaling
#979 fix image scaling issues
2019-10-29 12:31:19 +05:30
jitendra 8b29a7f8e0 Wishlist language moved to account section and added downloadable products language to other locales 2019-10-29 12:23:28 +05:30
phillipmohr b5178cf013 fix image scaling issues 2019-10-28 16:17:48 +01:00
Jitendra Singh b0b2e26ef2
Merge pull request #1365 from KarimQaderi/patch-5
change route pages to page
2019-10-24 10:37:41 +05:30
Jitendra Singh 4fcff1e111
Merge pull request #1650 from shivam-webkul/shivam
[Bug Fixed #1219 ] & [Enhancement #1182]  Fixed
2019-10-24 10:36:53 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
shivam kumar 101785cbf7 minor chanegs 2019-10-23 13:06:34 +05:30
Jitendra Singh 02f0d004b0
Merge pull request #1651 from naresh-webkul/development
Bug Fixed #1645: No confirm password action when customer is deleting…
2019-10-22 16:01:28 +05:30
Jitendra Singh ea2f91e704
Merge pull request #1663 from MattApril/dev
Fixed duplicate view_render_event for product descriptions
2019-10-22 12:58:08 +05:30
shivam kumar ce6766b305 design changes and fixed minor issue 2019-10-21 15:37:51 +05:30
naresh verma 2d2302c398 resolve conflicts 2019-10-21 13:38:29 +05:30
naresh verma 33e8445ba8 added translation [issue fixed #1645] 2019-10-21 13:26:23 +05:30
Jitendra Singh 75eeddc1b1
Merge pull request #1665 from rumansaleem/fix-hardcoded-bagisto
Replace hardcoded 'Bagisto' with application name from config.
2019-10-21 12:01:26 +05:30
Amritanshu 5baa1ede20 Replace SERVER['REQUEST_URI'] with Larvel's request object #1251 2019-10-19 15:35:05 +05:30
Ruman Saleem bb4d29d35e fix typo 2019-10-19 13:59:47 +05:30
Ruman Saleem b8967a5c22 Replace hardcoded 'Bagisto' with application name - fixes #1614 2019-10-19 13:51:00 +05:30
Matt April 27a9a32f14 Fixed duplicate view_render_event for product descriptions - changed from .before to .after 2019-10-18 17:54:43 -04:00
shivam kumar fd8a1fb851 #1182 fixed 2019-10-18 18:43:38 +05:30
prateek srivastava 8fc60b0a4e issue #1613 fixed 2019-10-18 12:13:06 +05:30
shivam kumar eaf82987cf #1219 fixed 2019-10-17 17:47:48 +05:30
naresh verma 28ed55d711 Bug Fixed #1645: No confirm password action when customer is deleting his profile 2019-10-17 17:24:01 +05:30
rahul shukla 819807b017 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-10-15 19:06:03 +05:30
rahul shukla 4761c64c6f update cart method name change for API 2019-10-15 19:05:46 +05:30
jitendra 94d7289927 Issue #1631 fixed 2019-10-15 18:59:54 +05:30
jitendra 4657430da1 Issue #1629 fixed 2019-10-15 13:10:53 +05:30
Jitendra Singh 8d33d74f85
Merge pull request #1616 from jitendra-webkul/jitendra
Purchased downloadable product grid date filter issue fixed
2019-10-14 09:52:43 +05:30
jitendra 21fcc50597 Purchaes downloadable product grid date filter issue fixed 2019-10-14 09:51:22 +05:30
Jitendra Singh d810f7c75b
Merge pull request #1615 from jitendra-webkul/jitendra
Issue #1611 fixed
2019-10-14 09:19:11 +05:30
jitendra 1dfe3a513d Issue #1611 fixed 2019-10-14 09:18:15 +05:30
Jitendra Singh d184c375cc
Merge pull request #1601 from jitendra-webkul/jitendra
Issue #1587 fixed
2019-10-11 12:19:02 +05:30
jitendra 41a78c87b3 Issue #1587 fixed 2019-10-11 12:18:19 +05:30
Jitendra Singh f8f7df4125
Merge pull request #1600 from jitendra-webkul/jitendra
Issue #1592 fixed
2019-10-11 12:13:23 +05:30
jitendra bd804ddb4a Assets compiled for production 2019-10-11 12:12:34 +05:30
Jitendra Singh 5357578944
Merge pull request #1599 from jitendra-webkul/jitendra
Issue #1568 fixed
2019-10-11 11:47:18 +05:30
jitendra a3bb10a8b6 Issue #1568 fixed 2019-10-11 11:46:19 +05:30
Jitendra Singh 028a7db2bc
Merge pull request #1597 from jitendra-webkul/jitendra
Issue #1571 fixed
2019-10-11 11:21:52 +05:30
jitendra 195330c192 Issue #1571 fixed 2019-10-11 11:19:46 +05:30
Jitendra Singh f88d986d6a
Merge pull request #1589 from jitendra-webkul/jitendra
Issue #1585 fixed
2019-10-10 19:39:00 +05:30
jitendra 121c7c7e36 Issue #1585 fixed 2019-10-10 19:37:31 +05:30
Jitendra Singh 5bb6e1870c
Merge pull request #1577 from jitendra-webkul/jitendra
Issue #1573 fixed
2019-10-10 13:23:47 +05:30
jitendra e21fb3d6cd Issue #1573 fixed 2019-10-10 13:21:46 +05:30
Jitendra Singh 4e0a5847d5
Merge pull request #1521 from Sopizhenko/master
Fix for issue #1433
2019-10-10 13:16:23 +05:30
Jitendra Singh e85f07af08
Merge pull request #1564 from rahulshukla-webkul/development
Fixed issue #1563
2019-10-10 13:03:59 +05:30
Jitendra Singh 0223ffda8e
Merge pull request #1570 from jitendra-webkul/jitendra
Updated refund for new product types
2019-10-10 12:34:05 +05:30
jitendra b707a855fc Updated refund for new product types 2019-10-10 12:33:05 +05:30
Jitendra Singh 3c9ef6ee45
Merge pull request #1558 from marcmascarell/patch-1
Spanish translation for Shop module
2019-10-10 11:06:21 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
rahul shukla 6752476317 conflict resolve 2019-10-09 19:29:07 +05:30