Commit Graph

10756 Commits

Author SHA1 Message Date
merdan d9215d7220 commit 2022-04-06 13:48:23 +05:00
merdan 4ad611dce3 fix mix 2022-04-06 12:33:17 +05:00
merdan 060b601c72 superattrbt 2022-04-06 12:28:50 +05:00
merdan 90e51a35bd superattrbt 2022-04-06 11:52:42 +05:00
merdan 0c4a6e220c superattrbt 2022-04-06 11:31:40 +05:00
merdan e90fc9aba6 superattrbt 2022-04-05 16:46:12 +05:00
merdan 0a5d418095 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-05 16:43:35 +05:00
Jitendra Singh afd6e2cfdc
Merge pull request #6236 from devansh-webkul/delete-fix
Delete Issue Fixed #6196
2022-04-05 17:09:37 +05:30
Devansh 1b0de5d93f Delete Issue Fixed 2022-04-05 17:01:48 +05:30
Devansh fc86eb7ef8
Merge pull request #6235 from devansh-webkul/datagrid-issues
Fixed Items Per Page #6228
2022-04-05 16:47:43 +05:30
Devansh 8294a8cf69 Fixed Items Per Page 2022-04-05 16:37:13 +05:30
Jitendra Singh dbce428683
Merge pull request #6234 from jitendra-webkul/master
Issue #6229 fixed
2022-04-05 15:26:52 +05:30
jitendra 2587f7f349 Issue #6229 fixed 2022-04-05 15:11:32 +05:30
Jitendra Singh 464c66b988
Merge pull request #6233 from jitendra-webkul/master
Guest cart session is not getting removed after last item deletion
2022-04-05 15:10:43 +05:30
jitendra 0f23443a17 Guest cart session is not getting removed after last item deletion 2022-04-05 15:01:16 +05:30
Jitendra Singh db5916f7dd
Merge pull request #6232 from jitendra-webkul/master
Issue #5772 fixed
2022-04-05 14:32:48 +05:30
jitendra 1ed152122c Issue #5772 fixed 2022-04-05 14:25:34 +05:30
Jitendra Singh e07d14d832
Merge pull request #6230 from jitendra-webkul/master
Issue #5530 fixed
2022-04-05 14:10:47 +05:30
jitendra 5a702b11b0 Issue #5530 fixed 2022-04-05 13:57:59 +05:30
Jitendra Singh e877441561
Merge pull request #6223 from devansh-webkul/datagrid-plus-changes
Enhancement completed in which the filter dropdown should be according to the selected value #5397
2022-04-05 12:24:55 +05:30
Jitendra Singh 2d838bd683
Merge pull request #6227 from jitendra-webkul/master
Issue #6190 fixed
2022-04-05 11:48:16 +05:30
jitendra f04dc46709 Issue #6190 fixed 2022-04-05 11:40:11 +05:30
Devansh bf953fed22 Merge branch 'master' into datagrid-plus-changes 2022-04-05 11:33:39 +05:30
Jitendra Singh 94e5df24d4
Merge pull request #6226 from jitendra-webkul/master
Issue #5772 fixed
2022-04-05 11:27:18 +05:30
jitendra 13f0e4eda6 Issue #5772 fixed 2022-04-05 11:13:42 +05:30
Jitendra Singh db7e05178c
Merge pull request #6225 from Anmol-Chauhan/flash-translation-issue
issue #6205
2022-04-05 11:07:25 +05:30
Devansh 483cc0d5d0 Merge branch 'master' into datagrid-plus-changes 2022-04-04 20:42:50 +05:30
Devansh a7914accbb More Clean Ups Done 2022-04-04 20:34:06 +05:30
Devansh d8a3b3a126 Some More Clean Up Done 2022-04-04 20:09:46 +05:30
Anmol-Chauhan 51d6a98d18 issue #6205 2022-04-04 20:01:56 +05:30
Devansh d9954738eb Refersh Name Added 2022-04-04 19:36:46 +05:30
Devansh c40e4066d2 On Delete Page Refresh Fixed 2022-04-04 19:24:28 +05:30
Devansh bf578d3e94 Filter And Check Box Issue Fixed 2022-04-04 18:06:55 +05:30
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