Commit Graph

3683 Commits

Author SHA1 Message Date
Jitendra Singh 8b82e42f74
Merge pull request #2017 from rahulshukla-webkul/development
Development
2020-01-09 13:34:29 +05:30
rahul shukla 6413cdae71 added star in state view in datagrid 2020-01-09 13:07:43 +05:30
rahul shukla 830367ef93 loop issue in tax calculate, #1994 2020-01-09 12:48:59 +05:30
Jitendra Singh b83992a6be
Merge pull request #2016 from rahulshukla-webkul/development
Issue 2012
2020-01-09 12:00:14 +05:30
rahul shukla b5b00bb4f8 Issue 2012 2020-01-09 11:33:54 +05:30
Jitendra Singh a66f556aca
Merge pull request #2014 from jitendra-webkul/1.0
Transation models added for country and state
2020-01-08 19:00:34 +05:30
Jitendra Singh c7449aed48 Transation models added for country and state 2020-01-08 18:59:36 +05:30
shubhammehrotra.symfony@webkul.com 835bbbbf9d updates 2020-01-08 17:24:24 +05:30
Jitendra Singh 55df0ad02f
Merge pull request #2013 from jitendra-webkul/1.0
Issues #1997, #1994 fixed
2020-01-08 17:02:39 +05:30
Jitendra Singh ca0f8bca49 Issues #1997, #1994 fixed 2020-01-08 17:01:50 +05:30
shubhammehrotra.symfony@webkul.com 7baf5b6c6d minor updates 2020-01-08 12:24:38 +05:30
shubhammehrotra.symfony@webkul.com 2ae59df6de updates 2020-01-08 10:36:59 +05:30
Jitendra Singh a0c02e6c4a
Merge pull request #2011 from jitendra-webkul/1.0
Tax rates for all states
2020-01-07 19:37:42 +05:30
jitendra fbfd710f1c Tax rates for all states 2020-01-07 17:48:43 +05:30
Jitendra Singh ebddf578b1
Merge pull request #1843 from Haendlerbund/feature/update-npm-assets
update npm assets
2020-01-07 15:34:29 +05:30
shubhammehrotra.symfony@webkul.com eb880441f6 resolved conflits 2020-01-07 13:10:48 +05:30
shubhammehrotra.symfony@webkul.com 242446627b merged with original 2020-01-07 13:10:34 +05:30
shubhammehrotra.symfony@webkul.com 5dca498dd8 quick-view initial 2020-01-07 12:51:27 +05:30
shubhammehrotra.symfony@webkul.com 09ac27a062 Merge branch 'prateek-latest1' into velocity-1 2020-01-07 12:35:50 +05:30
shubhammehrotra.symfony@webkul.com 88aa23ed97 merged with velocity-1 2020-01-07 12:35:17 +05:30
shubhammehrotra.symfony@webkul.com 84bc487a82 Merge branch 'velocity-1' into prateek-latest1 2020-01-07 12:33:42 +05:30
shubhammehrotra.symfony@webkul.com ae295909f5 minor changes 2020-01-07 12:32:41 +05:30
prateek srivastava 9eba1a1a26 Merge branch 'velocity-1' of https://github.com/shubhwebkul/bagisto into prateek-latest1 2020-01-07 10:24:56 +05:30
shubhammehrotra.symfony@webkul.com f6ffa7b526 hot-categories, popular-categories, sidebar & other 2020-01-06 21:14:01 +05:30
Jitendra Singh d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
jitendra fafa0df14a Catalog rule and cart rule applied on all product types 2020-01-06 17:47:43 +05:30
jitendra 77563c57f1 Catalog rules working for all product types 2020-01-06 13:00:01 +05:30
prateek srivastava b667070571 WIP quick view 2020-01-04 20:23:23 +05:30
Jitendra Singh ab5464641b
Merge pull request #2003 from Haendlerbund/make-api-routes-accessable
Make API routes accessable
2020-01-03 18:08:20 +05:30
Jitendra Singh 94e6b844af
Merge pull request #2000 from rahulshukla-webkul/development
Development
2020-01-03 18:06:57 +05:30
rahul shukla 7f3e3001b5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-03 18:05:24 +05:30
rahul shukla 97c63ad035 review missing variavle and admin footer text 2020-01-03 18:05:14 +05:30
MonaHartdegen d52ef533c7 replace wildcard route for products and categories with fallback route 2020-01-03 13:09:06 +01:00
shubhammehrotra.symfony@webkul.com 6f5d255b47 https://github.com/shubhwebkul/bagisto/pull/9 merged 2020-01-03 17:29:09 +05:30
shubhammehrotra.symfony@webkul.com 2fc79de4d9 Merge branch 'prateek-latest1' into velocity-1 2020-01-03 17:27:29 +05:30
shubhammehrotra.symfony@webkul.com 85adb62d74 revert updates 2020-01-03 17:26:26 +05:30
shubhammehrotra.symfony@webkul.com 2e289ab242 updates 2020-01-03 17:24:56 +05:30
rahul shukla 25dff89054 translation added for locales 2020-01-03 16:12:23 +05:30
prateek srivastava 484886ca1b disable price filter textbox 2020-01-03 16:07:31 +05:30
rahul shukla 9b120a978d foter text change 2020-01-03 15:57:43 +05:30
prateek srivastava f7af8194ab Merge branch 'velocity-1' of https://github.com/shubhwebkul/bagisto into prateek-latest1 2020-01-03 15:56:48 +05:30
prateek srivastava b4e593a853 layered navigation layout fixed 2020-01-03 15:56:32 +05:30
rahul shukla a283ebdb44 link in installer 2020-01-03 15:42:18 +05:30
rahul shukla 297165859f foter text change 2020-01-03 15:35:56 +05:30
Jitendra Singh 5c050822c1
Merge pull request #1995 from Haendlerbund/fix-product-links-in-views
Fixed product links in two views (replaced hard coded link with route)
2020-01-03 14:44:17 +05:30
shubhammehrotra.symfony@webkul.com 6bc3b2e5f3 include with variable update 2020-01-03 13:48:58 +05:30
prateek srivastava 6ea7714f0e resolved conflicts 2020-01-03 13:13:23 +05:30
prateek srivastava ef8083b575 added option for featured and new products to be displayed 2020-01-03 13:08:56 +05:30
shubhammehrotra.symfony@webkul.com 0b54fbfa72 https://github.com/shubhwebkul/bagisto/pull/8 merged 2020-01-03 12:11:59 +05:30
shubhammehrotra.symfony@webkul.com 0cbf2ee670 minor bugs 2020-01-03 12:09:31 +05:30