Commit Graph

10223 Commits

Author SHA1 Message Date
prateek srivastava adccd4167c fixed alignment 2022-02-24 16:32:49 +05:30
prateek srivastava e2bd456dad issue #5799 fixed 2022-02-24 14:17:42 +05:30
Prateek Srivastava 173913d1d6
Merge pull request #5873 from prateek-webkul/flatpickr-mobile-ui-issue
issue #5839 fixed
2022-02-24 13:43:17 +05:30
prateek srivastava ef6c2bc51e issue #5839 fixed 2022-02-24 13:35:13 +05:30
Prateek Srivastava cf74ea0e67
Merge pull request #5868 from Sanjaybhattwebkul/category-filter
Issue #5855 Fixed
2022-02-24 13:15:49 +05:30
Hoàng Tú abd369bf6e
fix chart in dashboard showing not correct time 2022-02-24 14:25:27 +07:00
Glenn Hermans d75fbbe67c
Merge pull request #5871 from Sanjaybhattwebkul/translation-issues
Fixex header-translation-issues
2022-02-24 08:23:35 +01:00
Sanjay d3e7d6210f Fixex header-translation-issues 2022-02-24 12:02:17 +05:30
Sanjay 875a9efe40 Issue #5855 Fixed 2022-02-23 16:50:04 +05:30
Glenn Hermans 4037c71cd1
Merge pull request #5866 from Sanjaybhattwebkul/translation-issues
issue #5865 fixed
2022-02-23 11:15:14 +01:00
Sanjay 03e9be2c35 Complete changes 2022-02-23 14:54:03 +05:30
Sanjay 048139c0b2 issue #5865 fixed 2022-02-23 10:33:30 +05:30
merdan 84d77539e9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
2022-02-22 17:50:56 +05:00
merdan 6171e1c24b weight shipment 2022-02-22 17:27:35 +05:00
Glenn Hermans e5635e85f4
Merge pull request #5861 from Sanjaybhattwebkul/Add-viewPassword-option
view-Password-added-default
2022-02-22 10:50:52 +01:00
Sanjay d751a96b02 Remove static text from default theme 2022-02-22 15:03:22 +05:30
Sanjay 804db29e40 changes complete 2022-02-22 14:58:49 +05:30
merdan aff83c0db4 weight 2022-02-22 14:01:33 +05:00
Sanjay 181caa1e98 viewPassword-added-valocity 2022-02-22 12:41:45 +05:30
Glenn Hermans 0289c4cdfc
Merge pull request #5858 from prateek-webkul/notification-ui-issue
issue #5809 fixed
2022-02-21 16:32:17 +01:00
prateek srivastava 97c0be5f88 fixed ui for rtl-notification-search 2022-02-21 19:59:52 +05:30
prateek srivastava bcc4cf629b issue #5809 fixed 2022-02-21 19:45:08 +05:30
Glenn Hermans 0a4106a5ac
Merge pull request #5857 from Sanjaybhattwebkul/Add-viewPassword-option
Show-password-option-added-default-theme
2022-02-21 13:42:20 +01:00
Sanjay 94bd8e1a20 css added on scss file 2022-02-21 17:37:48 +05:30
Sanjay 7aef650d37 inline css removed 2022-02-21 17:36:05 +05:30
Sanjay d0ce1761d6 css updated for eye icon 2022-02-21 17:03:41 +05:30
Sanjay dc2d283616 Show-password-option-added-default-theme 2022-02-21 16:47:40 +05:30
Prateek Srivastava c13afd1b09
Merge pull request #5856 from prateek-webkul/product-channel-filter
issue #5828 fixed
2022-02-21 15:30:09 +05:30
prateek srivastava a7c7ae789b issue #5828 fixed 2022-02-21 14:40:35 +05:30
Glenn Hermans 8d7a2518b0
Merge pull request #5843 from Sanjaybhattwebkul/add-astric-icon
Issue #5840 Fixed
2022-02-18 13:50:57 +01:00
Sanjay 7516a4eac1 AstricIcon-added 2022-02-18 18:04:39 +05:30
Glenn Hermans fc6c0eed4d
Merge pull request #5842 from Sanjaybhattwebkul/Translatio-issue
notification-translation-issue-fixed
2022-02-18 11:07:45 +01:00
Glenn Hermans 3b0b5c871c
Merge pull request #5838 from Sanjaybhattwebkul/password-visible-shop
Show password option on shop
2022-02-18 11:07:21 +01:00
Sanjay ec56a86842 notification-translation-issue-fixed 2022-02-18 15:19:01 +05:30
Sanjay bff5b0d6af Showpassword-option-added 2022-02-18 10:39:41 +05:30
Sanjay cb77641d45 Merge branch 'master' of https://github.com/Sanjaybhattwebkul/bagisto 2022-02-18 10:30:38 +05:30
Sanjaybhattwebkul fd554a8d8e
Merge pull request #5836 from prateek-webkul/enable-password-visible
issue #5835 fixed
2022-02-17 19:28:48 +05:30
Sanjay f8eff757d1 Merge remote-tracking branch 'Prateek/enable-password-visible' 2022-02-17 19:27:03 +05:30
prateek srivastava 6844aee49e issue #5835 fixed 2022-02-17 19:15:42 +05:30
Sanjay e85ae303c5 Merge branch 'master' of https://github.com/Sanjaybhattwebkul/bagisto 2022-02-17 18:59:23 +05:30
Glenn Hermans 71f8f9d9c1
Merge pull request #5834 from prateek-webkul/merge-guest-cart
issue #5830 fixed
2022-02-17 14:09:48 +01:00
prateek srivastava e6559d26c4 issue #5830 fixed 2022-02-17 17:05:48 +05:30
merdan 6ea58d8bad scrap atttribute tests 2022-02-17 16:16:22 +05:00
merdan 8addd3fb4e scrap atttribute tests 2022-02-17 16:07:48 +05:00
Prateek Srivastava b5d14eea4c
Merge pull request #5829 from prateek-webkul/rtl-checkout-form
Alignment issue in checkout form RTL
2022-02-17 15:12:35 +05:30
Sanjay 1af0c186a4 Merge remote-tracking branch 'Prateek/rtl-checkout-form' 2022-02-17 14:16:51 +05:30
Sanjay b3d8e223af Merge branch 'master' of https://github.com/Sanjaybhattwebkul/bagisto 2022-02-17 14:15:36 +05:30
Glenn Hermans 8b4cb6c990
Merge pull request #5818 from Sanjaybhattwebkul/header-ui-issue
Enhancement done #5817
2022-02-17 09:36:25 +01:00
Prateek Srivastava 83b12c13d2
Merge pull request #5826 from prateek-webkul/variant-image-alignment
issue #5803 fixed
2022-02-17 13:15:33 +05:30
prateek srivastava 2c93271f2c issue #5797 fixed 2022-02-17 13:11:16 +05:30