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

1033 Commits

Author SHA1 Message Date
Prashant Singh f79473a598 fixed issue #589 2019-02-25 09:45:12 +05:30
Prashant Singh 5e704a4979 more testcases for customer authentication 2019-02-23 17:23:46 +05:30
Prashant Singh 53094cadca Auth tests written 2019-02-23 16:13:24 +05:30
rahul shukla db0cd27c0d issue #615 2019-02-22 17:05:27 +05:30
Prashant Singh 3d94bfcd6e migration name changed according to current conventions 2019-02-22 16:25:49 +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 a7f545fcf4 issue #594 2019-02-20 19:11:46 +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
rahul shukla 63063e4602 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-20 14:44:45 +05:30
rahul shukla f2af7bc84a table css change 2019-02-20 14:44:18 +05:30
jitendra e2b411547d Issue #581 fixed 2019-02-20 14:30:54 +05:30
Prashant Singh 1f13298b65 base sync with master 2019-02-20 13:02:59 +05:30
jitendra a172a1c139 Fixed grid filter tags Ui 2019-02-20 12:51:55 +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
jitendra 3d5e2955a4 Issue #598 fixed 2019-02-20 11:57:06 +05:30
Prashant Singh 0e9e94683d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-19 11:23:28 +05:30
rahul shukla 994da4a2b3 reverting changes of view 2019-02-19 10:07:13 +05:30
rahul shukla 22b19ec277 product image 2019-02-19 09:59:50 +05:30
Prashant Singh 1f30971c63 Fixed issue #592 2019-02-18 18:39:48 +05:30
Prashant Singh 4eb752cd10 Fixed issue #304 and some more changes 2019-02-18 17:21:04 +05:30
Prashant Singh 262bfbbd06 Fixed issue #304 2019-02-18 17:19:54 +05:30
rahul shukla 1a9c3d56c2 issue #587 & css changes 2019-02-18 17:01:53 +05:30
rahul shukla b019a248cf interfaces & proxy class implemented 2019-02-18 13:00:40 +05:30
rahul shukla 6172692954 assests compile & merge with master 2019-02-15 20:13:02 +05:30
rahul shukla 704f6851a3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 20:10:58 +05:30
rahul shukla 36cb09bc58 address while checkout & reduces code 2019-02-15 20:10:47 +05:30
jitendra 7e20684c0f Issue Fixed (If product visiblity is set as false than products are showing on new and featured section) 2019-02-15 19:43:03 +05:30
jitendra d2f620bb9f Issue fixed (If configurable product added to cart without options) 2019-02-15 19:38:10 +05:30
rahul shukla d673b2a7b5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 14:58:11 +05:30
rahul shukla 0330353e08 removal of default address 2019-02-15 14:58:00 +05:30
Prashant Singh f3cd11737c sync with base master 2019-02-15 13:28:52 +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
jitendra 3d0da8812d View event added on checkout payment and shipping section 2019-02-15 11:24:26 +05:30
Prashant Singh f68c4e482c Fixed bug #575 2019-02-15 09:51:38 +05:30
rahul shukla 7c72d6e3b1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-14 21:20:33 +05:30
rahul shukla 4a648f549a checkout with multiple address #210 2019-02-14 21:20:10 +05:30
Prashant Singh 550cabcbcb Translation strings for datagrid and removal of dead code and pretty syntax 2019-02-14 19:24:44 +05:30
Prashant Singh 42b929bb22 admin user intended url functionality reverted 2019-02-14 18:20:04 +05:30
Prashant Singh 621455ed48 minor fixes 2019-02-14 17:57:07 +05:30
Prashant Singh 718a5eaa20 Resolved the issue #517 and removed the intented url from admin as admin don't require 2019-02-14 17:54:46 +05:30
Prashant Singh 63bac873c3 adding all get all channel functions in channel repo 2019-02-14 12:07:08 +05:30
Prashant Singh b28f48cf95 Confirm box implemented for datagrid actions 2019-02-13 19:10:23 +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
jitendra 77618d23f8 Assets compiled for production 2019-02-13 15:29:55 +05:30
Prashant Singh 3d9d61fafe UI fix in accordian 2019-02-13 15:18:21 +05:30
Prashant Singh 510ee89aad language meta tag added for storefront 2019-02-13 15:05:56 +05:30
Prashant Singh a745596ac8 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-13 14:53:44 +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
Prashant Singh 616d1bf160 merged with master 2019-02-13 11:40:56 +05:30
jitendra 98f3edc199 Assets compiled for production 2019-02-12 20:11:44 +05:30
rahul shukla 8b9edf9e7d marketplace responsive & installer 2019-02-12 16:46:55 +05:30
Prashant Singh 5ea84dff76 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-12 14:57:12 +05:30
Prashant Singh f38472d26b Accordian component's UX changed slightly according to new design guidelines 2019-02-12 14:56:56 +05:30
jitendra b979fc19e0 Assets compiled for production 2019-02-12 13:19:29 +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 8c201f1bbb Issue #545 fixed 2019-02-11 15:35:02 +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
jitendra 2b382df075 Issue #532 fixed 2019-02-11 15:02:34 +05:30
Prashant Singh 7ba43a8fea Dead code removed from currency seeder and model 2019-02-11 13:31:05 +05:30
Prashant Singh e4dc9da03f Removed the currency symbol table migration and seeder 2019-02-11 13:19:49 +05:30
jitendra fa8aa2f66e Issue #556 fixed' 2019-02-11 13:03:17 +05:30
rahul shukla d1b14fa38e remove extra rendering & change in script 2019-02-08 19:39:05 +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 b72123db51 Currency symbol table implemented with relationship with currency as a fallback if the symbol for the currency is not found 2019-02-08 16:05:50 +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 cd6d6c89a8 Fixed the issue #555 2019-02-08 13:02:25 +05:30
Prashant Singh 69aeb2a254 added a function to find the state by code and country code 2019-02-07 13:58:14 +05:30
Prashant Singh b1b39d2c74 Fixed issue #545 as Admins don't require intended url functionality only customers do 2019-02-06 18:49:59 +05:30
Prashant Singh de6507ff08 Fixed Issue #551 - Root Category Getting Deleted 2019-02-06 16:28:00 +05:30
jitendra 2fec94082c Fixed account menu issue 2019-02-04 20:32:06 +05:30
jitendra b0c96a0b02 Updated channel homepage content 2019-02-04 17:08:00 +05:30
JItendra Singh 0c7e4922ea
Merge pull request #542 from jitendra-webkul/jitendra 
Assets compiled for production
 2019-02-04 15:42:28 +05:30
jitendra f2f3592376 Assets compiled for production 2019-02-04 15:41:43 +05:30
JItendra Singh e02ae145df
Merge pull request #541 from rahulshukla-webkul/development 
Development
 2019-02-04 15:34:09 +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 1a4a3c22e6
Merge pull request #539 from jitendra-webkul/jitendra 
After login customer will redirect ti previous page
 2019-02-04 15:28:38 +05:30
jitendra 8d3146e2d6 After login customer will redirect ti previous page 2019-02-04 15:27:49 +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
rahul shukla 01d2d7cfcb Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-04 15:20:28 +05:30
rahul shukla a741e0e570 config changes 2019-02-04 15:20:15 +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
Prashant Singh 072d61f20e Wishlist move to cart when product quantity is exhausted, showing improper validation message. Issue #402 fixed. 2019-02-04 13:51:26 +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
rahul shukla 4c7f516313 responsive css 2019-02-02 20:45:25 +05:30
rahul shukla 7985c4c225 header resposive issue 2019-02-01 19:12:51 +05:30
jitendra 2438630be4 Assets compiled for production 2019-02-01 18:03:17 +05:30
JItendra Singh 461d594c6a
Merge pull request #527 from rahulshukla-webkul/development 
Development
 2019-02-01 17:23:46 +05:30
JItendra Singh c1e08f61e2
Merge pull request #526 from jitendra-webkul/jitendra 
Flash css issue fixed
 2019-02-01 17:13:32 +05:30
jitendra ffa97f2c55 Flash css issue fixed 2019-02-01 17:12:38 +05:30
rahul shukla 32777f3965 revert change 2019-02-01 17:12:19 +05:30
rahul shukla 317688ce38 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-01 17:06:45 +05:30
rahul shukla 745d6c1b48 responsive header menu 2019-02-01 17:06:32 +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
mohdfaiz.dev cc4a88f271 Fixed issue #143 2019-02-01 16:24:39 +05:30
JItendra Singh c3e0f7acad
Merge pull request #518 from jitendra-webkul/jitendra 
Fixed grid issues
 2019-02-01 15:08:00 +05:30
jitendra cc6ca21447 Fixed grid issues 2019-02-01 15:07:11 +05:30
rahul shukla 557a7c0b01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-01 12:31:45 +05:30
JItendra Singh 263f7ad92e
Merge pull request #516 from jitendra-webkul/jitendra 
Jitendra
 2019-02-01 12:20:19 +05:30
jitendra 2d1a816349 Issue #514 fixed 2019-02-01 12:19:30 +05:30
mohdfaiz.dev a881219f02 Fixed issue 513 2019-02-01 09:20:07 +05:30
jitendra 91b8bfeba2 Rating label fixed on product view page 2019-01-31 18:38:45 +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 e00ca5808f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-31 15:18:48 +05:30
rahul shukla ee91d69361 configuration changes 2019-01-31 15:18:36 +05:30
jitendra 29065eeba7 Currency switcher dropdown issue fixed 2019-01-31 12:29:35 +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 bb635f1673 Fixed front header layout 2019-01-30 20:11:07 +05:30
jitendra 1241eff9a7 View event added in front header 2019-01-30 19:10:59 +05:30
jitendra 54f3f2f5b6 Items label added in order item table 2019-01-29 19:02:41 +05:30
jitendra e178217fce Assets compiled for production 2019-01-29 18:43:52 +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