Commit Graph

2426 Commits

Author SHA1 Message Date
Anmol-Chauhan 6e2d454d9f Requested changes done 2022-04-05 20:03:02 +05:30
Anmol-Chauhan 4a92b434d5 requested changes done 2022-04-05 19:46:58 +05:30
Anmol-Chauhan 7c3702be49 issue #6197 fixed 2022-04-05 19:29:45 +05:30
merdan 0a5d418095 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-05 16:43:35 +05:00
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 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
Devansh 483cc0d5d0 Merge branch 'master' into datagrid-plus-changes 2022-04-04 20:42:50 +05:30
Anmol-Chauhan 51d6a98d18 issue #6205 2022-04-04 20:01:56 +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
Devansh 4bde5ca931 Datagrid Breaked 2022-04-04 15:23:53 +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 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
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
Sanjay 922da048fa Issue #6208 Fixed 2022-04-01 17:09:30 +05:30
merdan 45e0d6fe7e Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-01 12:31:02 +05:00
Jitendra Singh 049ec2a32a
Merge pull request #6200 from devansh-webkul/removed-middleware
Removed extra middlewares
2022-03-31 17:13:43 +05:30
jitendra dd9be9a981 Updated users page title 2022-03-31 16:59:07 +05:30
Devansh 22b1725d85 Removed Extra Middlewares 2022-03-31 16:58:52 +05:30
jitendra ae91626e1e Issue #6172 fixed 2022-03-30 13:58:13 +05:30
jitendra b1938481d9 Issue #6144 fixed 2022-03-30 10:11:26 +05:30
merdan 5de0c82f74 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-29 17:06:50 +05:00
jitendra 4bace8ad4b Issue #2278 fixed 2022-03-28 15:15:15 +05:30
jitendra 6edd13c4e2 Admin left side menu z-index issue fixed 2022-03-28 13:15:07 +05:30
jitendra 0fd71e0a83 Issue #4959 fixed 2022-03-28 12:46:15 +05:30
jitendra 106301f356 Issue #6121 fixed 2022-03-28 11:48:06 +05:30
jitendra 67e4615961 Removed vue component string binding due unhandled escaping for other locales 2022-03-28 11:36:23 +05:30
jitendra e9543befb6 Issue #6144 fixed 2022-03-28 11:07:17 +05:30
merdan b6c46480aa Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
2022-03-25 16:18:54 +05:00
jitendra a4cd3a8630 Issue #1466 fixed 2022-03-25 13:00:13 +05:30
jitendra 5fb810852f Issue #6119 fixed 2022-03-25 11:39:16 +05:30
jitendra 828ef3827d Issue #6111 fixed 2022-03-25 11:19:31 +05:30
jitendra a081ddc96c Issue #6119 fixed 2022-03-25 11:10:19 +05:30
jitendra 930819dadc Issue #6114 fixed 2022-03-25 10:29:43 +05:30
jitendra bd58694b6e Merge with master 2022-03-24 12:51:07 +05:30
merdan d3409841b9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-17 16:36:07 +05:00
Devansh bb550c3820 Export Fixed 2022-03-17 14:24:33 +05:30
jitendra 5770c86e8f Issue #6038 fixed 2022-03-16 16:34:18 +05:30
jitendra 42855c6769 Form control locale-chanel label alignment fixed 2022-03-16 16:19:32 +05:30
jitendra a07b04f6bf Conflicts resolved 2022-03-16 15:51:40 +05:30
jitendra 4639c5678e Primary icons chnaged according to dark mode 2022-03-16 15:50:19 +05:30
Glenn Hermans bdf669d416
Merge pull request #6043 from jitendra-webkul/master
Primary button color changed in dark mode
2022-03-16 11:09:06 +01:00
jitendra 6914ad6ee5 Primary button color changed in dark mode 2022-03-16 15:26:30 +05:30
Jitendra Singh d82e6802da
Merge pull request #6042 from jitendra-webkul/master
Admin left nav ui issue fixed
2022-03-16 15:04:54 +05:30
jitendra 65239f7b5f Admin left nav ui issue fixed 2022-03-16 14:50:13 +05:30
Devansh 648668c657 Category Fixed 2022-03-16 11:56:12 +05:30
merdan 74cb937809 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-15 15:43:31 +05:00
Jitendra Singh 9523b25b11
Merge pull request #6022 from jitendra-webkul/master
Issue #6010 fixed'
2022-03-15 10:38:41 +05:30
jitendra 32b6bd2bbe Issue #6010 fixed' 2022-03-15 10:37:58 +05:30
Ahmet Arşiv f40630df80 Missing and incorrect Turkish language files have been edited and added 2022-03-14 18:38:31 +03:00
Sanjay 3558460ffa Issue #5915 Fixed 2022-03-14 15:08:08 +05:30
merdan 4f33f210ac Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-14 11:21:38 +05:00
jitendra 68ce18d327 Issue #5929 fixed 2022-03-14 11:43:04 +05:30
merdan 6cf2dcb15c Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-11 18:12:44 +05:00
Jitendra Singh 90e0ddb306
Merge pull request #5996 from jitendra-webkul/master
Fixed issues
2022-03-11 17:41:38 +05:30
jitendra 1671fefc4b Issue #1238 fixed 2022-03-11 17:01:44 +05:30
jitendra de4b723b45 Issue #2918 fixed (The booking date should be correct) 2022-03-11 13:32:27 +05:30
Jitendra Singh 7244e97967
Merge pull request #5983 from Sanjaybhattwebkul/Hindi-locale-added
Complete changes on Hindi locale-file
2022-03-10 16:49:37 +05:30
Sanjay 27bf899c43 Complete-changes-on-hi_IN-locale-file 2022-03-10 16:39:49 +05:30
merdan 4c1d795e1a Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-10 13:53:15 +05:00
Jitendra Singh 2469ea5057
Merge pull request #5972 from Sanjaybhattwebkul/Hindi-locale-added
Hindi Locale Ldded
2022-03-10 13:27:46 +05:30
jitendra 42f7e0e847 Added cursor pointer to sortable table header 2022-03-10 12:23:35 +05:30
Sanjay f9cac3a0c0 Hindi-locale-added 2022-03-09 18:51:25 +05:30
merdan 3f0ac64cbd Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-07 19:48:45 +05:00
prateek srivastava 2cc1bef92f conflict resolved 2022-03-07 11:40:02 +05:30
merdan 733fd86041 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-06 13:31:40 +05:00
prateek srivastava bd2ea25388 conflict resolved 2022-03-04 19:53:40 +05:30
Prateek Srivastava df484ec1bc
Merge pull request #5955 from prateek-webkul/checkbox-attribute-ui-issue
issue #5805 fixed
2022-03-04 19:48:59 +05:30
prateek srivastava 9ea9584e05 issue #5939 fixed 2022-03-04 19:48:02 +05:30
prateek srivastava 2d91fa90c9 issue #5802 fixed 2022-03-04 18:58:54 +05:30
prateek srivastava c0c8bdd231 issue #5805 fixed 2022-03-04 18:53:18 +05:30
prateek srivastava 2d4fbf2348 admin navbar in mobile fixed 2022-03-04 17:14:12 +05:30
merdan 88639941d4 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-04 16:09:33 +05:00
Glenn Hermans 0a52fe69ad
Merge pull request #5947 from Sanjaybhattwebkul/order-translation
Order-status-translation-done
2022-03-04 12:00:07 +01:00
Prateek Srivastava a6b23b2a14
Merge pull request #5948 from prateek-webkul/forgot-password-ui
issue #5938 fixed
2022-03-04 13:40:13 +05:30
prateek srivastava bb96967da9 issue #5938 fixed 2022-03-04 13:08:46 +05:30
Sanjay 6d061738b1 Order-status-translation-done 2022-03-04 13:07:32 +05:30
Jitendra Singh 010eb02c28
Merge pull request #5937 from Sanjaybhattwebkul/forget-password
asterisk icon added for required fields
2022-03-04 12:58:42 +05:30
Sanjay 08020c9d78 asterisk-icon-added-forRequired-fields 2022-03-04 10:07:39 +05:30
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 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
prateek srivastava 73bdb167fd revert changes on permission issue 2022-03-02 16:12:06 +05:30