Commit Graph

6196 Commits

Author SHA1 Message Date
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
Devansh 927bc2105c Translation Added To Default Theme 2020-08-05 13:04:36 +05:30
Jitendra Singh 0667d70beb
Merge pull request #3653 from rahulcs0082/development
Issue #3648 fixed
2020-08-05 12:37:52 +05:30
Jitendra Singh 44a753478b
Merge pull request #3602 from devansh-webkul/getting_exception_when_view_order_of_deleted_customer
Fixed getting exception when view order of deleted customer #3422
2020-08-05 12:37:33 +05:30
Devansh 8cc838e696 Tooltip Added On Default Theme 2020-08-05 12:37:15 +05:30
rahulshukla-home 1e87dc7972 Issue #3648 fixed 2020-08-05 12:23:08 +05:30
Devansh 30989df3e5 Translation Added 2020-08-05 11:40:19 +05:30
Devansh 1b7eee9b19 Compare Product Tooltip Added 2020-08-05 11:33:17 +05:30
Jitendra Singh 567e17da9a
Merge pull request #3652 from rahulcs0082/development
Issue #3649 fixed
2020-08-05 11:27:24 +05:30
Jitendra Singh b728c59a1d
Merge pull request #3651 from vishal-webkul/issue-3636
Issue #3636 resolved
2020-08-05 11:27:06 +05:30
rahulshukla-home 7cd9c9c3c7 Issue #3649 fixed 2020-08-05 11:10:00 +05:30
Jitendra Singh bc8e2f7eac
Merge pull request #3590 from ghermans/master
Fixed #3453
2020-08-05 11:07:17 +05:30
Jitendra Singh 07a9d8588a
Merge pull request #3608 from devansh-webkul/inactive_child_product_isssue
Fixed inactive child product shouldn't visible in grouped product #3575
2020-08-05 11:07:00 +05:30
Jitendra Singh 8ad125a8aa
Merge pull request #3610 from Haendlerbund/add-events-to-booking-product-event-ticket-repo
Add events to BookingProductEventTicketRepository
2020-08-05 11:06:54 +05:30
Jitendra Singh 1a22488ee7
Merge pull request #3650 from devansh-webkul/updating_comments
Just updated the comments in the customer and admin file.
2020-08-05 11:06:34 +05:30
Jitendra Singh 14485e28ea
Merge pull request #3613 from devansh-webkul/translation_issue_on_high_size_image
Fixed translation issue on uploading high size image #3570
2020-08-05 11:06:24 +05:30
vishal-webkul 4e1d24da76 issue #3636 resolved 2020-08-05 11:03:01 +05:30
Devansh e496ed870c Wishlist Tooltip Added 2020-08-05 10:48:01 +05:30
Devansh 1ecc79e91a Comments Updated 2020-08-05 09:28:12 +05:30
Devansh fda33fa78b Comments Updated 2020-08-05 09:26:54 +05:30
Devansh ece0f9ed60 Added In Default Theme 2020-08-04 20:42:38 +05:30
Devansh 67ddf6020e Added In Default Theme As Well 2020-08-04 20:29:19 +05:30
Devansh 561b2de404 Icon Added 2020-08-04 20:11:08 +05:30
Carlos Augusto Gartner 540f64aa8f git subrepo init (merge) --remote=git@github.com:bagistobrasil/core-shop.git packages/Webkul/Shop
subrepo:
  subdir:   "packages/Webkul/Shop"
  merged:   "72ce4eea7"
upstream:
  origin:   "git@github.com:bagistobrasil/core-shop.git"
  branch:   "master"
  commit:   "none"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
2020-08-04 10:57:09 -03:00
Devansh 4b80b19171
Merge branch 'master' into invoice_mail_issue 2020-08-04 18:34:15 +05:30
Devansh 262d72f4b6 Issue Fixed 2020-08-04 18:30:37 +05:30
Devansh 6d4356dc10 Added Space After Exclamation Mark 2020-08-04 18:00:56 +05:30
Devansh 2778f7a7ca Removed One Line 2020-08-04 17:43:44 +05:30
Devansh 70dc89ad41 One Line And One Line Removed 2020-08-04 17:32:00 +05:30
Jitendra Singh 72ce4eea7e
Merge pull request #3619 from devansh-webkul/mail_issue_on_cancel_order
Fixed admin is not getting mail when customer cancels order #3522
2020-08-04 17:26:32 +05:30
Devansh c22bdf45ca Template Fixed 2020-08-04 17:12:48 +05:30
Jitendra Singh 68c0395f76
Merge pull request #3645 from devansh-webkul/getting_exception_when_creating_configurable_product_db_prefix_issue
Fixed getting exception when creating configurable product in case of DB_Prefix #3642
2020-08-04 16:34:44 +05:30
Devansh a05fa10309 Refund View Issue Fixed 2020-08-04 16:10:23 +05:30
Devansh 0ddab62530 Variable Added To The Message 2020-08-04 15:51:22 +05:30
Devansh 88a1c58941 DB Prefix Added 2020-08-04 13:02:15 +05:30
Jitendra Singh ebae5786b4
Merge pull request #3627 from shubhwebkul/patch-4
Issue #3621 resolved
2020-08-04 11:29:45 +05:30
Shubham Mehrotra 552f19f2d5 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-4 2020-08-04 11:18:44 +05:30
Jitendra Singh dc78fe6c3a
Merge pull request #3623 from shubhwebkul/patch-3
dynamic header content count added in velocity
2020-08-04 11:03:46 +05:30
Jitendra Singh f73aa38576
Merge pull request #3640 from akhtarkhan1/new-label-on-product
Issue Fixed #3335
2020-08-04 11:01:49 +05:30
Jitendra Singh 284fa3f406
Merge pull request #3626 from devansh-webkul/mail_are_not_sent_on_change_password
Completed Enhancement on changing current password admin/customer should get mail #3526
2020-08-04 11:01:34 +05:30
Devansh 19d8ef05ae Favicon Image Issue Fixed 2020-08-04 10:54:45 +05:30
Akhtar Khan 342b8e5ccf
Merge branch 'master' into new-label-on-product 2020-08-03 11:39:52 +05:30
Akhtar Khan 217b934563 Fixed 2020-08-03 11:08:33 +05:30
María Paulina Ramírez Vásquez 1491c62cc2
Updating file with new translations
This translation is based on Colombian Spanish, however it is valid for most Spanish-speaking countries.
2020-08-02 19:11:40 -05:00
María Paulina Ramírez Vásquez 14d483780f
Add admin spanish language 2020-08-02 19:08:14 -05:00
Devansh afd2de92bd Added Event Dispatcher To Account Controller's Method 2020-08-01 19:55:35 +05:30
Jitendra Singh 4cabcfab59
Merge pull request #3630 from devansh-webkul/order_id_missing_in_comment_issue
Fixed order id is missing in mail which customer get when admin add any comment in order #3515
2020-08-01 19:48:27 +05:30
Shubham Mehrotra 7d87d63b6c Merge branch 'master' of https://github.com/bagisto/bagisto into patch-5 2020-08-01 19:37:17 +05:30
Shubham Mehrotra 7a279edb49 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-4 2020-08-01 19:36:09 +05:30