4544 Commits

Author	SHA1	Message	Date
rahulshukla-home	41fbb0adab	Issue #3505 fixed	2020-07-17 14:31:51 +05:30
Jitendra Singh	ce8946504c	Merge pull request #3509 from vaishaliwebkul/master ... Issue #3508 fixed	2020-07-17 13:33:53 +05:30
vishal-webkul	66a7b40bbc	color attribute default swatch value should be selected as dropdown swatch - issue fixed #3488	2020-07-17 13:29:47 +05:30
Akhtar Khan	9f6e9cc59b	Fixed layout issue in order and downloadable grid at customer #3472	2020-07-17 12:33:26 +05:30
Jitendra Singh	dbab50d0a7	Merge pull request #3500 from asif-webkul/3311 ... fixed issue #3311 in default theme	2020-07-17 12:01:35 +05:30
Jitendra Singh	08e20ee63e	Merge pull request #3503 from devansh-webkul/category-limit-zero-issue ... Category filter limit zero issue fixed #3478	2020-07-17 12:01:06 +05:30
Akhtar Khan	00709bc422	Fixed layout issue in order and downloadable grid at customer #3472	2020-07-17 10:52:36 +05:30
vishal-webkul	3992d19966	Broken image for color image swatch type - issue fixed #3491	2020-07-17 10:03:21 +05:30
vaishali agarwal	c1f611bd2c	Issue #3508 fixed	2020-07-16 22:16:38 +05:30
vaishali agarwal	412a620dbd	undo changes	2020-07-16 21:29:58 +05:30
vaishali agarwal	acbe32861f	Pl local issue fixed	2020-07-16 21:14:41 +05:30
Akhtar Khan	db21696c10	Fixed filter tag is out of box in search key term for long product name #3445	2020-07-16 18:34:57 +05:30
Akhtar Khan	606d42c0a3	Final Fixed the Add address Button In Customer Account Section #3475	2020-07-16 18:09:44 +05:30
Akhtar Khan	f114ba2dcb	Fixed layout issue in order and downloadable grid at customer #3472	2020-07-16 17:51:32 +05:30
Akhtar Khan	de60d86b56	Final fixed layout issue in order and downloadable grid at customer #3472	2020-07-16 17:12:39 +05:30
vaishali agarwal	47d90ce1f8	chinese locale search issue fixed	2020-07-16 13:31:05 +05:30
Devansh	222b03ed41	Category filter limit zero issue fixed	2020-07-16 13:12:19 +05:30
Devansh	31af7220cf	Reverting to previous one as this is related to another issue	2020-07-16 13:07:46 +05:30
Akhtar Khan	8c1561c142	Merge branch 'master' of https://github.com/bagisto/bagisto into patch3	2020-07-16 12:41:34 +05:30
Akhtar Khan	9b82845bb6	changes in compare file	2020-07-16 12:41:11 +05:30
Devansh	21596b189d	Limit 0 Issue Fixed	2020-07-16 12:29:56 +05:30
vishal-webkul	0f998d9e57	Back icon is not working in catalog and cart rule grid - Bug Fixed	2020-07-16 12:20:01 +05:30
mohd asif	822b86e126	fixed issue 3311 in default theme	2020-07-16 12:16:13 +05:30
Devansh	6a1a96ca59	Sales issue fixed in grouped as well as bundle	2020-07-15 20:33:53 +05:30
Akhtar Khan	5c1dc40144	–layout issue in order and downloadable grid at customer #3472	2020-07-15 15:30:57 +05:30
jitendra	ba41476476	Changes event name for path hint	2020-07-15 14:00:25 +05:30
Annika Wolff	769e28f78c	merge master	2020-07-15 08:06:00 +02:00
Annika Wolff	7ca4deba90	remove + from multiple search terms, fix boolean error	2020-07-15 08:04:14 +02:00
Jitendra Singh	8c7ad53776	Merge pull request #3434 from phillipcodes/patch-5 ... Booking Product Bug: Additional data wont be saved	2020-07-15 11:20:33 +05:30
Shubham Mehrotra	750d7a262a	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-07-14 19:48:40 +05:30
Jitendra Singh	0a662c34f6	Merge pull request #3075 from MattApril/hide_0_dollar_bundle_item_price ... Hide $0 bundle option price in cart	2020-07-14 19:41:15 +05:30
Jitendra Singh	12ee962b95	Merge pull request #3302 from MattApril/disabled_bundle_options_fix ... Addresses required bundle options being removed if all product option…	2020-07-14 19:40:26 +05:30
Jitendra Singh	fca88e16ac	Merge pull request #3463 from Haendlerbund/performance-cart-rules-checks ... Improve performance when checking cart-rules	2020-07-14 19:38:48 +05:30
Jitendra Singh	ac04d9418f	Merge pull request #3432 from asif-webkul/newissue ... fixed issue #3400 and #3399	2020-07-14 19:16:01 +05:30
Akhtar Khan	8a7f08670e	changed in filter search #3445	2020-07-14 18:37:39 +05:30
Akhtar Khan	2d69088531	Changed in Filter Search Product in Admin Panel	2020-07-14 18:28:49 +05:30
rahulshukla-home	012b2c2b6b	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-07-14 18:04:16 +05:30
rahulshukla-home	6b648bf69c	dependent field issue	2020-07-14 18:01:52 +05:30
Akhtar Khan	b5dab83c49	Changed in Filter Input Search field For Product in Admin Panel	2020-07-14 17:43:10 +05:30
Akhtar Khan	910f744973	Fixed Filter tag in search of product in admin panel #3445	2020-07-14 15:54:37 +05:30
Jitendra Singh	345c22e1e6	Merge pull request #3141 from MattApril/bundle_inventory ... Added support for checking bundle inventory, and bundle product inventory.	2020-07-14 13:51:16 +05:30
Jitendra Singh	6c6c3c9b3b	Merge pull request #3476 from jitendra-webkul/1.0 ... Virtual inventory issue fixed	2020-07-14 12:16:38 +05:30
jitendra	3c371a781c	Virtual inventory issue fixed	2020-07-14 12:07:55 +05:30
Jitendra Singh	fd376ebdb6	Merge pull request #3466 from olaysco/development ... issue #3447 fixed	2020-07-14 11:53:33 +05:30
Akhtar Khan	fd15252d38	Changes in Add Address Button in Customer Account Section & Label on new product in velocity theme	2020-07-14 11:42:20 +05:30
Akhtar Khan	621284eb27	Merge branch 'master' of https://github.com/bagisto/bagisto into add_address	2020-07-14 11:23:16 +05:30
Jitendra Singh	71342b1bd7	Merge pull request #3474 from rahulcs0082/development ... Issue #3460 fixed	2020-07-14 11:02:59 +05:30
rahulshukla-home	2f42cf7355	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-07-14 10:32:12 +05:30
rahulshukla-home	63cb71bd2b	Issue #3460 fixed	2020-07-14 10:07:06 +05:30
Jitendra Singh	c5c4a114c6	Merge pull request #3473 from jitendra-webkul/1.0 ... Added blade file hint feature for frontend	2020-07-13 21:54:27 +05:30
jitendra	2adb5f26d3	Added blade file hint feature for frontend	2020-07-13 21:44:56 +05:30
Akhtar Khan	629fd5d60d	Final Change in the position of Add Address Button in Customer Account Section	2020-07-13 18:01:21 +05:30
Akhtar Khan	605ae744dd	changed the position of Add Address Button in Customer Account Section	2020-07-13 17:14:44 +05:30
olaysco	e09bf9efb1	include config seeders to enable social login by default	2020-07-10 17:22:11 +01:00
Florian Bosdorff	376ae65394	fix typo	2020-07-10 14:35:59 +02:00
rahulshukla-home	44f8d3e78d	Issue #3458 fixed	2020-07-10 12:57:27 +05:30
Florian Bosdorff	43c4074bf7	improve performance when checking cart-rules	2020-07-10 08:18:42 +02:00
rahulshukla-home	896356ec9b	Issue #3459 fixed	2020-07-10 10:38:44 +05:30
Shubham Mehrotra	a17634d3d1	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-07-10 10:26:55 +05:30
rahulshukla-home	33d3e52469	Issue #3457 fixed	2020-07-09 20:07:49 +05:30
mohd asif	4c84e9c328	production css	2020-07-09 10:28:23 +05:30
mohd asif	f5b892e47c	Merge branch 'master' of https://github.com/bagisto/bagisto into newissue	2020-07-09 10:00:39 +05:30
mohd asif	f81e56ce2f	moved css to sass	2020-07-09 09:57:25 +05:30
rahulshukla-home	60ae1ee43f	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-07-08 20:14:13 +05:30
rahulshukla-home	e36730e11d	Issue #3443 fixed	2020-07-08 19:36:40 +05:30
Jitendra Singh	e2b941ff71	Merge pull request #3449 from rahulcs0082/development ... Issue #3444 fixded	2020-07-08 17:27:09 +05:30
rahulshukla-home	e19daf97c6	Issue #3444 fixded	2020-07-08 17:13:49 +05:30
Jitendra Singh	101414b59e	Merge pull request #3442 from jitendra-webkul/1.0 ... Issue #3423 fixed	2020-07-08 11:21:04 +05:30
jitendra	e1c7506035	Issue #3423 fixed	2020-07-08 11:15:11 +05:30
rahulshukla-home	95f6526c5a	Issue #3313 fixed	2020-07-08 11:11:30 +05:30
Shubham Mehrotra	967f5452ed	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-07-07 21:08:52 +05:30
rahulshukla-home	7b5f2a6d0a	Issue #3313 fixed	2020-07-07 17:30:40 +05:30
rahulshukla-home	a1fadbfda4	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-07-07 15:40:27 +05:30
rahulshukla-home	2b9651fd77	Issue #3310 fixed	2020-07-07 15:39:58 +05:30
Shubham Mehrotra	7ff0f605ba	added condition in compare list	2020-07-07 13:42:47 +05:30
jitendra	ec3a7c368b	Resolved conflicts	2020-07-07 13:38:52 +05:30
jitendra	1eb2873588	Issue #3423 fixed	2020-07-07 13:36:14 +05:30
Jitendra Singh	ce0ec932cd	Merge pull request #3435 from jitendra-webkul/1.0 ... Fixed issue in order view page if customer group is null	2020-07-07 12:38:59 +05:30
jitendra	fdb214ec22	Fixed issue in order view page if customer group is null	2020-07-07 12:20:51 +05:30
phillipcodes	9e5f886de1	Update Booking.php	2020-07-07 08:17:49 +02:00
Shubham Mehrotra	0847bb0db9	minor design change	2020-07-07 10:47:33 +05:30
mohammad asif	88483f1731	Merge branch 'master' of https://github.com/bagisto/bagisto into newissue	2020-07-06 21:16:24 +05:30
mohammad asif	426717ba94	Merge branch 'master' of https://github.com/asif-webkul/bagisto into newissue	2020-07-06 21:14:45 +05:30
mohammad asif	e734420174	fixed issue #3399	2020-07-06 21:14:03 +05:30
Akhtar Khan	819606d232	changed in design comparison	2020-07-06 21:06:05 +05:30
Akhtar Khan	673e3e6dac	changed in design comparison	2020-07-06 20:53:18 +05:30
Herbert Maschke	ef99a1e981	properly pass the data array into the 'checkout.order.safe.before' event	2020-07-06 14:46:19 +02:00
Jitendra Singh	1b7b6f91bd	Merge pull request #3430 from rahulcs0082/development ... Issue #3409 fixed	2020-07-06 17:02:19 +05:30
mohd asif	5c268863c2	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-07-06 17:01:34 +05:30
mohd asif	366876e8e1	fixed compare page ui issue #3400	2020-07-06 16:56:53 +05:30
rahulshukla-home	4c76fb27e9	Issue #3409 fixed	2020-07-06 16:54:16 +05:30
Jitendra Singh	644dd975cf	Merge pull request #3429 from jitendra-webkul/1.0 ... Issue #3425 fixed	2020-07-06 13:35:27 +05:30
jitendra	fa05bc8f0a	Issue #3425 fixed	2020-07-06 13:22:46 +05:30
rahulshukla-home	b53e0055e0	Issue #3423	2020-07-06 11:27:57 +05:30
rahulshukla-home	6d7df0616b	issue #3426 fixed	2020-07-06 11:16:35 +05:30
rahulshukla-home	2dc3eba431	Issue #3417 fixed	2020-07-03 15:43:30 +05:30
rahulshukla-home	e14772377f	Issue #3411 fixed	2020-07-03 13:13:25 +05:30
Shubham Mehrotra	28f8b369d8	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-07-03 12:15:34 +05:30
Shubham Mehrotra	9e03cd121b	badge-design in rtl	2020-07-03 12:08:20 +05:30
Jitendra Singh	210c705ff0	Merge pull request #3410 from rahulcs0082/development ... Issue #3394	2020-07-03 11:41:25 +05:30
Jitendra Singh	2b8a7003be	Merge pull request #3403 from asif-webkul/master ... fixed issue #3381 and #3311	2020-07-03 11:41:02 +05:30
rahulshukla-home	8c779883aa	Issue #3394	2020-07-03 11:13:42 +05:30
ghermans	105d6fd566	fixed #3381	2020-07-02 22:13:35 +02:00
Jitendra Singh	63d3c7b554	Merge pull request #3405 from jitendra-webkul/1.0 ... Added support for search with algolia and elasticsearch	2020-07-02 17:25:24 +05:30
jitendra	e5f90b92d0	Added support for search with algolia and elasticsearch	2020-07-02 17:00:21 +05:30
rahulshukla-home	1cd7f76a3d	Issue #3392 fixed	2020-07-02 14:57:31 +05:30
mohammad asif	00b9f4862c	fixed issue 3311 filter disapear on zero product	2020-07-02 13:28:02 +05:30
mohammad asif	9dcfaf7d0a	fixed issue 3381 city does not allowed hyphen	2020-07-02 13:23:49 +05:30
rahulshukla-home	171ea1114b	Issue #3395 and #3396 fixed	2020-07-02 13:02:46 +05:30
rahulshukla-home	9416186c16	Issue #3395 and #3396 fixed	2020-07-02 12:57:22 +05:30
vaishali agarwal	8b8774d800	compare option default value for en locale	2020-07-01 10:13:20 +05:30
Jitendra Singh	4ea9ad0d39	Merge pull request #3384 from Haendlerbund/customizeable-order-number-generators ... Customizeable order number generators	2020-06-30 22:52:07 +05:30
Florian Bosdorff	b3bdcc473e	change naming of order increment generator	2020-06-30 15:11:35 +02:00
jitendra	b59f6e7264	Removed unique constraints from tax_categories table	2020-06-30 16:38:11 +05:30
jitendra	01a4e57d25	Issue #3354 fixed	2020-06-30 16:19:35 +05:30
Annika Wolff	a833677ffa	refactor	2020-06-30 12:16:18 +02:00
Annika Wolff	ebbb674b0b	Merge 'bagisto-master' into admin-backend/keep-search-terms-after-new-page-load	2020-06-30 12:07:16 +02:00
jitendra	8bf852a7cf	Added exception handler during social login redirect	2020-06-30 15:19:39 +05:30
Florian Bosdorff	81e71b413e	fix BookingProductEventTicketFactory	2020-06-30 10:48:46 +02:00
Florian Bosdorff	e480c6cda4	Merge branch 'bagisto/master' into customizeable-order-number-generators	2020-06-30 10:46:53 +02:00
jitendra	c6d23bfdeb	Issue #3373 fixed	2020-06-30 13:23:06 +05:30
Florian Bosdorff	98111f686c	add ability to customize order incrment number generator	2020-06-30 09:46:48 +02:00
Jitendra Singh	1976f0e9f3	Merge pull request #3382 from shubhwebkul/master ... Issue #3380 resolved	2020-06-30 12:56:09 +05:30
Annika Wolff	39e79513ff	Merge 'bagisto-master' into admin-backend/keep-search-terms-after-new-page-load	2020-06-30 08:18:32 +02:00
ghermans	e04b30859f	fixed #3371	2020-06-30 02:47:43 +02:00
Shubham Mehrotra	04921bfa4b	#3380	2020-06-29 21:24:27 +05:30
Jitendra Singh	c6cc431441	Merge pull request #3372 from overtrue/patch-1 ... Reuse variables	2020-06-29 17:00:18 +05:30
Jitendra Singh	2403336f8a	Merge pull request #3376 from jitendra-webkul/1.0 ... Issue #3374 fixed	2020-06-29 11:59:46 +05:30
Pranshu Tomar	b901a74d9d	Issue #3374 fixed	2020-06-29 11:58:47 +05:30
安正超	e27892ab80	Reuse variables	2020-06-28 10:03:19 +08:00
Jitendra Singh	67a482b61b	Merge pull request #3368 from jitendra-webkul/1.0 ... Changed social icon name	2020-06-26 19:35:50 +05:30
Pranshu Tomar	76ca5db726	Changed social icon name	2020-06-26 19:34:49 +05:30
Jitendra Singh	3ab7b91222	Merge pull request #3367 from jitendra-webkul/1.0 ... Social login completed	2020-06-26 19:12:26 +05:30
Pranshu Tomar	ed1d119fea	Removed comment from social login package	2020-06-26 19:11:02 +05:30
Pranshu Tomar	4681205f17	Social login completed	2020-06-26 19:09:53 +05:30
Shubham Mehrotra	cb59e921d1	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-06-26 16:04:34 +05:30
Shubham Mehrotra	81094c0502	#3363	2020-06-26 16:04:15 +05:30
Shubham Mehrotra	212853d6c8	#3356	2020-06-26 15:10:02 +05:30
Shubham Mehrotra	e3f80b886f	#3354	2020-06-26 14:52:52 +05:30
Shubham Mehrotra	e806156dae	#3357	2020-06-26 14:18:02 +05:30
Shubham Mehrotra	bb281263fb	#3358	2020-06-26 12:01:19 +05:30
Shubham Mehrotra	d72b8b9c0a	#3360	2020-06-26 11:47:00 +05:30
Jitendra Singh	fe3c95f463	Merge pull request #3355 from shubhwebkul/master ... misc. bug fixes	2020-06-25 12:33:01 +05:30
Jitendra Singh	549c0e38d3	Merge pull request #3353 from Haendlerbund/expose-downloadable-links ... feature: expose downloadable links	2020-06-25 12:25:20 +05:30
Shubham Mehrotra	c3c23d1e6d	condition added #3335	2020-06-25 12:14:11 +05:30
Shubham Mehrotra	bc28ddde56	#3339	2020-06-25 11:58:04 +05:30
Shubham Mehrotra	88ace5f75d	#3335	2020-06-25 11:22:42 +05:30
Herbert Maschke	f30da1f3a4	expose downloadable links in API Resource\Sales\Order.php and src\Models\OrderItem.php	2020-06-24 20:53:01 +02:00
Shubham Mehrotra	7c79474cf8	#3341	2020-06-24 21:47:06 +05:30
Shubham Mehrotra	d42ce9f505	#3341	2020-06-24 21:14:58 +05:30
Shubham Mehrotra	94802e1e2f	default compare option enable	2020-06-24 19:26:29 +05:30
Jitendra Singh	e92ac1cb29	Merge pull request #3350 from jitendra-webkul/1.0 ... Issue #3314 fixed	2020-06-24 18:58:50 +05:30
Pranshu Tomar	e8f6b9a143	Issue #3314 fixed	2020-06-24 18:57:46 +05:30
Jitendra Singh	4b66a4116d	Merge pull request #3349 from jitendra-webkul/1.0 ... Datagrid rtl issue fixed	2020-06-24 17:52:57 +05:30
Pranshu Tomar	78aaca1e51	Datagrid rtl issue fixed	2020-06-24 17:51:53 +05:30
Jitendra Singh	fc9cf05cda	Merge pull request #3347 from shubhwebkul/patch-3 ... misc. bug fixes	2020-06-24 17:44:47 +05:30
Shubham Mehrotra	35b5f3da8d	resolved conflicts	2020-06-24 17:42:30 +05:30
Pranshu Tomar	35b200a7cf	Issue #3331 fixed	2020-06-24 17:31:28 +05:30
Shubham Mehrotra	3c2e59088e	#3307	2020-06-24 17:12:35 +05:30
Shubham Mehrotra	a9a6d8f7c4	#3341	2020-06-24 16:01:48 +05:30
Shubham Mehrotra	cc1f2c5c40	#3315	2020-06-24 15:38:33 +05:30
Shubham Mehrotra	0868599679	#3309	2020-06-24 15:17:04 +05:30
Shubham Mehrotra	53d22c56ae	#3317	2020-06-24 15:09:14 +05:30
Shubham Mehrotra	ab52d0162f	#3321	2020-06-24 15:03:09 +05:30
Pranshu Tomar	b300b97917	Issue #3338 fixed	2020-06-24 14:53:26 +05:30
Shubham Mehrotra	eb9778a72e	#3322	2020-06-24 14:50:22 +05:30
Shubham Mehrotra	128c6d686a	#3338	2020-06-24 14:45:31 +05:30
Shubham Mehrotra	c807e2d827	#3339	2020-06-24 14:34:31 +05:30
Shubham Mehrotra	51d1ae7c99	#3340	2020-06-24 14:28:36 +05:30
Shubham Mehrotra	db8db1565a	#3323	2020-06-23 17:30:40 +05:30
Shubham Mehrotra	292c32c37b	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2	2020-06-23 16:54:11 +05:30
Shubham Mehrotra	e49041bbad	#3330	2020-06-23 16:51:49 +05:30
Shubham Mehrotra	e5eb0bef93	#3301	2020-06-23 15:57:38 +05:30
Pranshu Tomar	3d7be74d5b	Issue #3320 fixed	2020-06-22 16:16:46 +05:30
Pranshu Tomar	d79b4e3543	Issue #3319 fixed	2020-06-22 16:08:45 +05:30
Pranshu Tomar	946c14eb90	Issue #3316 fixed	2020-06-22 15:44:44 +05:30
Pranshu Tomar	9029e513e9	Issue #3301 fixed	2020-06-22 14:56:38 +05:30
Glenn Hermans	b22efb2b7b	fixed #3304	2020-06-20 11:45:20 +02:00
Matt April	12dc7a62a4	Addresses required bundle options being removed if all product options are disabled. #3160	2020-06-19 11:38:56 -04:00
Matt April	36444145c0	style.	2020-06-19 11:29:03 -04:00
Shubham Mehrotra	dac3487d1f	remove compare option from customer sidebar	2020-06-19 19:12:12 +05:30
Jitendra Singh	737678e1ee	Merge pull request #3296 from jitendra-webkul/1.0 ... Undefined type index exception fixed during updation for bookign pro…	2020-06-19 15:06:21 +05:30
Pranshu Tomar	0de9d7b05f	Undefinded type index exception fixed during updation for bookign product	2020-06-19 15:04:49 +05:30
Jitendra Singh	996df02d91	Merge pull request #3295 from jitendra-webkul/1.0 ... Issue #2981 fixed	2020-06-19 14:56:00 +05:30
Pranshu Tomar	28d74ec6a7	Issue #2981 fixed	2020-06-19 14:55:18 +05:30
Jitendra Singh	88da93dac0	Merge pull request #3294 from jitendra-webkul/1.0 ... Remove button will be enabled by default in date component	2020-06-19 14:50:53 +05:30
Pranshu Tomar	ad6bab6a3a	Remove button will be enabled by default in date component	2020-06-19 14:49:58 +05:30
Jitendra Singh	ad51a0153d	Merge pull request #3292 from jitendra-webkul/1.0 ... Issue #3289 fixed	2020-06-19 14:02:09 +05:30
Pranshu Tomar	9a4adc50ab	Issue #3289 fixed	2020-06-19 14:01:22 +05:30
Jitendra Singh	29223cca7d	Merge pull request #3288 from shubhwebkul/master ... option to disable compare feature added	2020-06-19 13:50:00 +05:30
Jitendra Singh	ef9bac610a	Merge pull request #3290 from jitendra-webkul/1.0 ... Issue #3222 fixed	2020-06-19 13:44:21 +05:30
Pranshu Tomar	8478a4a710	Issue #3222 fixed	2020-06-19 13:43:32 +05:30
Shubham Mehrotra	3d011e1c74	translation added	2020-06-19 13:37:14 +05:30
Shubham Mehrotra	76a1034f49	optional compare option in default theme	2020-06-19 13:26:16 +05:30
Shubham Mehrotra	8cc42af537	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-06-19 13:16:24 +05:30
Shubham Mehrotra	3d44f95469	optional compare option	2020-06-19 13:16:01 +05:30
Jitendra Singh	010a7fb021	Merge pull request #3287 from jitendra-webkul/1.0 ... Issue #3246 fixed	2020-06-19 13:07:07 +05:30
Pranshu Tomar	a7a4fd12e5	Issue #3246 fixed	2020-06-19 13:06:16 +05:30
Shubham Mehrotra	8cfe88e045	#3131	2020-06-18 21:05:56 +05:30
Shubham Mehrotra	92cf27b037	Merge branch 'master' of https://github.com/bagisto/bagisto into tensorflow	2020-06-18 17:34:36 +05:30
Shubham Mehrotra	39d646275c	implemented search feature	2020-06-18 17:34:13 +05:30
Pranshu Tomar	9189a71828	Issue #3270 fixed	2020-06-18 17:03:34 +05:30
Pranshu Tomar	aa34f8168d	Issue #3272 fixed	2020-06-18 16:20:44 +05:30
Pranshu Tomar	87b3f2acdc	Conflicts resolved	2020-06-18 15:58:18 +05:30
Pranshu Tomar	6840198571	Issue #3273 fixed	2020-06-18 15:55:05 +05:30
Annika Wolff	b61f57a698	add additional field	2020-06-18 10:10:16 +02:00
Shubham Mehrotra	e55452bb56	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2	2020-06-17 19:17:27 +05:30
Shubham Mehrotra	780e57e5e8	#2937	2020-06-17 19:15:42 +05:30
Jitendra Singh	421e5c1134	Merge pull request #3267 from ahmedusama250/master ... catalog rules permissions is missing	2020-06-17 18:14:26 +05:30
Jitendra Singh	eae61adca8	Merge pull request #3266 from shubhwebkul/patch-1 ... bug fixes	2020-06-17 18:12:37 +05:30
ahmedusama250	33947fc72c	Merge pull request #1 from bagisto/master ... Catalog Rules missing in the permissions list	2020-06-17 14:00:09 +02:00
Shubham Mehrotra	53a1cd43c7	loader added	2020-06-17 16:30:25 +05:30
Shubham Mehrotra	12965457c8	Merge branch 'tensorflow' into patch-2	2020-06-17 16:28:59 +05:30
Shubham Mehrotra	d77aeaf822	added trait SendsPasswordResetEmails	2020-06-17 16:26:22 +05:30
Shubham Mehrotra	c36c98a5be	bug fixes	2020-06-17 16:08:13 +05:30
Jitendra Singh	2e3264c618	Merge pull request #3263 from jitendra-webkul/1.0 ... Issue #3254 fixed	2020-06-17 13:00:45 +05:30
Pranshu Tomar	c9d59c6f38	Issue #3254 fixed	2020-06-17 12:44:18 +05:30
Jitendra Singh	fbd3e10352	Merge pull request #3261 from shubhwebkul/patch-2 ... misc. fixed design issues	2020-06-17 12:18:13 +05:30
Shubham Mehrotra	68ae87598c	#3248	2020-06-17 11:42:30 +05:30
Shubham Mehrotra	2f0475eb15	#3249	2020-06-17 11:24:21 +05:30
Shubham Mehrotra	976cd9f940	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2	2020-06-17 10:24:44 +05:30
Shubham Mehrotra	bf8828326d	resolved design issues	2020-06-17 10:21:55 +05:30
AhmedUsama	74d4c15cdf	fix in route in permissions of catalog roles	2020-06-17 00:07:46 +02:00
AhmedUsama	a5dd53299c	Add catalog rules in permissions list in select tree of role	2020-06-16 23:58:42 +02:00
Jitendra Singh	e156fa95fc	Merge pull request #3260 from jitendra-webkul/1.0 ... Issue fixed if booking product is null	2020-06-16 21:30:13 +05:30
Pranshu Tomar	960b7058b8	Issue fixed if booking product is null	2020-06-16 21:29:33 +05:30
Jitendra Singh	e845c291c6	Merge pull request #3259 from jitendra-webkul/1.0 ... Issue #3219 fixed	2020-06-16 20:56:22 +05:30
Pranshu Tomar	d761fc2d7e	Issue #3219 fixed	2020-06-16 20:55:29 +05:30
Jitendra Singh	24e75d028e	Merge pull request #3258 from jitendra-webkul/1.0 ... Issue #3237 fixed	2020-06-16 19:50:12 +05:30
Pranshu Tomar	2ed98a2838	Issue #3237 fixed	2020-06-16 19:49:01 +05:30
Jitendra Singh	a3c5e3f7b1	Revert "Issue #3238 resolved"	2020-06-16 19:35:06 +05:30
Pranshu Tomar	65fddfc20d	Issue #3246 fixed	2020-06-16 19:27:53 +05:30
Annika Wolff	15d9155a9d	refactoring	2020-06-16 15:33:03 +02:00
Pranshu Tomar	2c7d90deef	Homepage 404 issue fixed	2020-06-16 17:58:52 +05:30
Jitendra Singh	3b2df1f99c	Merge pull request #3193 from Haendlerbund/add-context-to-logging-when-adding-product-to-cart ... Add logging to exception thrown in cart	2020-06-16 13:54:52 +05:30
Jitendra Singh	3a948e0d50	Merge pull request #3210 from Haendlerbund/improve-date-pickers ... add a 'clear' button beneath date and datetime pickers	2020-06-16 13:52:51 +05:30
Jitendra Singh	44bceedd05	Merge pull request #3220 from Haendlerbund/enhance-orderitemfactory-and-cartitemfactory ... extend two factories	2020-06-16 13:08:20 +05:30
Jitendra Singh	9f27e46d5c	Merge pull request #3239 from ghermans/development ... Customer details	2020-06-16 13:03:50 +05:30
Jitendra Singh	87d9f78e4f	Merge pull request #3244 from shubhwebkul/patch-1 ... Issue #3238 resolved	2020-06-16 11:59:54 +05:30
Shubham Mehrotra	7b8668da3c	updates	2020-06-15 20:48:49 +05:30
Shubham Mehrotra	c23d58bc38	resolved rtl design issues	2020-06-15 17:26:22 +05:30
shubhammehrotra.symfony@webkul.com	0b573bbadf	#3238	2020-06-15 14:33:43 +05:30
shubhammehrotra.symfony@webkul.com	90eed2792b	previous changes	2020-06-15 13:45:59 +05:30
Shubham Mehrotra	f028a0c4b1	initial	2020-06-15 09:56:16 +05:30
ghermans	7b47e1f173	Added customer overview	2020-06-15 04:29:00 +02:00
Shubham Mehrotra	ab2f3193d3	velocity meta data locale support updates	2020-06-11 20:06:30 +05:30
Jitendra Singh	6397665ab9	Merge pull request #3224 from jitendra-webkul/1.0 ... Fixed laravel migration issue & completed tensorflow image search fea…	2020-06-11 18:41:03 +05:30
Pranshu Tomar	c9dd20db7e	Fixed laravel migration issue & completed tensorflow image search feature on defaul theme	2020-06-11 18:34:16 +05:30
Annika Wolff	9bf7810a5f	add encoding of search terms	2020-06-11 14:56:05 +02:00
Annika Wolff	3ba83ace26	prevent flickering, use blisss theme	2020-06-11 14:23:34 +02:00