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

749 Commits

Author SHA1 Message Date
rahul shukla 75e74dfb7e issue #867 shipment issue 2019-04-24 17:57:16 +05:30
rahul shukla c4eb615328 issue #842 2019-04-23 18:53:41 +05:30
rahul shukla e52c426600 dashboard & issue #841 2019-04-23 16:20:33 +05:30
jitendra 7a5c3f1bdc Assets compiled for production 2019-04-23 12:58:47 +05:30
rahul shukla 148ff7c1e8 merge with master 2019-04-23 12:36:05 +05:30
Jitendra Singh 025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra 
Issue #840 fixed
 2019-04-23 10:33:58 +05:30
jitendra c585186a88 Issue #840 fixed 2019-04-23 10:33:10 +05:30
rahul shukla 560d1fb0bc issue #856 2019-04-22 20:52:36 +05:30
rahul shukla 0239b7ec0b issue #846 2019-04-18 20:22:37 +05:30
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