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

691 Commits

Author SHA1 Message Date
Jitendra Singh ebc0befe6a
Merge pull request #813 from naresh-webkul/development 
Development
 2019-04-10 13:25:43 +05:30
rahul shukla d1e38fe83b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 12:12:15 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
naresh verma 4f999ee34a changed shipment table content 2019-04-09 19:40:43 +05:30
naresh verma ab4c054292 changed shipment table 2019-04-09 18:52:44 +05:30
rahul shukla e5d71fa280 change in jquery for wishlist icon for zoom 2019-04-09 17:59:58 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
Jitendra Singh 7678593bd4
Merge pull request #812 from rahulshukla-webkul/development 
Development
 2019-04-09 15:52:46 +05:30
rahul shukla 6a7f247d7a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 15:30:52 +05:30
jitendra 6b247993e4 Theme finder issue fixed (Shop changes was reflecting in admin) 2019-04-09 15:22:45 +05:30
rahul shukla a3999d7a23 merge with master 2019-04-09 15:13:26 +05:30
rahul shukla 9d89ec816d comment, variable name changes 2019-04-09 14:17:18 +05:30
rahul shukla 09aa34b36a issue #749 fixed again & reduce query 2019-04-09 14:05:57 +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 09d6afc72a Implemented customer configuration based features: 
1. Email Verification.
2. Email Subscription.
 2019-04-09 08:03:31 +05:30
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 82e56334c2 Fixed modal style issues, localization of routes issue and updated description string of version command 2019-04-07 06:30:55 +05:30
Prashant Singh c7482f576e Some styles fixes on auth pages of customer and footer bottom 2019-04-07 03:44:18 +05:30
Prashant Singh 61fd02ed57 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 19:38:56 +05:30
rahul shukla fdb6284856 issue #760 wishlist 2019-04-05 16:54:09 +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
rahulshukla-webkul 23bb48e759 Development (#790) 
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop

* issue #785 product name display

* merge with master & assests compile
 2019-04-03 12:17:47 +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
rahul shukla 39acb0de43 merge with master 2019-04-02 13:26:39 +05:30
rahul shukla 9e58602262 issue #758 2019-04-02 13:24:11 +05:30
Jitendra Singh 95ea54d220
Merge pull request #779 from prashant-webkul/development 
Fixed issue #775
 2019-04-02 10:27:43 +05:30
Prashant Singh 9c55f5037d Fixed issue #775 2019-04-02 09:39:43 +05:30
rahul shukla 56142bf3d8 issue #759 2019-04-01 20:00:54 +05:30
Jitendra Singh 0bd03c2c62
Merge pull request #769 from cagartner/feature/add-id-streetlines 
Added id attribute to streetlines
 2019-04-01 15:15:24 +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 40ebb3a0c4 Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:43:44 +05:30
Prashant Singh 4a2efc8eee fixed issue #749 2019-04-01 01:32:58 +05:30
Carlos Augusto Gartner b8d78ab00d Added id attribute to streetlines 2019-03-31 15:35:07 -03:00
Prashant Singh ea99fc8c68 fixed issue 764 2019-03-31 22:41:14 +05:30
Prashant Singh 1d372621ce Security fix for customer information and fixed issue #762 2019-03-30 18:55:10 +05:30
rahul shukla 257dfc8b1e rtl css for product list & currency capital 2019-03-29 16:48:00 +05:30
rahul shukla 8897a27499 issue #730 2019-03-29 13:11:49 +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 d4c58724ae issue #728 2019-03-28 15:36:48 +05:30
rahul shukla fb6b4a13f1 issue #738 2019-03-28 14:29:45 +05:30
rahul shukla 23fe05e192 issue #742 2019-03-28 10:10:26 +05:30
rahul shukla c2f24d47cb merge with master 2019-03-27 14:26:52 +05:30
rahul shukla a3b9ef427e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-27 14:25:21 +05:30
Jitendra Singh 5a2a3c1988
Merge pull request #744 from cagartner/feature/default-laravel-translations 
Created default laravel translation for pt_BR
 2019-03-27 09:10:16 +05:30
Carlos Augusto Gartner cbfe9a53dd Created default laravel translation for pt_BR 2019-03-26 15:17:45 -03:00
rahul shukla d4d93739dc product zoom functionality added 2019-03-25 16:32:13 +05:30
rahul shukla 2a57530184 issue #735 & minor config changes for select 2019-03-22 14:54:46 +05:30
rahul shukla e41445e802 issues #729 and #731 2019-03-22 12:54:38 +05:30
rahul shukla e052276907 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-22 11:58:28 +05:30
rahul shukla dca138ae85 issue #724 2019-03-22 11:58:11 +05:30
Prashant Singh c84e76646e Fixed issue #720 2019-03-20 10:13:27 +05:30
Prashant Singh 8b85452097 changed the add to buttons in bagisto 2019-03-19 18:18:59 +05:30
rahul shukla a9d1794547 changes in cross sell 2019-03-18 19:01:10 +05:30
rahul shukla f54f8989dc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-18 16:36:00 +05:30
rahul shukla 10f40c90ec strict mode error 2019-03-18 16:35:41 +05:30
jitendra 41217e525f Assets compiled for production 2019-03-15 19:31:23 +05:30
Prashant Singh 8b430988c4 assets compiled for production 2019-03-15 16:46:02 +05:30
Jitendra Singh 1759392af5
Merge pull request #698 from jitendra-webkul/jitendra 
Category display mode feature added
 2019-03-15 13:09:19 +05:30
jitendra 2e9f58917f Category display mode feature added 2019-03-15 13:08:21 +05:30
rahul shukla 4ed551c008 removing zoom 2019-03-14 14:41:21 +05:30
rahul shukla ebf96ad9d6 installer isuue & product page changes 2019-03-14 14:34:32 +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
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
Jitendra Singh 7ad71d1d58
Merge pull request #682 from jitendra-webkul/jitendra 
Update get all product function
 2019-03-12 18:24:00 +05:30
jitendra 961e00227f Update get all product function 2019-03-12 18:23:11 +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
jitendra 99e866d055 Fixed slider controller namespace issue 2019-03-12 16:03:57 +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 238c248852 Filterable checks implemented in datagrid 2019-03-11 19:36:15 +05:30
Jitendra Singh d1489fa498
Merge pull request #663 from jay-thanki/patch-2 
subscriber_email email changes
 2019-03-08 11:54:13 +05:30
Jay Thanki 727e6a2b89
subscriber_email email changes 
change email subscriber_email as footer field assign to this field.
 2019-03-08 11:31:31 +05:30
Jay Thanki 23db740306
subscriber_email changes 
email names are same for signup form and footer email address field. so i changed footer email addess to subscriber_email
 2019-03-08 11:31:18 +05:30
rahul shukla 4e803a638b reverting category changes 2019-03-07 18:31:18 +05:30
rahul shukla faf2400a75 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-07 18:22:08 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
Prashant Singh 1e215e43c0 Some html attributes added on the checkout pages 2019-03-07 10:05:05 +05:30
rahul shukla c2ae22a262 merge with master 2019-03-05 18:35:44 +05:30
rahul shukla 76aa1da818 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 18:33:58 +05:30
rahul shukla 95c898c4a8 up-sell, cross-sell & related-product 2019-03-05 18:32:15 +05:30
Prashant Singh aac1c583f5 assets compiled for production 2019-03-05 16:32:12 +05:30
Prashant Singh 7ae4be56b8 fixed issue #642, made changes in layout of checkout section, various display bugs had been fixed 2019-03-05 16:28:55 +05:30
rahul shukla eb38784f7f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 15:16:35 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
jitendra 1079331358 Conflict fixed 2019-03-05 13:17:58 +05:30
jitendra 4c28aceab5 Product gallery selected thumbnail border color changed to brand color 2019-03-05 13:15:21 +05:30
Prashant Singh 54835099ba made the changes in checkout page by applying id attribute for all sections, so it would be easy for js to identify the section and usage of the script accordingly, the primary need was to add the id attribute on the continue button as it was needed for the section validation 2019-03-02 14:01:34 +05:30
Prashant Singh 9df1c291a6 Checkout's payment method front end rendering order function changed from unshift to push 2019-03-01 18:17:21 +05:30
Prashant Singh bce57ed750 changed address card class on onepage checkout 2019-03-01 11:21:53 +05:30
Prashant Singh ccea6689f1 address card list issue fix 2019-02-28 10:54:10 +05:30
Prashant Singh e2facbc329 All the color values have been converted into variables for shop package 2019-02-28 10:37:21 +05:30
JItendra Singh 56a413c37b
Merge pull request #637 from jitendra-webkul/jitendra 
Shipment grid issue fixed
 2019-02-27 19:18:07 +05:30