Commit Graph

116 Commits

Author SHA1 Message Date
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30
shubhammehrotra.symfony@webkul.com 3f377c929e Merge branch 'master' of https://github.com/bagisto/bagisto into velocity 2020-01-24 18:52:45 +05:30
rahul shukla 15aca03e54 codeception/module-laravel5 2020-01-22 19:16:47 +05:30
rahul shukla 0a0a86bf46 codeception/module-filesystem 2020-01-22 19:12:46 +05:30
rahul shukla 4e03cd81d3 codeception/module-asserts 2020-01-22 18:59:39 +05:30
rahul shukla 01f0fc9a57 2089 and updated codeception dependencies 2020-01-22 18:44:53 +05:30
Jitendra Singh 3046aa617b PHP version updated in composer.json 2020-01-21 17:02:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
shubhammehrotra.symfony@webkul.com 81d9d34acc velocity-configuration-added 2020-01-16 13:22:18 +05:30
shubhammehrotra.symfony@webkul.com 7c1bd634f2 remove velocity 2020-01-16 13:09:33 +05:30
shubhammehrotra.symfony@webkul.com 485fbcb1c5 Merge branch 'velocity' of github.com:shubhwebkul/bagisto into velocity 2020-01-16 13:05:55 +05:30
Jitendra Singh 0f52762c3c Issue #1820 fixed 2020-01-10 15:50:39 +05:30
shubhammehrotra.symfony@webkul.com eb880441f6 resolved conflits 2020-01-07 13:10:48 +05:30
shubhammehrotra.symfony@webkul.com 242446627b merged with original 2020-01-07 13:10:34 +05:30
Jitendra Singh d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
MonaHartdegen d52ef533c7 replace wildcard route for products and categories with fallback route 2020-01-03 13:09:06 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
shubhammehrotra.symfony@webkul.com 113c5753d7 velocity initial 2019-12-26 18:05:21 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
Jitendra Singh 9486f00987
Merge pull request #1789 from bosix/1754-add-codeception
#1745 - add codeception and example tests
2019-12-13 15:30:51 +05:30
Florian Bosdorff 745153a8cb add migrate:fresh before running tests 2019-12-10 07:22:05 +01:00
Jitendra Singh 1048cbc5c9
Merge pull request #1791 from thyseus/remove-alkhachatryan/laravel-web-console
remove alkhachatryan/laravel-web-console
2019-12-03 14:43:19 +05:30
Florian Bosdorff 945bbd71cc
Merge branch 'master' into 1754-add-codeception 2019-11-25 16:34:30 +01:00
shubhammehrotra.symfony@webkul.com c22e8f7c9c Bagisto content added using post create-project event 2019-11-25 14:59:51 +05:30
Herbert Maschke ebcc66ab59 remove alkhachatryan/laravel-web-console 2019-11-25 08:02:55 +01:00
Florian Bosdorff e416aef618 add codeception and example tests 2019-11-23 23:05:38 +01:00
Alexey 988e21bfa7 Changed back the package name in the compsoer 2019-11-13 01:31:31 +04:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
Prashant Singh a9bb0ca129 merge sync 2019-09-24 11:59:02 +05:30
rahul shukla 58331043e9 translatable package update 2019-09-20 14:49:53 +05:30
Prashant Singh 32b05c924d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 16:29:43 +05:30
Prashant Singh ec6dd75dfe JWTAuth package's dependency is now version restricted 2019-09-05 16:28:36 +05:30
Jitendra Singh c4de6548dd
Merge pull request #1396 from ghermans/dusk
fixed #1367
2019-09-05 16:25:56 +05:30
Glenn Hermans b3eb0b3f88
fixed #1367 2019-09-05 12:12:45 +02:00
Prashant Singh 70f3cf6219 Development branches removed from composer dependencies 2019-09-05 13:23:33 +05:30
Prashant Singh 6693a443d3 Removed latest flag check from prettus l5 repository 2019-09-04 14:00:45 +05:30
Prashant Singh 0468a1fdd6 Changes in core repository made 2019-09-04 13:36:34 +05:30
Prashant Singh 0e51a9eab2 Changed minimum php version to 7.2 2019-09-04 11:39:20 +05:30
Prashant Singh f1f0bcac8c Dead mods removed 2019-09-03 12:24:20 +05:30
Prashant Singh 108795778b Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-02 19:53:25 +05:30
Glenn Hermans 2619623a24
Possible fix for #1367 2019-08-30 10:39:55 +02:00
Prashant Singh 0c79d87503 Removed stripe fees visibility from every where 2019-08-23 13:15:10 +05:30
Prashant Singh b62b277cac Integrated GTM 2019-08-23 08:56:25 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Prashant Singh 9b0c3456e5 Modules preorder, customer document and group catalog updated 2019-07-30 16:22:27 +05:30
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
Prashant Singh f8c774b3a5 Started with convert x to product id for cart rules 2019-07-13 15:23:27 +05:30