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

1119 Commits

Author SHA1 Message Date
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
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
Jitendra Singh 947c1ab526
Merge pull request #702 from jitendra-webkul/jitendra 
Jitendra
 2019-03-15 19:07:55 +05:30
jitendra 94dfe8dc69 Fixed resource controller issue 2019-03-15 19:00:44 +05:30
jitendra 2123260387 Added formated price key in product api 2019-03-15 18:48:51 +05:30
Jitendra Singh a222b221bf
Merge pull request #701 from jitendra-webkul/jitendra 
Jitendra
 2019-03-15 17:57:58 +05:30
jitendra ef988b093f Product base image property added in prodcut api 2019-03-15 17:47:54 +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 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
Jitendra Singh b615303003
Merge pull request #697 from jitendra-webkul/jitendra 
Category Repository issue fixed
 2019-03-15 12:01:17 +05:30
jitendra 340b621b1a Category Repository issue fixed 2019-03-15 12:00:33 +05:30
Jitendra Singh c23343377f
Merge pull request #696 from jitendra-webkul/jitendra 
Sorting added in ResourceController
 2019-03-15 10:37:20 +05:30
jitendra 4ca1095265 Sorting added in ResourceController 2019-03-15 10:36:27 +05:30
Jitendra Singh c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra 
Added getCurrentLocale function in Core.php
 2019-03-14 18:24:40 +05:30
jitendra 218ef7a85f Added getCurrentLocale function in Core.php 2019-03-14 18:24:02 +05:30
rahul shukla a887cf8b92 slider controller name issue 2019-03-14 17:05:18 +05:30
Prashant Singh 319e4edeb1 some more logic is required for proper scrolling of menu bar 2019-03-14 15:50:24 +05:30
rahul shukla 4ed551c008 removing zoom 2019-03-14 14:41:21 +05:30
rahul shukla 4ab95b1464 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-14 14:34:46 +05:30
rahul shukla ebf96ad9d6 installer isuue & product page changes 2019-03-14 14:34:32 +05:30
Prashant Singh 556dd64327 removed some dead code 2019-03-14 12:06:51 +05:30
jitendra c38e107515 Added api for single lavel child categories 2019-03-14 11:32:47 +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 62d3685c24 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 11:05:33 +05:30
rahul shukla 281567456b product linking completed 2019-03-13 10:33:43 +05:30
Prashant Singh 9f22696491 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 10:21:38 +05:30
rahul shukla 3bb197c75a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 09:38:36 +05:30
Carlos Augusto Gartner ef30e1d0b5 Added pt-br translation for UI package 2019-03-12 15:36:15 -03:00
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
Jitendra Singh 423fb8c446
Merge pull request #683 from jitendra-webkul/jitendra 
'getAll' function of ProductRepository modified
 2019-03-12 18:33:11 +05:30
jitendra ff1154c422 'getAll' function of ProductRepository modified 2019-03-12 18:32:23 +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 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
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
Jitendra Singh 4dc7ef649c
Merge pull request #673 from prashant-webkul/development 
disabled side menu toggle for admin, created configuration for produc…
 2019-03-12 09:57:57 +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
Jitendra Singh ff45ce45d3
Merge pull request #674 from jitendra-webkul/jitendra 
Modified Slider Model
 2019-03-11 18:44:06 +05:30
jitendra 91c55a7010 Modified Slider Model 2019-03-11 18:43:06 +05:30
Prashant Singh bd525ef606 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-11 18:42:34 +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 19f4429de0 issue #670 2019-03-11 17:57:15 +05:30
Jitendra Singh 43f7d7e9c1
Merge pull request #665 from rahulshukla-webkul/development 
issue #655
 2019-03-08 14:32:24 +05:30
rahul shukla 3ad2aec865 issue #655 2019-03-08 13:31:16 +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
Prashant Singh 17755bcc2d assets for the UI package compiled for production 2019-03-06 11:54:27 +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
JItendra Singh f7d8f726f7
Merge pull request #644 from prashant-webkul/development 
changed address card class on onepage checkout
 2019-03-05 10:55:11 +05:30
JItendra Singh c0dd164345
Merge pull request #648 from jitendra-webkul/jitendra 
Excluded image swatch attributes from layed navigation
 2019-03-05 10:54:38 +05:30
jitendra 70c4e69aaf Excluded image swatch attributes from layed navigation 2019-03-05 10:53:50 +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 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
JItendra Singh 2c3d1d1096
Merge pull request #641 from prashant-webkul/development 
Development
 2019-03-01 11:08:37 +05:30
Prashant Singh 62f8cf1bad Fixed issue #642 2019-03-01 11:05:56 +05:30