merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,152 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

1040 Commits

Author SHA1 Message Date
rahul shukla 148f942c4a issue #848 2019-04-18 19:15:14 +05:30
prateek srivastava 5b01493d26 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-18 13:04:10 +05:30
prateek srivastava 16b2b2a01f scroller fixed 2019-04-18 12:58:35 +05:30
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
prateek srivastava df8f54597a scroller code removed 2019-04-17 12:30:50 +05:30
prateek srivastava eb5bad16ff removed code for scroller 2019-04-17 12:24:41 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
rahul shukla ae6d498f4c merge with master 2019-04-16 19:22:49 +05:30
prateek srivastava 558b416bb6 Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development 2019-04-16 19:22:03 +05:30
rahul shukla 095c045c58 change table of product datagrid to product_flat 2019-04-16 18:59:29 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development 
Development
 2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra 
Issue #803 fixed
 2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh 53ebbf5a1e Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table 2019-04-16 14:47:28 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
rahul shukla 44c898824e removed duplicate entry in product linking 2019-04-12 18:43:42 +05:30
rahul shukla 2a859b7e23 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 15:08:15 +05:30
rahul shukla b99b0ad8b5 product attribute & category menu 2019-04-10 15:08:01 +05:30
prateek srivastava f2def6c4bc scroller issue fixed 2019-04-09 19:28:44 +05:30
rahul shukla b6a1a05e66 added permission of add & delete in acl 2019-04-09 18:52:03 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
Prashant Singh 1ca1ae5b61 Changed responses for all backend destroy functions and removed dead commented code 2019-04-09 13:17:19 +05:30
Prashant Singh b3bf66c6e2 Base sync with master 2019-04-09 12:53:31 +05:30
Prashant Singh 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
Prashant Singh 6c74b2ca42 admin assets compiled for production 2019-04-09 06:33:36 +05:30
Prashant Singh 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
rahul shukla efd38ab99e issue #718 2019-04-08 19:33:23 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 747f214739 fix in progress for get routes performing actions more than redirect 2019-04-08 04:51:02 +05:30
Prashant Singh 1e6579bedf in fix 2019-04-05 19:38:44 +05:30
Prashant Singh dadbf2bd6a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 10:47:16 +05:30
rahul shukla 4c2a0a08fc email subscription & newsletter verifiaction 2019-04-04 19:34:01 +05:30
Prashant Singh 5c94a8a21f changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui 2019-04-04 14:50:59 +05:30
prateek srivastava 504a5ec038 issue fixed #791 2019-04-03 18:03:11 +05:30
prateek srivastava 1cb03f9ac3 admin scroller bug fixed 2019-04-03 15:23:12 +05:30
Jitendra Singh 3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach 
flatten code
 2019-04-03 14:49:22 +05:30
Jitendra Singh d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code 
Flatten code
 2019-04-03 14:49:06 +05:30
Iman 759782c735 fix doc blocks (#787) 2019-04-03 12:34:35 +05:30
prateek srivastava b655a848d7 admin scroller bug fixed 2019-04-03 12:17:23 +05:30
rahulshukla-webkul 9314d9159c Development (#789) 
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop
 2019-04-03 11:37:48 +05:30
imanghafoori fadd26bd13 flatten code 2019-04-02 22:10:34 +03:30
imanghafoori 14cd4eb97e flatten code 2019-04-02 21:50:44 +03:30
Prateek Srivastava f2e4930e8e admin nav left menu scroll bug fixed (#784) 
* admin nav left menu scroll bug fixed

* scroller

* scroller

* fixed syntax for PR #784
 2019-04-02 18:26:31 +05:30
prateek srivastava 1492022c20 fixed syntax for PR #784 2019-04-02 18:24:43 +05:30
prateek srivastava 896b4eebc3 scroller 2019-04-02 18:07:54 +05:30
prateek srivastava 594d4598a5 scroller 2019-04-02 18:03:12 +05:30
prateek srivastava e0fc65b0da admin nav left menu scroll bug fixed 2019-04-02 17:57:34 +05:30
Jitendra Singh 09dbdb3fea
Merge pull request #776 from imanghafoori1/master 
Flattened the code
 2019-04-02 11:42:44 +05:30
Prashant Singh 2493b9e614 Provided amend in issue #705 2019-04-02 11:36:33 +05:30
Prashant Singh 80743dc19b fixed issue #705 2019-04-02 11:34:45 +05:30
imanghafoori a84b81f446 flatten code 2019-04-01 18:39:15 +03:30
imanghafoori 1a4c040894 remove unused code 2019-04-01 18:38:18 +03:30
rahul shukla 84d4992944 issue #757 2019-04-01 18:06:16 +05:30
rahul shukla 037126f82a issue #757 2019-04-01 17:17:26 +05:30
Prashant Singh 06aa4dd6bf Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:45:56 +05:30
Prashant Singh 91b4d1f955 fixed issue #761 2019-03-31 23:37:50 +05:30
Prashant Singh 0e1f26e835 fixed issue #763 2019-03-31 22:56:30 +05:30
Prashant Singh ea99fc8c68 fixed issue 764 2019-03-31 22:41:14 +05:30
Prashant Singh 8af43eb5cc session expiration time now changed to 10 minutes to counter XSRF requests 2019-03-30 18:14:54 +05:30
Prashant Singh 5346312ad0 revising issue #705 2019-03-30 16:50:53 +05:30
Prashant Singh fc3c1a468b fixed issue #705 2019-03-30 16:44:21 +05:30
rahul shukla 68bb6a6149 issue #706 2019-03-28 20:20:00 +05:30
Prashant Singh fef1b2d8da Fixing of 3rd level menu issue for custom roles #705 2019-03-28 18:09:29 +05:30
rahul shukla 0002f7caaa issue #736 2019-03-28 12:50:00 +05:30
Prashant Singh 034deb05fc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-28 10:35:24 +05:30
rahul shukla fa0a3ee4ee issue #706 2019-03-27 20:13:43 +05:30
Prashant Singh e9b511a92a probable solution for 3 level menu bug 2019-03-26 16:00:37 +05:30
Prashant Singh 54d2a000c8 Fixing some issues and probably solving later 2019-03-25 15:59:37 +05:30
rahul shukla 2a57530184 issue #735 & minor config changes for select 2019-03-22 14:54:46 +05:30
rahul shukla dca138ae85 issue #724 2019-03-22 11:58:11 +05:30
rahul shukla dc08bbc06e installer issue 2019-03-20 15:09:24 +05:30
Prashant Singh 7ad8d567b1 Arabic translations added 2019-03-19 14:28:35 +05:30
Prashant Singh 97da404216 default channel now getting checked with admin 2019-03-19 13:22:06 +05:30
Jitendra Singh a34a2f2ba4
Merge pull request #714 from prashant-webkul/development 
Development
 2019-03-19 12:16:54 +05:30
Prashant Singh 40a0fa8cb0 Fixed issues #710 #709 2019-03-19 12:13:17 +05:30
jitendra 41217e525f Assets compiled for production 2019-03-15 19:31:23 +05:30
Prashant Singh 0a4fd97a0c fixed issues with rtl 2019-03-15 17:14:13 +05:30
Prashant Singh 8b430988c4 assets compiled for production 2019-03-15 16:46:02 +05:30
Prashant Singh d4f292490b more probable solution for admin menu scrolling 2019-03-15 13:28:55 +05:30
jitendra 2e9f58917f Category display mode feature added 2019-03-15 13:08:21 +05:30
Prashant Singh 319e4edeb1 some more logic is required for proper scrolling of menu bar 2019-03-14 15:50:24 +05:30
Prashant Singh 556dd64327 removed some dead code 2019-03-14 12:06:51 +05:30
Prashant Singh 5fc85dffe4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-14 11:01:04 +05:30
Prashant Singh 31eab00df7 added disbaled state to the new radio button used on checkout pages 2019-03-14 10:59:35 +05:30
Prashant Singh d66f9de5dd admin layout fixes 2019-03-13 19:47:40 +05:30
Prashant Singh b6d14808b6 layout fixes in admin panel 2019-03-13 19:12:00 +05:30
Jitendra Singh 92adadb882
Merge pull request #689 from jitendra-webkul/jitendra 
Added api for get request
 2019-03-13 16:48:30 +05:30
jitendra f489c42bdd Added api for get request 2019-03-13 16:47:52 +05:30
rahul shukla 99405ebcaf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 12:34:16 +05:30
rahul shukla 634dd0e458 translation added for configuration 2019-03-13 12:33:45 +05:30
Jitendra Singh fcd99188da
Merge pull request #686 from jitendra-webkul/jitendra 
Updated customer group mapping function name
 2019-03-13 12:25:22 +05:30
jitendra 672f2f8c2b Updated customer group mapping function name 2019-03-13 12:24:32 +05:30
rahul shukla 281567456b product linking completed 2019-03-13 10:33:43 +05:30
rahul shukla 3bb197c75a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 09:38:36 +05:30
rahul shukla 9b82321d4f change in related products 2019-03-12 21:05:10 +05:30
Prashant Singh cd9504324c Adding the scroll event script on navbar left in progress 2019-03-12 19:10:26 +05:30
Prashant Singh e512bad843 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-12 18:31:46 +05:30
Prashant Singh ec19630b22 Fixed some layout issues with admin 2019-03-12 18:31:15 +05:30
Jitendra Singh 45afd5652e
Merge pull request #681 from cagartner/pt-br-translation 
Added pt-br translation
 2019-03-12 17:57:37 +05:30
Carlos Augusto Gartner 2e2d7d7642 Added pt-br translation 2019-03-12 09:19:27 -03:00
jitendra a7eec79fbd Editor added on category description textarea 2019-03-12 16:45:08 +05:30
Prashant Singh d2836b50ab One way to hide the side drawer 2019-03-12 13:39:32 +05:30
Prashant Singh 97ce7dc195 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-12 12:25:50 +05:30
Prashant Singh c9c5208693 Updated the list of exportable grids 2019-03-12 12:19:28 +05:30
Prashant Singh 9578f7609b export functionality refactored 2019-03-12 12:13:48 +05:30
jitendra 12a4c6dc09 Fixed conflict and Assets compiled for prodcution 2019-03-12 12:04:55 +05:30
jitendra 42b5f91764 Feature Request #666 implented 2019-03-12 11:59:00 +05:30
Prashant Singh 9eb1deb3fa Datagrid export functionality refactoring 2019-03-12 11:07:12 +05:30
Prashant Singh 9cfbdc6c1b Filterable checks implemented in datagrid 2019-03-11 19:36:58 +05:30
Prashant Singh 238c248852 Filterable checks implemented in datagrid 2019-03-11 19:36:15 +05:30
Prashant Singh 20247136a0 disabled side menu toggle for admin, created configuration for product types 2019-03-11 18:39:42 +05:30
rahul shukla 3ad2aec865 issue #655 2019-03-08 13:31:16 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
rahul shukla 95c898c4a8 up-sell, cross-sell & related-product 2019-03-05 18:32:15 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
rahul shukla ab9bf8ea97 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-04 10:11:39 +05:30
rahul shukla ca39b84d0b upsell product 2019-03-04 10:11:24 +05:30
Prashant Singh 62f8cf1bad Fixed issue #642 2019-03-01 11:05:56 +05:30
Prashant Singh 543af40328 Issue in shipments grid is fixed 2019-02-28 16:29:46 +05:30
jitendra 876041aee4 Issue #639 fixed 2019-02-27 20:30:07 +05:30
jitendra cceed7d048 Shipment grid issue fixed 2019-02-27 19:17:13 +05:30
jitendra e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
jitendra 90540d445e Fixed swatch issue 2019-02-26 14:32:18 +05:30
rahul shukla c02d75774d rtl class removal 2019-02-26 14:18:42 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +05:30
JItendra Singh 2775885b61
Merge pull request #625 from jitendra-webkul/jitendra 
Added margin top on pagination
 2019-02-26 13:14:59 +05:30
jitendra 71ddbacbd8 Added margin top on pagination 2019-02-26 13:14:18 +05:30
JItendra Singh 8394fc19ae
Merge pull request #623 from jitendra-webkul/jitendra 
Issue #621 fixed
 2019-02-26 13:00:35 +05:30
jitendra 4f420ca483 Issue #621 fixed 2019-02-26 12:59:58 +05:30
JItendra Singh 242b64afbf
Merge pull request #614 from prashant-webkul/development 
Development
 2019-02-26 11:56:43 +05:30
JItendra Singh c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra 
Option swatches feature added
 2019-02-26 11:55:42 +05:30
jitendra 0c84a9dcb2 Option swatches feature added 2019-02-26 11:55:00 +05:30
rahul shukla 35cdb1fd52 rtl css changes for admin 2019-02-25 19:05:45 +05:30
rahul shukla db0cd27c0d issue #615 2019-02-22 17:05:27 +05:30
Prashant Singh 33a58daa35 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-22 16:15:16 +05:30
rahul shukla 3aacfc6acf admin name for attribute 2019-02-22 15:55:29 +05:30
Prashant Singh 8ebb6868c5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-22 15:00:45 +05:30
rahul shukla 2da9f80bea issues #586 2019-02-21 18:40:43 +05:30
rahul shukla 19101afc18 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-21 16:36:45 +05:30
rahul shukla 59ecc0f019 guest review 2019-02-21 16:36:27 +05:30
JItendra Singh 491504a844
Merge pull request #609 from jitendra-webkul/jitendra 
Issue #608 fixed
 2019-02-21 15:02:49 +05:30
jitendra fd07499407 Issue #608 fixed 2019-02-21 15:01:44 +05:30
rahul shukla 2d62465d60 issues #596 and #597 2019-02-20 17:14:14 +05:30
rahul shukla be1de2d1ab assests compile 2019-02-20 14:46:44 +05:30
Prashant Singh 1f13298b65 base sync with master 2019-02-20 13:02:59 +05:30
jitendra 5e4ab5dd8f Webpack mix files updated and assets compiled for production 2019-02-20 12:38:09 +05:30
jitendra cb4f1ce65a rtl added to body tag if locale code is ar 2019-02-20 12:17:40 +05:30
jitendra 37e605e489 Issue #585 fixed 2019-02-20 12:10:02 +05:30
jitendra 834ed4badc Issue #592 fixed 2019-02-20 12:06:53 +05:30
Prashant Singh 0e9e94683d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-19 11:23:28 +05:30
Prashant Singh 1f30971c63 Fixed issue #592 2019-02-18 18:39:48 +05:30
Prashant Singh 262bfbbd06 Fixed issue #304 2019-02-18 17:19:54 +05:30
rahul shukla 6172692954 assests compile & merge with master 2019-02-15 20:13:02 +05:30
JItendra Singh 78cb14d0dd
Merge pull request #579 from jitendra-webkul/jitendra 
Fixed view event issues
 2019-02-15 13:07:59 +05:30
jitendra a03e5dc132 Fixed view event issues 2019-02-15 13:07:02 +05:30
JItendra Singh 62d3f4c9df
Merge pull request #578 from jitendra-webkul/jitendra 
View event added to catalog pages
 2019-02-15 12:54:24 +05:30
jitendra dda8b0bc92 View event added to catalog pages 2019-02-15 12:52:26 +05:30
rahul shukla 455f9442d4 conflict resolve 2019-02-15 11:35:45 +05:30
rahul shukla 05d3318cc8 assests compile 2019-02-15 11:32:00 +05:30
jitendra 15fe87d72c Assets compiled for production 2019-02-15 11:31:19 +05:30
rahul shukla 0b0f425bf4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 11:29:05 +05:30
rahul shukla d7213db2c9 customer password 2019-02-15 11:28:47 +05:30
Prashant Singh f68c4e482c Fixed bug #575 2019-02-15 09:51:38 +05:30
rahul shukla 77b9083d47 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-13 17:42:18 +05:30
rahul shukla e4bdf11a7d lang added 2019-02-13 17:42:07 +05:30
Prashant Singh 510ee89aad language meta tag added for storefront 2019-02-13 15:05:56 +05:30
jitendra 35d0030633 Added config field infomation option 2019-02-13 14:51:51 +05:30
jitendra 5c4ab00f83 Fixed configuration repository select field issue 2019-02-13 13:11:31 +05:30
jitendra 98f3edc199 Assets compiled for production 2019-02-12 20:11:44 +05:30
rahul shukla e824f4741b assests compile 2019-02-11 18:12:06 +05:30
rahul shukla 15ae803407 merge with master 2019-02-11 17:18:06 +05:30
rahul shukla 1c16e2f2a9 validation for upload 2019-02-11 17:15:22 +05:30
JItendra Singh 69ca02540b
Merge pull request #561 from jitendra-webkul/jitendra 
Jitendra
 2019-02-11 15:20:54 +05:30
jitendra 7bfb216bb0 Dashboard sql issue fixed 2019-02-11 15:13:38 +05:30
rahul shukla 446adfba0c backend validation for import 2019-02-08 17:24:48 +05:30
rahul shukla fdcf420af9 import for tax rate 2019-02-08 16:53:48 +05:30
Prashant Singh 4661e5b738 mass updated for product review updated for customer review datagrid 2019-02-08 15:46:43 +05:30
Prashant Singh 5584aa27a8 Disapproved functionality for customer review implemented 2019-02-08 15:44:00 +05:30
Prashant Singh af5f039cb9 category creation fix 2019-02-08 15:32:33 +05:30
Prashant Singh de6507ff08 Fixed Issue #551 - Root Category Getting Deleted 2019-02-06 16:28:00 +05:30
jitendra f2f3592376 Assets compiled for production 2019-02-04 15:41:43 +05:30
Prashant Singh 6fe7167ecd assets compiled for production 2019-02-04 15:30:10 +05:30
Prashant Singh ad1b2c5f7c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-04 15:29:33 +05:30
JItendra Singh b359957bc2
Merge pull request #538 from jitendra-webkul/jitendra 
Jitendra
 2019-02-04 15:24:03 +05:30
jitendra 35ccc65342 Fixed shipment grid shipped to column 2019-02-04 15:23:06 +05:30
jitendra 49ddcd0256 Issue #191 fixed 2019-02-04 15:18:24 +05:30
Prashant Singh 8b3bf5a6ab assets compiled for product 2019-02-04 15:18:20 +05:30
Prashant Singh 8f78d8f2be issue #368 readdressed and same fix applied again after reviewal 2019-02-04 15:14:02 +05:30
JItendra Singh c304bb0781
Merge pull request #537 from jitendra-webkul/jitendra 
Issues #353, #447, #530, #522 fixed
 2019-02-04 14:57:10 +05:30
jitendra 639d4b1581 Issues #353, #447, #530, #522 fixed 2019-02-04 14:56:13 +05:30
rahul shukla 1d83049a12 #531 2019-02-04 13:13:10 +05:30
rahul shukla 08fe30ac61 #523 and #519 2019-02-04 12:02:59 +05:30
JItendra Singh 50df14c2de
Merge pull request #525 from jitendra-webkul/jitendra 
Acl issue fixed for Configuration pages
 2019-02-01 17:06:05 +05:30
jitendra 822d1b667c Acl issue fixed for Configuration pages 2019-02-01 17:05:19 +05:30
JItendra Singh 2d99b565b1
Merge pull request #509 from rahulshukla-webkul/development 
configuration changes
 2019-02-01 16:48:25 +05:30
jitendra cc6ca21447 Fixed grid issues 2019-02-01 15:07:11 +05:30
jitendra 2d1a816349 Issue #514 fixed 2019-02-01 12:19:30 +05:30
jitendra 649f72087d Updated datagrid's item count 2019-01-31 17:36:43 +05:30
rahul shukla 41d3f74fc1 configuration changes 2019-01-31 17:04:32 +05:30
jitendra fcdf86eb73 Assets compiled for production 2019-01-31 15:23:53 +05:30
rahul shukla ee91d69361 configuration changes 2019-01-31 15:18:36 +05:30
rahul shukla 7dae5da461 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-30 21:26:07 +05:30
rahul shukla 2f8178afc0 file & image field for configuration 2019-01-30 21:25:38 +05:30
jitendra 54f3f2f5b6 Items label added in order item table 2019-01-29 19:02:41 +05:30
JItendra Singh 118e9e89c5
Merge pull request #497 from prashant-webkul/development 
Fixed issues, bugs and general enhancements.
 2019-01-29 18:41:34 +05:30
jitendra 70c114d3a6 Channel homepage content updated in seeder 2019-01-29 18:32:10 +05:30
Prashant Singh af6e9351af Fixed issue #426 for the maintenance page was not working due to our own custom handler was not handling the HTTP exception 503 on an independent file 2019-01-29 18:25:42 +05:30
JItendra Singh ae4b1cebe2
Merge pull request #495 from rahulshukla-webkul/development 
Development
 2019-01-29 16:21:28 +05:30
jitendra 209f73d46b Issues #217, #396, #227, #321 2019-01-29 16:05:43 +05:30
Prashant Singh ef1687b88c default sort order on the default index of the datagrids had beenh set to descending order 2019-01-29 13:44:27 +05:30
rahul shukla 36f98a8a4e issue #234 2019-01-28 17:05:06 +05:30
rahul shukla 9c934d8e8d issues #401 2019-01-28 15:04:45 +05:30
jitendra 230f9ff988 Channel inventories seeder added 2019-01-25 20:51:24 +05:30
jitendra 6fff4701a6 Flat rate implemented 2019-01-25 17:24:48 +05:30
rahul shukla 363efffaaa merge with master 2019-01-25 10:58:47 +05:30
rahul shukla 06108b4698 issue #395 & #261 2019-01-24 19:21:13 +05:30
Prashant Singh f156511e97 merged with master 2019-01-22 10:35:05 +05:30
Prashant Singh 2172ac60dd fixed the issues with routes of actions in admin datagrids 2019-01-21 16:29:20 +05:30
jitendra 14730fe432 Category add link fixed 2019-01-21 16:19:38 +05:30
Prashant Singh 8f4093d49a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-21 15:53:28 +05:30
Prashant Singh f553dcdc71 assets compiled for production 2019-01-21 15:52:56 +05:30
jitendra dd36c2adf1 Seeder issue fixed 2019-01-21 15:51:28 +05:30
jitendra 42eb46e78c Asset compiled for production 2019-01-21 15:26:00 +05:30
Prashant Singh 6e2dad64de Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-21 15:20:52 +05:30
jitendra 61c10dd48d Category seeder added 2019-01-21 14:36:38 +05:30
Prashant Singh 3289ab8a4a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-21 12:39:36 +05:30
Prashant Singh 9eeaee1c66 migration changes in the product flat table 2019-01-19 15:35:12 +05:30
Prashant Singh 50a0a71196 product flat column creation and deletion on the basis of attributes 2019-01-18 17:36:58 +05:30
JItendra Singh 63f141e3bd
Merge pull request #472 from jitendra-webkul/jitendra 
Issues fixed
 2019-01-18 16:41:22 +05:30
jitendra fbbf1fe99f Issues fixed 2019-01-18 16:40:40 +05:30
Prashant Singh bcb2661722 Datagrids display issue fixed when toggling massactions 2019-01-18 14:59:19 +05:30
Prashant Singh 0edebcf5c7 Table display issues when use mass actions filters and products flat events 2019-01-18 13:08:42 +05:30
JItendra Singh 871bf40d3a
Merge pull request #470 from jitendra-webkul/jitendra 
Global Event bus added for vue
 2019-01-18 13:05:32 +05:30
jitendra 00b9007d99 Global Event bus added for vue 2019-01-18 13:04:49 +05:30
rahul shukla 00ac9bbc01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-18 12:06:34 +05:30
rahul shukla e2cfd0683c installer changes for windows 2019-01-18 12:05:53 +05:30
Prashant Singh e2037c4892 datagrid's configuration dependency is removed and dynamic row format is back 2019-01-18 10:33:42 +05:30
rahul shukla bd9ddfb0d7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 20:22:20 +05:30
rahul shukla d50bb3e962 configuration message 2019-01-17 20:22:01 +05:30
jitendra 4488002522 Updated event code for order action 2019-01-17 17:29:07 +05:30
jitendra 5130a640c1 Sub Total Column added to the order grid 2019-01-17 16:24:57 +05:30
Prashant Singh eb373d7ecb More changes in datagrid, regarding implementation of wrapper columns 2019-01-17 15:24:58 +05:30
rahul shukla bac0d48ab3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 15:18:11 +05:30
rahul shukla e018d6555f export issue 2019-01-17 15:17:44 +05:30
Prashant Singh 25e485274e read me changes 2019-01-17 11:59:51 +05:30
Prashant Singh 1f3d84ed7e default index parameter corrected for some datagrids 2019-01-17 11:27:22 +05:30
Prashant Singh 4c3f70f60c datagrid mass selection issue is fixed when no checkboxes for record is checked then master checkbox is also automatically unchecked 2019-01-17 11:23:04 +05:30
Prashant Singh 89ec9b5a9e bug fix for action and massaction in datagrid 2019-01-17 10:23:03 +05:30
JItendra Singh 9e3019f882
Merge pull request #460 from jitendra-webkul/jitendra 
Now config field label will be tranlate
 2019-01-16 20:08:43 +05:30
jitendra fb6a16596a Now config field label will be tranlate 2019-01-16 20:07:48 +05:30
Prashant Singh 31f6e62bd0 a new type of column for price added 2019-01-16 19:57:45 +05:30
Prashant Singh 0776c8f331 width parameter in datagrid will now run as optional 2019-01-16 19:47:39 +05:30
Prashant Singh 6c9b381d4c Changes in datagrids 2019-01-16 19:19:37 +05:30
Prashant Singh e38763c126 Enable action and mass action will not bother whether implemented or not on the datagrid files 2019-01-16 16:53:19 +05:30
rahul shukla 8c32a21521 export changes 2019-01-16 16:43:36 +05:30
rahul shukla 4747f8fb59 customer design fixex 2019-01-16 14:08:39 +05:30
Prashant Singh e48ac7e295 datagrid sort and filter fixes 2019-01-15 18:55:50 +05:30
jitendra 575373cd75 Coding standard updated 2019-01-15 17:32:43 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
JItendra Singh cedfeb034a
Merge pull request #452 from prashant-webkul/development 
Development
 2019-01-15 16:08:58 +05:30
Prashant Singh 976b29fe59 datagrid fixes 2019-01-15 16:07:06 +05:30
jitendra a781594b10 Translations added for menu and acl lables 2019-01-15 16:03:55 +05:30
Prashant Singh 0607a9e818 set index as abstract method changed to protected property 2019-01-15 16:00:26 +05:30
Prashant Singh 9aa55472ab Datagrid issue fixes 2019-01-15 15:47:13 +05:30
Prashant Singh 6e966384e5 Disabled customer email verfication and removed the phone field from the customer model 2019-01-15 13:03:41 +05:30
jitendra c0da6fbd73 Attribute family creation issue fixed 2019-01-14 19:41:34 +05:30
jitendra 6040e464fd Pagination count changed in all grids 2019-01-11 20:07:53 +05:30
Prashant Singh a2c02817f8 added labels to the filter tags 2019-01-11 19:55:44 +05:30
Prashant Singh 11fd8adfff pagination fixes in newly refactored datagrid 2019-01-11 18:35:25 +05:30
Prashant Singh 7785475eb9 mass actions enhanced and one bug remvoed causing value havoc 2019-01-11 17:23:36 +05:30
Prashant Singh 6d203fd8f6 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-11 16:56:10 +05:30
Prashant Singh 128e316265 pagination fixes 2019-01-11 16:55:10 +05:30
Prashant Singh 9b85622533 unnecessary code is removed 2019-01-11 15:42:34 +05:30
jitendra 9c1612d0ab Assets compiled for production 2019-01-11 15:31:10 +05:30
rahul shukla f935937cbe Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-11 15:01:04 +05:30
rahul shukla dcb7029df2 validation changes 2019-01-11 15:00:44 +05:30
rahul shukla 64e52e5371 country & state issue 2019-01-11 14:54:03 +05:30
jitendra f1371fd6a0 Product inventory management updated 2019-01-11 14:51:20 +05:30
Prashant Singh 6f4aebe423 Datagrid enhancements and fault tolerant to column orders display and safe implementation of wrappers 2019-01-11 13:58:44 +05:30
rahul shukla 91c4a4205b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-11 10:40:06 +05:30
rahul shukla b7d15d4d0e validatio issue 2019-01-11 10:39:41 +05:30
Prashant Singh 436557fe81 minor changes in datagrid frontend templates 2019-01-10 18:54:35 +05:30
Prashant Singh 6c8bdf20c0 subtle changes in datagrid done and all datagrids have been refactored 2019-01-10 18:09:46 +05:30
Prashant Singh a4485e2191 merged with master 2019-01-10 11:54:17 +05:30
Prashant Singh 479341eaef all datagrids converted according to newly refactored pattern 2019-01-10 11:51:45 +05:30
Prashant Singh f5450cc516 Some fault tolerancy needs to be addressed before completing the refactoring 2019-01-09 17:11:00 +05:30
Prashant Singh dbc218243f Datagrid refactoring complete 95%, remaining with distincts and refactoring all grids according to the newly refactored method 2019-01-08 13:59:13 +05:30
Prashant Singh 926158cc0d datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components 2019-01-07 13:37:35 +05:30
jitendra b388dc9aa6 Assets compiled for production 2019-01-04 19:24:03 +05:30
rahul shukla 1e2d7418ca merge with master 2019-01-04 19:13:53 +05:30
rahul shukla 33ac4c1319 multiselect for configuration 2019-01-04 11:13:24 +05:30
Prashant Singh cb0a50233c Datagrid now fault tolerant on not passing select key in its configuration 2019-01-03 16:54:13 +05:30
Prashant Singh 2b32a6252e black listing some key parameters from the request bag and server bag and post bag 2019-01-03 14:53:01 +05:30
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
jitendra cb3da5fc08 Channel root category feature added 2018-12-31 16:34:26 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
jitendra 2e668c7020 Inventory source selection feature added during shipment creation 2018-12-26 15:30:23 +05:30
rahul shukla 95161d9101 changes in config 2018-12-26 14:59:52 +05:30
rahul shukla 1e25226997 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-26 14:47:50 +05:30
rahul shukla 9bb9ae5ce7 configuration changes 2018-12-26 14:46:27 +05:30
Prashant Singh 232e430ab0 fixed issue #319 2018-12-22 16:15:23 +05:30
Prashant Singh affcca3d08 fixed issue #304 2018-12-22 16:12:42 +05:30
Prashant Singh e526af061e Fixed issues #378, #379 and #373 2018-12-22 15:02:10 +05:30
Prashant Singh 81da5bd1d1 Changed the product card hover style and fixed issue #369 2018-12-22 11:56:26 +05:30
jitendra f4ca5a5b34 Compiled assets for production 2018-12-21 18:54:07 +05:30
Prashant Singh 089aaadb71 merge conflicts removed 2018-12-21 18:35:23 +05:30
jitendra 5916482f7c Add fire event on every controller 2018-12-21 18:18:34 +05:30
Prashant Singh 6fba17ea81 Fixed issues #300 & Updated inventory in product grid after order received 2018-12-21 16:14:20 +05:30
Prashant Singh 54a268302b fixed issue #354 2018-12-21 14:05:52 +05:30
jitendra 64e451d7f9 Issue #367 fixed 2018-12-21 13:57:58 +05:30
jitendra 954502c571 Issues #353, #354 2018-12-21 11:58:02 +05:30
jitendra 8b18b78663 Assets compiled for production 2018-12-20 18:26:18 +05:30
rahul shukla 405e8bfecb issue resolved 2018-12-20 18:20:52 +05:30
rahul shukla ef72b4d629 export button & review 2018-12-20 16:38:47 +05:30
jitendra 9654748f1f Issue #348 fixed 2018-12-20 16:24:30 +05:30
rahul shukla 13258deb0c lang added 2018-12-20 13:55:15 +05:30
rahul shukla b8752e31bc Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-20 13:37:16 +05:30
rahul shukla b832dc3a4a review changes 2018-12-20 13:37:03 +05:30
jitendra 0769eb9a41 Unnecessary border removed from every admin page and added view icon in order shipping, invoice list in order view page 2018-12-19 16:01:56 +05:30
jitendra c943fa3603 Compile assets from production 2018-12-19 15:05:23 +05:30
jitendra 0cf2fc4baf Issues fixed 2018-12-19 15:00:40 +05:30
prashant-webkul dfb4e5f210 subscription exception issue #337 fixed 2018-12-19 14:57:44 +05:30
prashant-webkul 0faf88a797 Issue fixed #329, admin changing their details with entering the current password 2018-12-19 13:36:33 +05:30
prashant-webkul 95d6d849f4 Fixed issue and modified issue fix #333 #332 and #326 2018-12-19 12:20:43 +05:30
prashant-webkul 3c8807e7e9 merge conflicts removed 2018-12-18 18:17:01 +05:30
prashant-webkul 489dcf0b54 Bugs and issues resolvements 2018-12-18 16:14:21 +05:30
jitendra 40fafca930 Configuration redirect to first config page fixed 2018-12-18 13:41:25 +05:30
rahul shukla 9cdc16a50b conflict resolve 2018-12-18 13:39:15 +05:30
prashant-webkul c4416bc228 Removed conflicts from the merge with the master 2018-12-18 11:09:54 +05:30
rahul shukla e3e80dde1e #305 & #298 2018-12-14 17:36:49 +05:30
rahul shukla b298a3973a validation in shipping & payment methods and issue #308 & #295 2018-12-14 15:26:01 +05:30
jitendra 9a699a64e5 Modified config creation 2018-12-14 15:02:59 +05:30
jitendra 2decdeb194 Removed event from menu, acl, config creation 2018-12-14 13:56:05 +05:30
rahul shukla 8cd04be89c shipping & payment methods 2018-12-14 11:56:52 +05:30
prashant-webkul d9f0ddc89d Fixed issues 314 and 315 2018-12-13 18:51:54 +05:30
jitendra 0bdd9e1a2a Refactor Menu system and core config data system 2018-12-13 16:28:28 +05:30
jitendra 15135d64d7 Fixed menu sort issue 2018-12-12 16:26:20 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +05:30
prashant-webkul 60babb693d Previous datagrid columns for date and booleans were of type string but they have been changed according to the new filters for the respective 2018-12-10 09:58:45 +05:30
prashant-webkul 529e0ecd3b date operations in datagrid implemented in order grid filters 2018-12-07 18:54:58 +05:30
prashant-webkul 263c23698e boolean filtering now implemented in datagrid 2018-12-07 17:21:19 +05:30
prashant-webkul 1e05840c7d Regular merge with master 2018-12-07 15:44:03 +05:30
prashant-webkul 45903d3c0a Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes 2018-12-07 14:45:31 +05:30
jitendra 3515adeb03 Refactor core config system 2018-12-07 12:35:34 +05:30
rahul shukla c90789a210 merge with master 2018-12-07 11:00:02 +05:30
rahul shukla b78cc23797 shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable 2018-12-07 10:55:33 +05:30
jitendra e29c5f39f0 Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165 2018-12-06 17:29:26 +05:30
rahul shukla 4201a1ec48 export completed 2018-12-04 11:52:01 +05:30
rahul shukla 2f555a798c export 2018-12-04 10:52:15 +05:30
jitendra 94a1cd9800 Compiled assets for production 2018-12-04 10:42:02 +05:30
JItendra Singh a60ca52eb6
Merge pull request #257 from bagisto/prashant 
Prashant
 2018-12-04 10:38:35 +05:30
rahul shukla bd1489dac6 export 2018-12-04 10:07:57 +05:30
jitendra f75cfe66fc ACL issue fixed 2018-12-04 09:56:15 +05:30
rahul shukla 27f5e1d93d export 2018-12-04 09:53:52 +05:30
prashant-webkul 40f37cddd4 customer group add and delete fixes 2018-12-03 18:58:57 +05:30
prashant-webkul 5d42bebbf1 Customer group delete bug fix 2018-12-03 18:50:20 +05:30
prashant-webkul 48bece3531 datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also. 2018-12-03 13:41:35 +05:30
Ali Nazari 3ea703c367 optimized ExceptionHandler 2018-12-01 13:33:32 +03:30
prashant-webkul 552bf4b1f9 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-11-30 20:38:15 +05:30
prashant-webkul 7fb67dc161 mass operations and datagrid operations normalization 2018-11-30 20:37:41 +05:30
JItendra Singh 83491fd612
Merge pull request #252 from bagisto/jitendra 
Issue #247 (Displaying wrong number of products and sales in category…
 2018-11-30 14:46:04 +05:30
prashant-webkul 36f6783db8 cart bug fixes and small css fix 2018-11-30 13:10:41 +05:30
jitendra 4e8081ed58 Issue #247 (Displaying wrong number of products and sales in category, on dashboard) 2018-11-30 12:15:10 +05:30
rahul shukla 984ff18267 merge with master 2018-11-29 18:13:45 +05:30
prashant-webkul a6adfe679c admin newsletter datagrid translation fixes 2018-11-29 18:08:37 +05:30
rahul shukla bb310cd5c7 route change 2018-11-29 18:07:58 +05:30
prashant-webkul 5f81a79796 Subscription newsletter migration restored and subsctiption newsletter datagrid in admin 2018-11-29 18:05:56 +05:30
rahul shukla e1b2d1eb01 export for customer 2018-11-29 17:39:39 +05:30
prashant-webkul e1f7b4deff datagrid issue fixes, some column aliases were using underscores due to a bug in symfony it was getting converted into dot, all the aliases are now underscore free 2018-11-29 15:40:23 +05:30
rahul shukla 77c501f170 dfd 2018-11-29 13:52:08 +05:30
prashant-webkul b2161571bd XSS fixes in datagrid where directly some columns were create html unescaped, migration fixes for products grid table, changelog added for past two releases v0.1.0 & v0.1.1 2018-11-29 13:20:50 +05:30
rahul shukla 30ade42635 review changes 2018-11-29 13:03:50 +05:30
rahul shukla 41aae38b14 view all & customer name 2018-11-29 12:12:44 +05:30
jitendra 2422d93c76 Ajax CSRF token issue fixed 2018-11-29 10:29:17 +05:30
JItendra Singh e56c47697e
Merge pull request #231 from bagisto/prashant 
Order, order shipments full name fixes in datagrid
 2018-11-28 17:16:55 +05:30
jitendra 7fa16f8be3 Issue #126 fixed (Add asterisk symbol on SKU field) 2018-11-28 17:15:57 +05:30
prashant-webkul daf2bde541 Order, order shipments full name fixes in datagrid 2018-11-28 16:54:23 +05:30
jitendra fe9e219334 Now raw expression will work on select raw dd(->columns); 2018-11-28 16:31:20 +05:30
JItendra Singh c8acd1823d
Merge pull request #205 from bagisto/prashant 
migration fixes for product grid and fixes in slider data grid and ta…
 2018-11-28 16:15:31 +05:30
prashant-webkul 217c94d76b migration fixes for product grid and fixes in slider data grid and tax categories datagrid 2018-11-28 16:10:48 +05:30
JItendra Singh a59d74ddfd
Merge pull request #198 from bagisto/prashant 
column label and column removal in attributes and order shipments dat…
 2018-11-28 15:14:18 +05:30
prashant-webkul 6f9c63e3ec column label and column removal in attributes and order shipments datagrid 2018-11-28 15:13:24 +05:30
Prashant Singh 6758e05b95
Merge pull request #196 from bagisto/prashant 
Prashant
 2018-11-28 14:54:46 +05:30
prashant-webkul 311701b00a tax category sync fix and select rates fixed 2018-11-28 14:05:44 +05:30
prashant-webkul a29feaf83f Email Subcription flow changed, email verfication enhancements for resending the email, reset password redirect issue solved and many other issue fixes 2018-11-28 12:59:08 +05:30
jitendra 230acb8b32 Issue #188 fixed (Customer group delete issue) 2018-11-28 12:41:17 +05:30
jitendra 8425098b2d tinyMCE undefined variable issue fixed 2018-11-28 12:33:02 +05:30
jitendra b57155eab3 Issue #151 fixed (Editor validation issue) 2018-11-28 11:43:38 +05:30
jitendra fafbcb432b Issues #175, #176 fixed and added bootstrap.js in main js file 2018-11-28 10:56:54 +05:30
prashant-webkul bf63545895 Bug fix for slider content field, changed to text and datagrid invoices and shipments columns added a/c to relevancy and removed mass actions 2018-11-27 18:56:25 +05:30
prashant-webkul 8b0c51c519 Validation messages fixes for client, product grid fixes, customer email verification fixes and changes, migration changes for customer gender columns and other isssues and bug fixes 2018-11-27 16:25:23 +05:30
jitendra e416b97e84 Issue #133 fixed 2018-11-27 11:02:53 +05:30
jitendra a9ef1269c3 Dashboard progress issues fixed 2018-11-27 10:53:47 +05:30
jitendra 82760de8d4 Issues #150 fixed 2018-11-27 10:44:13 +05:30
jitendra c510e8ae47 Assets compiled for production 2018-11-27 10:23:33 +05:30
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
prashant-webkul f93716a801 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-11-26 10:27:07 +05:30
prashant-webkul 9ce3e53914 Fixed Bug in Tax Module 2018-11-23 16:22:19 +05:30
prashant-webkul 5b5006b809 Customer Address API for CRUD and getting and making the default address is complete 2018-11-22 20:21:37 +05:30
jitendra 4c21d8ead6 Issues #134 fixed and Inventory source add/edit validation issue fixed 2018-11-21 16:44:07 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +05:30
jitendra 7758f450c6 Added more acl 2018-11-21 11:59:27 +05:30
prashant-webkul 662ff09a24 Bug Fixes 2018-11-21 11:59:18 +05:30
prashant-webkul ab9328d755 Auth API implemented using JWT tokens, removed laravel passport 2018-11-19 17:04:13 +05:30
prashant-webkul 8c12e35621 Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid 2018-11-16 17:21:10 +05:30
jitendra f0ef4f910a Paypal Integration added 2018-11-16 15:41:08 +05:30
jitendra c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
prashant-webkul ede86c2d4d Product Card UI fixes 2018-11-05 11:21:55 +05:30
jitendra d958ac45b6 Assets compiled for production 2018-11-01 19:23:06 +05:30
jitendra b182325772 Customer address form issues fixed, invoice print feature addred 2018-11-01 19:18:59 +05:30
rahul shukla 3924a0c943 rtl css 2018-11-01 19:15:54 +05:30
rahul shukla d90a07f159 rtl css 2018-11-01 19:13:55 +05:30
rahul shukla c80a2f4388 responsive product images 2018-10-31 20:01:43 +05:30
jitendra 3b4adf8b08 Assets merged for production 2018-10-31 12:54:50 +05:30
jitendra bc67fe761a Buy now and add to whislist issue fixed 2018-10-31 12:52:27 +05:30
jitendra ef462c8793 Merged with master 2018-10-30 17:08:05 +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
rahul shukla 2517dfbf03 merge with master 2018-10-30 12:19:43 +05:30
prashant-webkul 13e56c1930 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-30 11:59:48 +05:30
jitendra 97c7ca84c6 Dashboard issue fixed 2018-10-30 11:58:15 +05:30
prashant-webkul e59f5a775b Order Grid, Wishlist Bug Fixes 2018-10-30 10:01:01 +05:30
rahul shukla 3c0c4481a2 conflict resolve 2018-10-29 13:05:57 +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 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
prashant-webkul 8e2d45e498 TinyMCE integration and Slider Content Fixes 2018-10-26 19:59:24 +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
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
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 462dc9fafb Bug Fixes 2018-10-26 12:35:19 +05:30