Commit Graph

411 Commits

Author SHA1 Message Date
rahul shukla bcabb00e9a Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-10-29 13:06:20 +05:30
rahul shukla 3c0c4481a2 conflict resolve 2018-10-29 13:05:57 +05:30
prashant-webkul cd19e783e0 v-validate issue fixed 2018-10-29 13:04:41 +05:30
rahul shukla 35fdb45353 conflict 2018-10-29 11:44:12 +05:30
prashant-webkul e2c036ced0 Search and Bug fixes 2018-10-29 11:39:09 +05:30
prashant-webkul 2514d748b5 Slider Content Bug Fixed 2018-10-28 18:53:20 +05:30
prashant-webkul 7a157ee17d Slider Backend Fixed 2018-10-28 16:30:15 +05:30
prashant-webkul f5b4cc4c46 tiny mce integration on the way 2018-10-27 19:05:01 +05:30
prashant-webkul a643127eb3 Login page client validation issue fixed, login page wrong sign up translation issue fixed 2018-10-27 17:37:22 +05:30
prashant-webkul 18ff527319 Multiple addresses implemented for customer with the option of making the default address also, new radio button for checkout address selection made 2018-10-27 16:43:57 +05:30
rahul shukla fe0e9a51bf merge with master 2018-10-27 15:54:46 +05:30
rahul shukla da7ab87fa2 customer changes 2018-10-27 15:48:03 +05:30
prashant-webkul 8e2d45e498 TinyMCE integration and Slider Content Fixes 2018-10-26 19:59:24 +05:30
rahul shukla 68e6e5bb79 loader 2018-10-26 19:29:53 +05:30
prashant-webkul 32af436609 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 19:15:54 +05:30
prashant-webkul e3ce3ae45d slider fixes 2018-10-26 19:15:51 +05:30
JItendra Singh 7d68e20de6
Merge pull request #93 from bagisto/prashant
Prashant
2018-10-26 19:14:05 +05:30
jitendra 27b1f1fad9 Issues fixed 2018-10-26 19:13:01 +05:30
prashant-webkul 5d3047a0b4 Cart bug fixes and order datagrid bug fixes 2018-10-26 17:53:25 +05:30
prashant-webkul e5e2bf338e Disabled buy now until next merge 2018-10-26 16:47:54 +05:30
jitendra fbe8f844e1 Fixed seeders 2018-10-26 13:54:10 +05:30
jitendra 0231c26da2 Final Commit to first version 2018-10-26 13:16:18 +05:30
JItendra Singh fd399c1661
Merge pull request #88 from bagisto/prashant
Prashant
2018-10-26 13:07:29 +05:30
prashant-webkul 17e4491956 Merged With Master 2018-10-26 13:00:08 +05:30
rahul shukla 80f37ff0cb footer icon 2018-10-26 12:59:37 +05:30
prashant-webkul 74ba1afc64 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 12:58:52 +05:30
prashant-webkul d56061539b Bug fixes 2018-10-26 12:58:38 +05:30
jitendra 2d24f24c9c Conflict resolved 2018-10-26 12:54:39 +05:30
rahul shukla d9f4f73a58 conflict 2018-10-26 12:53:37 +05:30
jitendra 9c8c9c2a97 Now compiled asset will store in publishable folder 2018-10-26 12:52:43 +05:30
prashant-webkul d267a5bb27 Bug fixes 2018-10-26 12:40:30 +05:30
prashant-webkul 462dc9fafb Bug Fixes 2018-10-26 12:35:19 +05:30
rahul shukla fef483cb62 footer icon 2018-10-26 12:32:46 +05:30
prashant-webkul 74605cbeff storefront header fixed 2018-10-26 11:57:57 +05:30
rahul shukla 16fece01eb link &n margin on review 2018-10-26 11:32:07 +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
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 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