merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,098 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

425 Commits

Author SHA1 Message Date
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Herbert Maschke 4833d9f8ec obey the default channel that has been set in config/app.php 2020-02-03 13:34:05 +01:00
Jitendra Singh 09a7cc949a
Merge pull request #2222 from jitendra-webkul/1.0 
Issue #2202 fixed
 2020-01-31 19:17:19 +05:30
Jitendra Singh 677cd7e542 Issue #2202 fixed 2020-01-31 19:16:45 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Annika Wolff ab9300bbef merged conflicting factory manually 2020-01-31 09:40:12 +01:00
Jitendra Singh d9d7c2bc40
Merge pull request #2215 from Haendlerbund/introduce-some-cart-factories 
add some factories
 2020-01-31 12:35:25 +05:30
Herbert Maschke 4d28188efb move factories into appropriate packages and remove redundant ones 2020-01-31 05:42:13 +01:00
Florian Bosdorff 389b40fdce Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid 2020-01-30 16:04:57 +01:00
rahul shukla 40e85523a1 Issue #2185 2020-01-29 16:46:10 +05:30
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +01:00
Steffen Mahler 14c0276fce update cart button is not shown, when only products without quantity box are in cart, tests added 2020-01-28 15:38:07 +01:00
rahul shukla c69f19701f Issue #2185 2020-01-28 18:51:13 +05:30
Jitendra Singh dae09859f3
Merge pull request #2172 from jitendra-webkul/1.0 
Issue #2162 fixed
 2020-01-28 15:16:43 +05:30
Jitendra Singh fec990a149 Issue #2162 fixed 2020-01-28 15:15:36 +05:30
Florian Bosdorff d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
Steffen Mahler 223c96b205 . 2020-01-27 13:06:31 +01:00
Jitendra Singh 3e2e6f2c75
Merge pull request #2156 from jitendra-webkul/1.0 
Issue #2087 fixed
 2020-01-27 16:42:01 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
Jitendra Singh 3a69b97bd2
Merge pull request #2151 from rahulshukla-webkul/development 
Development
 2020-01-27 13:35:08 +05:30
rahul shukla 41ae3048ff Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-27 13:24:37 +05:30
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
Jitendra Singh 3a2fb2c03a Issue #2054 fixed 2020-01-27 13:10:30 +05:30
Jitendra Singh edf5dc34fd Issue #2146 fixed 2020-01-27 12:38:13 +05:30
Jitendra Singh f4ee571dc7
Merge pull request #2127 from Haendlerbund/basic-backend-tests 
add basic backend tests
 2020-01-24 18:50:50 +05:30
Jitendra Singh eec113ad80 Resolve conflict 2020-01-24 16:48:30 +05:30
Jitendra Singh 195a37fea3 Issue #1779 fixed 2020-01-24 16:44:45 +05:30
MonaHartdegen 4c56a8de4f removed redundant use statement from ProductServiceProvider 2020-01-24 10:28:05 +01:00
MonaHartdegen ccc2188ef1 merge bagisto master 2020-01-24 10:22:15 +01:00
rahul shukla e71d0035fe condtion added for bundle product while adding cart 2020-01-24 11:54:47 +05:30
Florian Bosdorff db00689a5c add basic backend tests 2020-01-23 13:11:47 +01:00
MonaHartdegen 806e3f93db added ProductsIndexCest; added factories 2020-01-23 08:33:47 +01:00
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
rahul shukla 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 6b3415f0e8
Merge pull request #2076 from jitendra-webkul/1.0 
Issue #2074 fixed
 2020-01-20 15:27:59 +05:30
Jitendra Singh 7e14737f8c Issue #2074 fixed 2020-01-20 15:26:31 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Annika Wolff 976d19cd74
Merge Bagisto master into Haendlerbund/Bagisto master (#14) 
* added bagisto:install command

* updates for uploading attachments

* Issue #1808

* Issue #1779 fixed

* Issue #2045

* Issue #1971

* Issue #1779 fixed

* fire event on creating/updating slider

* Issue #1863 fixed

* Issue #1863 fixed

* Removed ')' in page edit blade

* Issue #2054 fixed

* Issue #2054 fixed

* Added mail from name field in .env.example file, Issue #2051

Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
 2020-01-16 13:54:18 +01:00
Jitendra Singh d931571c35
Merge pull request #2061 from jitendra-webkul/1.0 
Issue #2054 fixed
 2020-01-15 19:03:59 +05:30
Jitendra Singh 9e5fc5bf1e Issue #2054 fixed 2020-01-15 19:03:07 +05:30
Jitendra Singh 6fb3f78f2d
Merge pull request #2052 from jitendra-webkul/1.0 
Issue #1779 fixed
 2020-01-14 19:10:30 +05:30
Jitendra Singh dd1ca9336b Issue #1779 fixed 2020-01-14 19:09:59 +05:30
Jitendra Singh 0e2b8163e6
Merge pull request #2047 from jitendra-webkul/1.0 
Issue #1779 fixed
 2020-01-14 13:24:26 +05:30
Jitendra Singh 05a619d39b Issue #1779 fixed 2020-01-14 13:23:49 +05:30
Jitendra Singh 939895cb88
Merge pull request #2041 from jitendra-webkul/1.0 
Issue #1760 fixed
 2020-01-13 18:51:37 +05:30
Jitendra Singh c435b6c121 Issue #1760 fixed 2020-01-13 18:50:36 +05:30
Jitendra Singh 9eb107a87f
Merge pull request #2039 from jitendra-webkul/1.0 
Issue #1795 fixed
 2020-01-13 13:44:37 +05:30
Jitendra Singh 122debdf1b Issue #1795 fixed 2020-01-13 13:43:53 +05:30