Commit Graph

6228 Commits

Author SHA1 Message Date
Shubham Mehrotra 2e275ec7ef #3727 2020-08-12 10:42:51 +05:30
Jitendra Singh 4ff760920b
Merge pull request #3724 from rahulcs0082/development
Development
2020-08-11 19:08:40 +05:30
rahulshukla-home c39c3a0ea1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-08-11 18:59:28 +05:30
rahulshukla-home 3a2998cab1 Issue #3723 fixed 2020-08-11 18:58:31 +05:30
Jitendra Singh 8d7faa865c
Merge pull request #3695 from devansh-webkul/adding_missing_translation
Added missing translations
2020-08-11 18:49:52 +05:30
Jitendra Singh bebcf38f9c
Merge pull request #3711 from akhtarkhan1/select_icon_payment_page
issued fixed #3688
2020-08-11 18:46:06 +05:30
Jitendra Singh 65f94c439f
Merge pull request #3722 from rahulcs0082/development
Issue #3638 fixed
2020-08-11 18:30:09 +05:30
rahulshukla-home bed01ea9c9 Issue #3638 fixed 2020-08-11 18:22:14 +05:30
Devansh 61f0e0f296
Merge branch 'master' into adding_missing_translation 2020-08-11 17:38:49 +05:30
Jitendra Singh e19694b98a
Merge pull request #3721 from shubhwebkul/patch-2
Issue #3720 resolved
2020-08-11 16:59:17 +05:30
Jitendra Singh aaf0d5c962
Merge pull request #3719 from rahulcs0082/development
Issue #3717 fixed
2020-08-11 16:58:54 +05:30
Jitendra Singh 07c6832ab2
Merge pull request #3714 from shubhwebkul/patch-1
compare count update in default theme
2020-08-11 16:58:28 +05:30
Shubham Mehrotra 441740d7a2 #3720 2020-08-11 15:50:04 +05:30
rahulshukla-home c8a70f7f36 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-08-11 12:04:31 +05:30
Shubham Mehrotra bcc87623d8 updates 2020-08-11 12:04:10 +05:30
rahulshukla-home ddcad7544c Issue #3717 fixed 2020-08-11 12:02:54 +05:30
Shubham Mehrotra 17a5e453f5 updates 2020-08-10 22:20:46 +05:30
Shubham Mehrotra e40afeaf90 update 2020-08-10 21:43:31 +05:30
Jitendra Singh f81ea44869
Merge pull request #3713 from shubhwebkul/patch-1
Compare feature update
2020-08-10 21:36:56 +05:30
Akhtar Khan e9f40fa9d7 #3688 2020-08-10 21:30:52 +05:30
Shubham Mehrotra e56f2bff93 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-08-10 21:25:08 +05:30
Shubham Mehrotra 78d015f41f compare feature update 2020-08-10 21:24:59 +05:30
Akhtar Khan 76cadf49ca changed files #3688 2020-08-10 21:13:09 +05:30
Akhtar Khan 0289094a7f changed files #3688 2020-08-10 21:08:56 +05:30
Akhtar Khan 0663644854 Merge branch 'master' of https://github.com/bagisto/bagisto into select_icon_payment_page 2020-08-10 21:05:48 +05:30
Jitendra Singh 3d5add129f
Merge pull request #3712 from devansh-webkul/no_alert_message_issue
Fixed no alert message while deleting customer with pending or processing order from admin end #3704
2020-08-10 21:05:03 +05:30
Akhtar Khan 48a39ff498 Merge branch 'master' of https://github.com/bagisto/bagisto into select_icon_payment_page 2020-08-10 21:00:31 +05:30
Akhtar Khan 3a365a1869 final changed #3688 2020-08-10 20:57:44 +05:30
Devansh 1920035174 Alert Message Added 2020-08-10 20:52:03 +05:30
Jitendra Singh b46d8e2a24
Merge pull request #3709 from shubhwebkul/patch-1
Issue #3486 resolved
2020-08-10 20:33:18 +05:30
Akhtar Khan 44a68c8dbb issued fixed #3688 2020-08-10 20:14:18 +05:30
Shubham Mehrotra f3ebec2833 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-08-10 19:48:32 +05:30
Shubham Mehrotra 38e7270ba9 #3486 2020-08-10 19:46:59 +05:30
Shubham Mehrotra 8377c8dc8f #3486 2020-08-10 19:43:14 +05:30
Devansh d7fc4aa233
Merge branch 'master' into adding_missing_translation 2020-08-10 19:38:48 +05:30
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 Singh 1a0029361d
Merge pull request #3708 from jitendra-webkul/master
Support multi admin theme
2020-08-10 19:30:21 +05:30
jitendra 9c0ec6f644 Support multi admin theme 2020-08-10 19:25:51 +05:30
Jitendra Singh 41725a671f
Merge pull request #3707 from bagisto/revert-3706-1.0
Revert "Multi theme system now supported in admin"
2020-08-10 19:07:42 +05:30
Jitendra Singh c4abe9cad3
Revert "Multi theme system now supported in admin" 2020-08-10 19:07:32 +05:30
Jitendra Singh 6276505fd3
Merge pull request #3706 from jitendra-webkul/1.0
Multi theme system now supported in admin
2020-08-10 19:06:53 +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
Jitendra Singh 6572750fcb
Merge pull request #3647 from devansh-webkul/invoice_mail_issue
Fixed customer is getting mails in Arabic for order information and rest mails in English for same order which was placed in ar locale #3519
2020-08-10 18:53:33 +05:30
Akhtar Khan 32ca7b548b removed white spaces 2020-08-10 18:35:15 +05:30
Devansh 232db8f902 Added Three Column To Group By 2020-08-10 18:34:59 +05:30
Jitendra Singh d7983e560d
Merge pull request #3703 from rahulcs0082/development
Issue #3494 fixed
2020-08-10 18:27:52 +05:30
rahulshukla-home 84ba38ca2a code updated 2020-08-10 18:17:39 +05:30
rahulshukla-home 5663afec6a Issue #3494 fixed 2020-08-10 18:14:38 +05:30
Jitendra Singh ca7400d4d1
Merge pull request #3698 from devansh-webkul/no_success_message
Fixed there should not be any success message while trying to delete system attributes #3693
2020-08-10 18:04:36 +05:30