Commit Graph

10873 Commits

Author SHA1 Message Date
Devansh 351d003a2b Some Breaking Done 2022-04-04 17:45:00 +05:30
Jitendra Singh 986ee8f4d0
Merge pull request #6211 from Sanjaybhattwebkul/update-cart-translation
cart-translation-updated
2022-04-04 17:40:33 +05:30
Jitendra Singh 92c1da00f9
Merge pull request #6212 from Sanjaybhattwebkul/sitemap-target_blank
target_blank-added-for-sitemap-url
2022-04-04 17:40:06 +05:30
Jitendra Singh 7c36936159
Merge pull request #6224 from jitendra-webkul/master
Issue #6040 fixed
2022-04-04 16:27:24 +05:30
jitendra a4522b24e5 Issue #6040 fixed 2022-04-04 16:19:03 +05:30
Jitendra Singh e6adf6ff33
Merge pull request #6222 from jitendra-webkul/master
Issue #6207 fixed
2022-04-04 16:17:59 +05:30
jitendra faa4715757 Revert changes for #6207 2022-04-04 16:07:48 +05:30
Devansh 898791ff29 Merge remote-tracking branch 'upstream/master' into datagrid-plus-changes 2022-04-04 15:34:38 +05:30
Devansh 4bde5ca931 Datagrid Breaked 2022-04-04 15:23:53 +05:30
jitendra da17418555 Issue #6207 fixed 2022-04-04 15:11:17 +05:30
Jitendra Singh 23ddd96047
Merge pull request #6220 from Sanjaybhattwebkul/calendar-view-icon
Issue #206 fixed
2022-04-04 14:47:20 +05:30
Sanjay 990bd80026 Changes-complete 2022-04-04 14:26:12 +05:30
merdan d4d1da389f Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.json
	composer.lock
	config/app.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
2022-04-04 13:46:05 +05:00
Jitendra Singh a4664d5644
Merge pull request #6221 from jitendra-webkul/master
Issue #6040 fixed
2022-04-04 14:10:26 +05:30
jitendra 6386b1c1ad Issue #6040 fixed 2022-04-04 14:02:47 +05:30
Sanjay 36c92cf3d7 Issue #206 fixed 2022-04-04 13:22:45 +05:30
Jitendra Singh 45b36c4543
Merge pull request #6219 from Sanjaybhattwebkul/astericks-icon
Issue #6217 Fixed
2022-04-04 12:00:19 +05:30
Sanjay 9f0be3324b Issue #6217 Fixed 2022-04-04 11:49:41 +05:30
Devansh 07ded4cd3e Merge branch 'master' into datagrid-plus-changes 2022-04-04 10:59:20 +05:30
merdan cdd9a0a907 superattrbt 2022-04-02 13:25:13 +05:00
merdan 83d3939374 superattrbt 2022-04-02 12:53:56 +05:00
merdan 10f3934176 superattrbt 2022-04-02 12:45:02 +05:00
Jitendra Singh 2caf8d11dd
Merge pull request #6216 from jitendra-webkul/master
Issue #6204 fixed
2022-04-01 22:17:39 +05:30
jitendra 3b154ee86d Issue #6204 fixed 2022-04-01 22:09:48 +05:30
Jitendra Singh dbf7475222
Merge pull request #6215 from jitendra-webkul/master
Issue #6202 fixed
2022-04-01 21:30:46 +05:30
jitendra 6bbf6fc883 Issue #6202 fixed 2022-04-01 21:23:17 +05:30
Devansh ff1827dc89 Merge branch 'master' into datagrid-plus-changes 2022-04-01 21:05:19 +05:30
Devansh 55826b0bfb Changes Done 2022-04-01 21:02:37 +05:30
Jitendra Singh a55081ace5
Merge pull request #6214 from jitendra-webkul/master
Used PHP 8 Constructor Property Promotion
2022-04-01 20:44:17 +05:30
jitendra 74416ac5f3 Used PHP 8 Constructor Property Promotion 2022-04-01 20:27:11 +05:30
Sanjay b3ad4bbcee target_blank-added-for-sitemap-url 2022-04-01 18:12:12 +05:30
merdan b620d19dc4 category translations 2022-04-01 17:26:48 +05:00
merdan 21311007be category translations 2022-04-01 17:21:37 +05:00
merdan bdd908f34a category translations 2022-04-01 17:19:51 +05:00
Sanjay 49a27ad560 cart-translation-updated 2022-04-01 17:37:48 +05:30
Jitendra Singh 44d53baa89
Merge pull request #6210 from jitendra-webkul/master
Issue #5960 fixed  (Sitemap generator implemented)
2022-04-01 17:34:27 +05:30
jitendra ed1e0a5fe8 Issue #5960 fixed 2022-04-01 17:20:09 +05:30
Jitendra Singh 9e1e3ba2ae
Merge pull request #6209 from Sanjaybhattwebkul/product-status
Issue #6208 Fixed
2022-04-01 17:19:42 +05:30
Sanjay 922da048fa Issue #6208 Fixed 2022-04-01 17:09:30 +05:30
merdan 6474ef6f67 groupby color 2022-04-01 16:00:35 +05:00
merdan 1935be167d groupby color 2022-04-01 15:56:02 +05:00
merdan 22113b75c7 groupby color 2022-04-01 15:52:13 +05:00
merdan b8bb9ef646 groupby color 2022-04-01 13:56:16 +05:00
merdan 07b0a08bcb groupby color 2022-04-01 13:46:39 +05:00
merdan 0526d5af16 groupby color 2022-04-01 13:43:38 +05:00
merdan 2bb0db9af6 groupby color 2022-04-01 13:40:53 +05:00
merdan 45e0d6fe7e Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-01 12:31:02 +05:00
Jitendra Singh 293e3b6a67
Merge pull request #6201 from devansh-webkul/updated-manifest
Updated Manifest File
2022-04-01 09:36:26 +05:30
Devansh 8d45d928e4 Updated Manifest File 2022-03-31 20:31:00 +05:30
Jitendra Singh 049ec2a32a
Merge pull request #6200 from devansh-webkul/removed-middleware
Removed extra middlewares
2022-03-31 17:13:43 +05:30