Commit Graph

7602 Commits

Author SHA1 Message Date
merdan cd27bc4535 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-03 13:32:06 +05:00
anmol chauhan b26b5af82a fixed issue #5915 2022-03-03 12:40:35 +05:30
merdan 89e7e74475 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-03 12:05:46 +05:00
Jitendra Singh 97d93c6751
Merge pull request #5930 from jitendra-webkul/master
Issue #5929 fixed
2022-03-02 19:14:30 +05:30
jitendra 9cb04aa3ee Issue #5929 fixed 2022-03-02 19:00:58 +05:30
Jitendra Singh 85a2964a54
Merge pull request #5917 from Sanjaybhattwebkul/admin-translation
Issue #5916 Fixed
2022-03-02 18:36:51 +05:30
Sanjay c0a5ee4b20 changes complete 2022-03-02 18:27:45 +05:30
Sanjay d975c9d972 Merge branch 'admin-translation' of https://github.com/Sanjaybhattwebkul/bagisto into admin-translation 2022-03-02 18:26:32 +05:30
jitendra 1a65c26133 Issue #5926 fixed 2022-03-02 17:45:55 +05:30
jitendra 98d5083ce1 Issue #5919 fixed 2022-03-02 17:30:13 +05:30
jitendra cc455d4e96 Issue #5770 fixed 2022-03-02 17:03:53 +05:30
merdan 5151348f6d Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-02 16:11:08 +05:00
merdan 7dd2c49463 payment methods finish fx2 2022-03-02 16:10:55 +05:00
jitendra e566a994ba Hide pagination if numbers of is not more than 1 2022-03-02 16:29:14 +05:30
prateek srivastava 73bdb167fd revert changes on permission issue 2022-03-02 16:12:06 +05:30
Sanjay e5c6f067b2 customerDatagrid-translation-added 2022-03-02 15:42:38 +05:30
merdan eca9a68aeb Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-02 14:47:35 +05:00
merdan 87c0b7cb4c payment methods finish 2022-03-02 14:47:21 +05:00
prateek srivastava cb5546c9b4 issue #5913 fixed 2022-03-02 13:59:51 +05:30
Sanjaybhattwebkul c33ab414a2
Merge pull request #5912 from prateek-webkul/invoice-locale-issue
issue #5908 fixed
2022-03-02 02:34:20 -05:00
prateek srivastava f5a73c00c5 added missing files 2022-03-02 12:04:36 +05:30
prateek srivastava 5d557e5b43 issue #5908 fixed 2022-03-02 11:12:50 +05:30
prateek srivastava 958532fe04 conflict resolved 2022-03-02 10:56:28 +05:30
prateek srivastava 019212e526 issue #5898 fixed 2022-03-01 19:33:52 +05:30
merdan 221d070446 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-01 18:13:44 +05:00
prateek srivastava 263921364e issue #5907 fixed 2022-03-01 17:57:40 +05:30
prateek srivastava 654dfd9d92 issue #5904 fixed 2022-03-01 16:53:27 +05:30
merdan 789acc413d shipping fix 2022-03-01 16:19:06 +05:00
prateek srivastava 3710da6d66 issue #5903 fixed 2022-03-01 15:46:36 +05:30
Prateek Srivastava 630e2a77f4
Merge pull request #5905 from Sanjaybhattwebkul/translation-issues
Changes complete
2022-03-01 15:25:00 +05:30
Sanjay bd6215789d Changes complete 2022-03-01 15:12:59 +05:30
merdan 4fcd6e5209 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-01 14:02:24 +05:00
merdan fc982d507b cart product adn super attributes 2022-03-01 14:01:46 +05:00
Prateek Srivastava 0bb8e843c3
Merge pull request #5902 from prateek-webkul/velocity-navbar-top
issue #5899
2022-03-01 13:52:03 +05:30
prateek srivastava 4364604679 issue #5899 fixed 2022-03-01 12:56:51 +05:30
prateek srivastava d0aad2f87a conflict resolved 2022-03-01 12:39:23 +05:30
Sanjay a2b22127f0 Issue #5893 Fixed 2022-03-01 12:02:19 +05:30
Prateek Srivastava ce4ec2d565
Merge pull request #5897 from Anmol-Chauhan/slider-multidelete
Issue #5777 fixed
2022-03-01 11:50:54 +05:30
Prateek Srivastava 06d288bcdf
Merge pull request #5895 from prateek-webkul/product-description
issue #5804 fixed
2022-03-01 11:50:34 +05:30
prateek srivastava dc811476d1 issue #5899 fixed 2022-03-01 11:43:02 +05:30
anmol chauhan 84814c58bb Issue #5777 fixed 2022-02-28 19:56:24 +05:30
prateek srivastava 7cb995f1f1 fixed for description field also 2022-02-28 19:41:30 +05:30
anmol chauhan 268e4850cd issue #5696 fixed 2022-02-28 19:32:54 +05:30
prateek srivastava 50d9f79081 issue #5804 fixed 2022-02-28 19:25:10 +05:30
merdan cf740f86c7 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-02-28 17:06:59 +05:00
Prateek Srivastava e23b96bd29
Merge pull request #5892 from prateek-webkul/zoom-lens-issue
issue #5768 fixed
2022-02-28 16:46:33 +05:30
Sanjaybhattwebkul 03f37be080
Merge pull request #5891 from prateek-webkul/checkout-ui-issue-booking-product
issue #5729 fixed
2022-02-28 06:11:46 -05:00
Prateek Srivastava 7c7d104777
Merge pull request #5890 from prateek-webkul/cms-ui-issue
issue #5717 fixed
2022-02-28 16:26:18 +05:30
prateek srivastava 167c97a030 issue #5768 fixed 2022-02-28 16:02:09 +05:30
Prateek Srivastava c85752d045
Merge pull request #5889 from prateek-webkul/admin-config-mobile
issue #5707 fixed
2022-02-28 15:34:14 +05:30