Commit Graph

6162 Commits

Author SHA1 Message Date
vishal-webkul 013eafc7a1 fix issue 3313 2020-07-31 15:02:18 +05:30
vishal-webkul 770e3b69fa
Merge branch 'master' into issue-3313 2020-07-31 14:04:22 +05:30
Jitendra Singh 4afc0a5883
Merge pull request #3596 from vishal-webkul/issue-3531
Issue #3531 fixed
2020-07-31 13:49:04 +05:30
Devansh 8c498dabea Bulk Delete Issue Fixed 2020-07-31 13:46:29 +05:30
vishal-webkul 14a4960ff0 issue-3313 update 2020-07-31 13:34:58 +05:30
Jitendra Singh 96e6d35760
Merge pull request #3609 from vishal-webkul/issue-3604
Issue #3604 fixed
2020-07-31 12:16:36 +05:30
Annika Wolff 22e77f31e2 Merge master 2020-07-31 08:25:29 +02:00
Annika Wolff 12f887b50e add events to BookingProductEventTicketRepository 2020-07-31 08:24:54 +02:00
vishal-webkul 3261867202 issue #3604 fixed 2020-07-31 11:10:27 +05:30
Devansh a99096392b Inactive Child Issue Fix 2020-07-31 10:59:05 +05:30
Devansh 4a3482b4d5 File Name Added 2020-07-31 10:00:57 +05:30
Devansh 77636d367f Message Added 2020-07-30 20:16:05 +05:30
Devansh 737c3eae77 Language Translation Added 2020-07-30 19:25:49 +05:30
Devansh 242445d818 Merge branch 'unable_to_download_files_while_comparing_products' of https://github.com/devansh-webkul/bagisto into unable_to_download_files_while_comparing_products
Merged
2020-07-30 18:36:38 +05:30
Devansh c9e4a99e76 Language Key Added 2020-07-30 18:35:23 +05:30
Devansh db972083de
Merge branch 'master' into unable_to_download_files_while_comparing_products 2020-07-30 18:22:31 +05:30
Devansh 0cac0a8ab8 Compare Product Download Issue Fixed 2020-07-30 18:11:56 +05:30
vishal-webkul 170b6c63e6 getting exception while using filter total column and applying other the equals to condition 2020-07-30 14:56:01 +05:30
vishal-webkul 729a7c966d fixed issue #3313 2020-07-30 13:36:20 +05:30
vishal-webkul 0f1aafe5ae
Merge branch 'master' into issue-3531 2020-07-30 13:02:44 +05:30
vishal-webkul ec89568bf6 fixed above mentioned issue 2020-07-30 12:57:51 +05:30
Devansh dfc346ec76 Order Issue Fixed 2020-07-30 12:40:15 +05:30
Jitendra Singh e6d11ed809
Merge pull request #3223 from Haendlerbund/admin-backend/keep-search-terms-after-new-page-load
Admin DataGrid: Keep search terms after page reload
2020-07-30 12:30:21 +05:30
Jitendra Singh f9438fef64
Merge pull request #3585 from vishal-webkul/issue-3469
Issue #3469 fixed
2020-07-30 11:50:57 +05:30
Jitendra Singh be3bb4690b
Merge pull request #3594 from vishal-webkul/issue-2971
Issue #2971 fixed
2020-07-30 11:36:15 +05:30
Jitendra Singh 594094b41e
Merge pull request #3601 from ghermans/3595
Fixed #3595
2020-07-30 11:12:47 +05:30
ghermans 43f0c79ec5 added admin url to testing env file 2020-07-29 23:38:38 +02:00
ghermans 5ed6fa5dc7 fixed route 2020-07-29 23:01:44 +02:00
ghermans f4b69964d2 Fixed leftover from #3595 2020-07-29 22:50:15 +02:00
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
Glenn Hermans c2c57a34ca
Merge pull request #28 from bagisto/master 2020-07-29 21:59:29 +02:00
Jitendra Singh 455c606a7c
Merge pull request #3598 from akhtarkhan1/patch4
cancel button position fixed #3521
2020-07-29 20:30:52 +05:30
Jitendra Singh 496b97c98a
Merge pull request #3599 from rahulcs0082/development
Issue #3591 fixed
2020-07-29 20:23:10 +05:30
rahulshukla-home 47df905950 Issue #3591 fixed 2020-07-29 20:11:33 +05:30
vishal-webkul c2679f9c8d resolve conflict problem 2020-07-29 20:10:19 +05:30
Glenn Hermans 5bcdcd60f2
Merge branch 'master' into master 2020-07-29 16:24:33 +02:00
Jitendra Singh 3634439e6d
Merge pull request #3566 from devansh-webkul/shipping_charge_is_not_getting_calculated_properly
Fixed shipping charge is not getting calculated properly #3546
2020-07-29 19:46:37 +05:30
Jitendra Singh 4724059229
Merge pull request #3597 from devansh-webkul/admin_name_enhancement
I would like like to change the admin route or url #3595
2020-07-29 19:43:07 +05:30
Akhtar Khan e587fe2448 Fixed issue 2020-07-29 19:37:02 +05:30
Devansh 32140a0e23 Some Enhancement 2020-07-29 19:06:43 +05:30
vishal-webkul 3995b2056d issue #3531 fixed 2020-07-29 19:03:10 +05:30
Glenn Hermans 52163fb78f Moved payment & shipping method 2020-07-29 14:31:59 +02:00
Devansh 724e823b99 Handled One Test Case 2020-07-29 17:44:48 +05:30
Glenn Hermans 3863ae7b72 fixed requested changes 2020-07-29 14:02:06 +02:00
Jitendra Singh e3bd4e71b5
Merge pull request #3216 from iateadonut/master
update product_flat table with values when changing attribue->use_in_…
2020-07-29 17:02:56 +05:30
vishal-webkul b81bb3580a add the default locale icon with each field which are support for multi-locale in the metadata #2971 2020-07-29 16:26:37 +05:30
Jitendra Singh 74153f813d
Merge pull request #3539 from akhtarkhan1/patch4
Fixed layout issue in order information in default theme at customer #3521
2020-07-29 15:38:58 +05:30
Jitendra Singh 85981c8ea9
Merge pull request #3592 from rahulcs0082/development
Development
2020-07-29 14:25:51 +05:30
rahulshukla-home 42334b1bc5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-29 14:15:24 +05:30
rahulshukla-home 0434f3bcd1 Issue #3580 fixed 2020-07-29 14:14:56 +05:30