Commit Graph

542 Commits

Author SHA1 Message Date
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