Commit Graph

4635 Commits

Author SHA1 Message Date
Annika Wolff 58269996b2
Merge branch 'master' into check-if-item-in-cart-is-deactivated 2020-08-10 16:11:39 +02:00
Jitendra Singh 4b1fdc04ac
Merge pull request #3705 from devansh-webkul/product_name_blank_issue
Fixed #3656
2020-08-10 19:30:58 +05:30
jitendra 9c0ec6f644 Support multi admin theme 2020-08-10 19:25:51 +05:30
Jitendra Singh c4abe9cad3
Revert "Multi theme system now supported in admin" 2020-08-10 19:07:32 +05:30
jitendra 37e7c4c834 Merged with master 2020-08-10 19:02:15 +05:30
jitendra 44181411bd Multi theme system now supported in admin 2020-08-10 19:00:31 +05:30
Devansh 232db8f902 Added Three Column To Group By 2020-08-10 18:34:59 +05:30
Devansh 2487f5fc58 Checking Case To Avoid Finding All In Find Method So That Only ID Will Be Go To Find Method 2020-08-10 11:26:43 +05:30
Devansh 03c0b9938e Moved Channel Remaining Initialization Property To Constructor As Its Previously Defined There 2020-08-10 09:51:13 +05:30
Devansh eadc2cc0a6 Query Builder Fixed 2020-08-06 19:07:48 +05:30
Steffen Mahler c9f7c70d52 resolve conflicts 2020-08-06 15:23:32 +02:00
Jitendra Singh d4dc554b71
Merge pull request #3663 from vishal-webkul/issue-3564
Issue #3564 fixed
2020-08-06 17:08:11 +05:30
Devansh d9fc990abc
Merge branch 'master' into tooltip_placement 2020-08-06 15:49:06 +05:30
Jitendra Singh c5573951c0
Merge pull request #3673 from devansh-webkul/comparison_notification_on_velocity
Message Added In Velocity And Velocity Guest #3505
2020-08-06 15:36:10 +05:30
Jitendra Singh ea6337da81
Merge pull request #3670 from devansh-webkul/layout_issue_on_rtl_locale
Fixed layout issue at shop end in ar #3467
2020-08-06 15:35:58 +05:30
Devansh 92dcbe3763 Message Added In Velocity And Velocity Guest 2020-08-06 13:52:16 +05:30
Devansh 73263fe2a4 Message Added 2020-08-06 13:40:38 +05:30
vishal-webkul 7a9bed0bed resolved interchange problem 2020-08-06 13:11:53 +05:30
Devansh 0c748b6563
Merge branch 'master' into tooltip_placement 2020-08-06 12:53:06 +05:30
Devansh b2b576f9e5
Merge branch 'master' into layout_issue_on_rtl_locale 2020-08-06 12:52:11 +05:30
vishal-webkul 59f9c1e559 resolve edit problem 2020-08-06 12:52:07 +05:30
Jitendra Singh f95490eed7
Merge pull request #3666 from devansh-webkul/products_per_page_validation
Fixed add validation for products per page field otherwise if admin entered string value then customer gets exception on category page #3534
2020-08-06 12:47:11 +05:30
Jitendra Singh 45b3a61591
Merge pull request #3664 from devansh-webkul/compare_notification_issue
Fixed no message on removing products or deleting all from compare list in default theme #3505
2020-08-06 12:46:49 +05:30
Jitendra Singh bd423e9b06
Merge pull request #3632 from shubhwebkul/patch-5
Issue #3622 resolved
2020-08-06 12:46:20 +05:30
Devansh ac4701d7c1 Merge branch 'tooltip_placement' of https://github.com/devansh-webkul/bagisto into tooltip_placement
Merged
2020-08-06 12:32:39 +05:30
Devansh 923f9c7357 Added Japanese Folder And Added Required Tranlation 2020-08-06 12:31:18 +05:30
Shubham Mehrotra cedaaf9799 #3621 2020-08-06 11:02:52 +05:30
Devansh c40d0e45e1 Compiled Assets 2020-08-06 11:01:02 +05:30
Devansh 4baf87090c Added Truncate Filter 2020-08-06 10:58:27 +05:30
Devansh 3fb240c95c Translation Added For All Items Message 2020-08-05 20:00:25 +05:30
Devansh d74e6e9cbc Notification Added For All Items 2020-08-05 19:59:54 +05:30
Jitendra Singh 9f17f21119
Merge pull request #3668 from rahulcs0082/development
update invoice status paid using paypal
2020-08-05 19:42:00 +05:30
rahulshukla-home 1e1756ea23 update invoice status paid using paypal 2020-08-05 19:26:43 +05:30
Devansh ace7a28579 Comma Seperate Integer Validator Added 2020-08-05 18:20:05 +05:30
Devansh fbe5a9cc9b Compare Product Issue Fixed 2020-08-05 17:03:10 +05:30
Devansh f556ab26e6
Merge branch 'master' into tooltip_placement 2020-08-05 16:57:19 +05:30
Jitendra Singh 1f109b6b9e
Merge pull request #3603 from vishal-webkul/issue-3313
Issue #3313 fixed
2020-08-05 16:18:58 +05:30
vishal-webkul 77213b70fa Issue #3564 fixed 2020-08-05 16:08:17 +05:30
Jitendra Singh 028cd1050b
Merge pull request #3661 from devansh-webkul/layout_center_issue
Fixed no records founds text in downloadable product section of customer should display in centre, in mobile view #3637
2020-08-05 15:41:41 +05:30
Jitendra Singh 374710f62f
Merge pull request #3660 from rahulcs0082/development
Issue #3426 fixed
2020-08-05 15:35:57 +05:30
Devansh 3690407248 Layout Center Issue Fixed 2020-08-05 15:33:11 +05:30
Jitendra Singh 2d2275f306
Merge pull request #3625 from vishal-webkul/issue-3606
Issue #3606 fixed
2020-08-05 15:32:15 +05:30
rahulshukla-home 21584dd683 Issue #3426 fixed 2020-08-05 15:28:10 +05:30
Devansh 3cb587dac1 Merge branch 'tooltip_placement' of https://github.com/devansh-webkul/bagisto into tooltip_placement
Merged
2020-08-05 14:37:23 +05:30
Devansh 429a9bebfe Missing Translation Added 2020-08-05 14:36:57 +05:30
Devansh a0e7c862fe
Merge branch 'master' into mobile_view_issue 2020-08-05 14:21:39 +05:30
Devansh 938a8e5a9c Mobile View Issue Fixed 2020-08-05 14:19:27 +05:30
Jitendra Singh 9e9066f28a
Merge pull request #3607 from devansh-webkul/unable_to_download_files_while_comparing_products
Fixed unable to download files while comparing products #3501
2020-08-05 13:17:43 +05:30
vishal-webkul 0187b0a1e0
Merge branch 'master' into issue-3313 2020-08-05 13:15:36 +05:30
Devansh 3cb5e5aee9
Merge branch 'master' into tooltip_placement 2020-08-05 13:08:15 +05:30