Commit Graph

2413 Commits

Author SHA1 Message Date
Your Name 408a08d012 Merge branch 'sarga-v1' of gitlab.com:merdan.m/bagisto into sarga-v1 2022-05-13 16:17:48 +05:00
Your Name a8c31e1a44 server-folder-permissions 2022-05-13 16:01:33 +05:00
merdan 54636be4e0 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	packages/Webkul/Shipping/src/Shipping.php
2022-05-13 15:52:25 +05:00
Devansh dd5a344a96 Integer Validation Added 2022-05-09 17:08:56 +05:30
Devansh 0e5829cb6a Multiple Issue Fixed 2022-05-09 16:53:16 +05:30
Devansh f74b6b0b92 Validations message Added 2022-05-09 16:05:21 +05:30
merdan 494d31a1e0 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-30 10:30:10 +05:00
Devansh a67ae8cd9b
Update view.blade.php 2022-04-26 17:01:51 +05:30
Devansh 95e4c74b57 More Checks Added 2022-04-26 14:48:42 +05:30
Devansh fc836ee656 Merge remote-tracking branch 'upstream/master' into check-added 2022-04-26 13:51:47 +05:30
Devansh 3d51fc2db3 Check Added 2022-04-26 13:51:27 +05:30
Sanjay 04b15ab4fa Enhancement #6327 Done 2022-04-26 11:54:43 +05:30
merdan 306854b3d1 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-21 18:17:31 +05:00
Sanjay 6b74b2644b Issue #6324 Fixed 2022-04-20 17:14:29 +05:30
Devansh 1b5d311044 Checkbox Support Added 2022-04-19 12:53:57 +05:30
Vivek Sharma 6f784bc935 [Updated: field-type: info index updated for configuration.] 2022-04-18 16:05:57 +05:30
Devansh 858be214d0 Removed Vue Loader 2022-04-18 14:27:15 +05:30
merdan 0e819f43fe Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	public/installer/Seeder.php
2022-04-13 18:46:20 +05:00
Sanjay bc51e1b6dc Issue #6294 fixed 2022-04-13 11:54:45 +05:30
Jitendra Singh e9001d924e
Merge pull request #6286 from Sanjaybhattwebkul/dashboard-cards
Issue #6285 fixed
2022-04-12 16:48:38 +05:30
Sanjay 18757e7479 Issue #6285 fixed 2022-04-11 16:47:34 +05:30
Vivek Sharma 83390632da [Updated: locale added for the passwords.throttled.] 2022-04-08 12:51:58 +05:30
Jitendra Singh 8a6bd3aa1c
Merge pull request #6262 from devansh-webkul/admin-localization-removed
Admin Localization Removed #4257#issuecomment-1090344313
2022-04-07 17:17:37 +05:30
Jitendra Singh d377d9ec1b
Merge pull request #6265 from jitendra-webkul/master
Issue #2308 fixed (Now attribute group's name can be changed)
2022-04-07 17:06:27 +05:30
merdan 2cd0e2b7c8 fix mix 2022-04-07 16:34:32 +05:00
jitendra d257aa9720 Issue #2308 fixed 2022-04-07 16:56:33 +05:30
Devansh df1eea2a91 Admin Localization Removed 2022-04-07 12:28:23 +05:30
Jitendra Singh def1d31b1f
Merge pull request #6252 from jitendra-webkul/master
Issue #6250 fixed
2022-04-06 17:01:44 +05:30
jitendra 2b2b9d10ec Issue #6250 fixed 2022-04-06 16:50:16 +05:30
Jitendra Singh 0921789cb8
Merge pull request #6249 from jitendra-webkul/master
Issue #5354 fixed
2022-04-06 15:29:28 +05:30
jitendra 93f582b78f Issue #5354 fixed 2022-04-06 15:05:39 +05:30
Jitendra Singh 0c5cb7ed82
Merge pull request #6245 from devansh-webkul/currency-symbol-and-product-listing-issue
Currency Symbol #6244 And Product Listing Fixed #6246
2022-04-06 14:58:01 +05:30
Jitendra Singh 0da87c716e
Merge pull request #6248 from jitendra-webkul/master
Issue #6243 fixed
2022-04-06 14:47:56 +05:30
jitendra 9a5965be00 Issue #6243 fixed 2022-04-06 14:38:35 +05:30
Devansh 130834141e Property Name Updated 2022-04-06 13:06:36 +05:30
Devansh 3bcde84226 Currency Symbol And Product Listing Fixed 2022-04-06 12:53:07 +05:30
Anmol-Chauhan 1db6343dc1 changes done 2022-04-06 09:59:32 +05:30
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