Commit Graph

488 Commits

Author SHA1 Message Date
jitendra ad3e968034 Updated gitignore 2018-10-26 12:56:58 +05:30
jitendra 2d24f24c9c Conflict resolved 2018-10-26 12:54:39 +05:30
jitendra 9c8c9c2a97 Now compiled asset will store in publishable folder 2018-10-26 12:52:43 +05:30
JItendra Singh 913a3dbcbd
Merge pull request #83 from bagisto/prashant
Prashant
2018-10-26 12:41:13 +05:30
prashant-webkul d267a5bb27 Bug fixes 2018-10-26 12:40:30 +05:30
JItendra Singh 8b96c8aeb8
Merge pull request #82 from nitishkmrk/patch-1
Created bower.json
2018-10-26 12:40:29 +05:30
prashant-webkul 462dc9fafb Bug Fixes 2018-10-26 12:35:19 +05:30
Nitish Khagwal 22dd84c253
Created bower.json 2018-10-26 12:27:12 +05:30
prashant-webkul 74605cbeff storefront header fixed 2018-10-26 11:57:57 +05:30
jitendra 69ea3a1830 Product grid inventory update implemented after order created 2018-10-26 11:28:24 +05:30
prashant-webkul cc9ad2c8ad Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 11:17:24 +05:30
prashant-webkul f69e396bfd Product grid update event bind successful 2018-10-26 11:14:42 +05:30
JItendra Singh d25172baff
Merge pull request #81 from bagisto/jitendra
Issues fixed
2018-10-26 10:24:09 +05:30
jitendra 52bf973307 Issues fixed 2018-10-26 10:23:35 +05:30
JItendra Singh 36c3a905e7
Merge pull request #80 from bagisto/rahul
Rahul
2018-10-26 10:17:53 +05:30
rahul shukla 007f945b05 conflict resolve 2018-10-26 09:59:33 +05:30
prashant-webkul d05b6451cc Product grid bug fixes 2018-10-26 09:54:26 +05:30
JItendra Singh fb6c9c8a79
Merge pull request #79 from bagisto/jitendra
Jitendra
2018-10-26 09:52:05 +05:30
jitendra cc7b20e607 Merged 2018-10-26 09:51:39 +05:30
rahul shukla c8fd85fe4b conflict resolve 2018-10-26 09:50:46 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
JItendra Singh ee38c2be7f
Merge pull request #78 from bagisto/prashant
Prashant
2018-10-26 09:50:07 +05:30
prashant-webkul 7e75da7bdf Product datagrid event binded with product create 2018-10-26 09:49:19 +05:30
rahul shukla 781b960fa8 reviews issue 2018-10-25 21:45:28 +05:30
prashant-webkul 021d918937 product datagrid event binding 2018-10-25 19:35:28 +05:30
prashant-webkul 55f6e2f29a left with only the save product function for creating products datagrid 2018-10-25 19:29:34 +05:30
JItendra Singh 99a0590c69
Merge pull request #77 from bagisto/rahul
Rahul
2018-10-25 15:35:27 +05:30
JItendra Singh 5bd2b66f9a
Merge pull request #76 from bagisto/prashant
Prashant
2018-10-25 15:34:58 +05:30
prashant-webkul dc939d4ff2 Addition data for adding configurable product to cart, fixed 2018-10-25 15:33:49 +05:30
prashant-webkul ef37be5eca Merge with master 2018-10-25 15:26:24 +05:30
JItendra Singh 710b3cb95d
Merge pull request #75 from bagisto/jitendra
Issue fixed
2018-10-25 15:25:51 +05:30
jitendra 210da46a12 Issue fixed 2018-10-25 15:25:10 +05:30
rahul shukla 84ba1d4fc6 error changes 2018-10-25 14:36:51 +05:30
rahul shukla af5b9d9f06 conflict resolve 2018-10-25 13:58:06 +05:30
JItendra Singh bfc876b821
Merge pull request #74 from bagisto/prashant
Prashant
2018-10-25 13:51:41 +05:30
prashant-webkul 1b83b23e53 merged with conflicted assets, recompile storefront 2018-10-25 13:51:03 +05:30
rahul shukla c9037806b0 error pages 2018-10-25 13:50:30 +05:30
prashant-webkul 683b18e424 Cart Bug Fixes and Category items fixes for visible in menu only 2018-10-25 13:49:23 +05:30
rahul shukla f281d01a53 error pages 2018-10-25 13:37:21 +05:30
JItendra Singh add7cd43f8
Merge pull request #73 from bagisto/jitendra
Jitendra
2018-10-25 13:17:47 +05:30
jitendra 930cba9436 Issues fixed 2018-10-25 13:16:45 +05:30
jitendra 0f6bcfde49 Seeders added 2018-10-25 11:01:47 +05:30
rahul shukla d1e49a2170 logo-img 2018-10-25 10:56:03 +05:30
rahul shukla 8d9627c194 customer changes 2018-10-25 10:38:51 +05:30
prashant-webkul 802c737a61 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-25 10:21:47 +05:30
JItendra Singh afd7e994b0
Merge pull request #72 from bagisto/rahul
Rahul
2018-10-25 10:21:26 +05:30
rahul shukla 52999c971e Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-25 10:19:17 +05:30
JItendra Singh 2cdf0aedf0
Merge pull request #71 from bagisto/prashant
Prashant
2018-10-25 10:19:06 +05:30
prashant-webkul 06667ba784 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-25 10:18:47 +05:30
prashant-webkul b055a65d24 Customer password reset route 2018-10-25 10:18:14 +05:30