Commit Graph

558 Commits

Author SHA1 Message Date
rahul shukla 84d5ecf41e Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-30 17:05:41 +05:30
JItendra Singh d905b78712
Merge pull request #105 from bagisto/prashant
Prashant
2018-10-30 17:04:20 +05:30
rahul shukla ea4dcec84d header 2018-10-30 17:03:52 +05:30
prashant-webkul 9369d54a3e Merged and Migration fix 2018-10-30 17:03:13 +05:30
JItendra Singh 0677eb0fd6
Merge pull request #104 from bagisto/jitendra
Jitendra
2018-10-30 16:59:42 +05:30
jitendra 376c1f9460 Assets compiled for production 2018-10-30 16:58:53 +05:30
jitendra b4e79a87ca Editor added to the product edit page, slider form page and channel create and edit form 2018-10-30 16:54:24 +05:30
prashant-webkul a792f4e06b Buy Now and Wishlist Complete 2018-10-30 16:52:36 +05:30
JItendra Singh e42feb0fa9
Merge pull request #103 from bagisto/rahul
Rahul
2018-10-30 12:23:32 +05:30
rahul shukla 2517dfbf03 merge with master 2018-10-30 12:19:43 +05:30
JItendra Singh c17961f1bc
Merge pull request #102 from bagisto/jitendra
minicart price currency format fixed
2018-10-30 12:16:40 +05:30
jitendra 7a521f97d7 minicart price currency format fixed 2018-10-30 12:16:08 +05:30
rahul shukla 6fea160abe category image & currency , footer 2018-10-30 12:07:07 +05:30
JItendra Singh 455df72678
Merge pull request #101 from bagisto/prashant
Prashant
2018-10-30 12:01:44 +05:30
prashant-webkul 13e56c1930 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-30 11:59:48 +05:30
prashant-webkul f0c5db8177 before merge 2018-10-30 11:59:44 +05:30
JItendra Singh 13db34b220
Merge pull request #100 from bagisto/jitendra
Dashboard issue fixed
2018-10-30 11:58:56 +05:30
jitendra 97c7ca84c6 Dashboard issue fixed 2018-10-30 11:58:15 +05:30
prashant-webkul b55720244c Move Configurable Item To Cart From Wishlist Bug Removed and Storefront UI Fix 2018-10-30 11:49:22 +05:30
prashant-webkul e59f5a775b Order Grid, Wishlist Bug Fixes 2018-10-30 10:01:01 +05:30
prashant-webkul 1cd59b4b86 Webkul copyright text, Search now working on product names only with a dedicated page for displaying results 2018-10-29 14:51:59 +05:30
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 8031144c4e Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-27 17:11:20 +05:30
prashant-webkul c7c6950448
Updated readme 2018-10-27 17:10:58 +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 ad187c430c Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 19:59:31 +05:30
prashant-webkul 8e2d45e498 TinyMCE integration and Slider Content Fixes 2018-10-26 19:59:24 +05:30
prashant-webkul 8d741a05cc
Removed package lock file 2018-10-26 19:58:28 +05:30
prashant-webkul c72c34151e
updated gitignore
package lock file in gitignore now.
2018-10-26 19:57:49 +05:30
prashant-webkul 8806c938fa
Deleted laracel commands file 2018-10-26 19:56:45 +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 Singh cfd9ff54b0
Merge pull request #92 from bagisto/jitendra
Issues fixed
2018-10-26 19:13:43 +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
prashant-webkul 65894cc5ef
updated readme 2018-10-26 16:46:31 +05:30
prashant-webkul 66753063c8
updated readme.md 2018-10-26 16:34:20 +05:30