Commit Graph

192 Commits

Author SHA1 Message Date
Jitendra Singh 792720354f Version updated 2020-03-19 19:04:33 +05:30
Vivek 1572075443 [Updated: worked on conflict.] 2020-03-16 11:10:07 +05:30
Vivek c9062abd1f [Updated: resolved config/concord.php conflict.] 2020-03-16 11:02:51 +05:30
Vivek fcbaec6676 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:58:27 +05:30
Vivek 5c11e05893 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:57:20 +05:30
Vivek aea33cfc68 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:48:01 +05:30
Jitendra Singh 557e619bdc Issues #2634, #2635 fixed 2020-03-13 12:52:26 +05:30
Vivek Sharma ffd918af20 [Updated: Changed Velocity's models related code.] 2020-03-07 11:43:22 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
ghermans 3365924529 #2525 updated config file 2020-02-25 03:30:13 +01:00
ghermans bb9c90d0a2 #2525 Added locale, timezone and currency 2020-02-25 03:29:33 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Jitendra Singh fa53b72058 Booking product type added 2020-02-14 11:40:12 +05:30
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler dd8f653df4 minor improvements 2020-02-04 14:48:15 +01:00
Steffen Mahler 01010db842 set default_country to null, add fallback for test 2020-02-04 14:38:52 +01:00
Steffen Mahler 763ccf3af9 set default_country to EN 2020-02-04 14:33:25 +01:00
Steffen Mahler 8abce3302a tax helper introduced, views changed to display multiple tax rates 2020-01-31 16:08:01 +01:00
shubhammehrotra.symfony@webkul.com d23d3b4f8c search in particular category 2020-01-29 17:33:28 +05:30
shubhammehrotra.symfony@webkul.com 1b368789e5 bagisto velocity theme updates 2020-01-26 14:17:05 +05:30
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
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
2020-01-21 16:34:38 +05:30
rahul shukla 4f1e20d23c conflict resolve 2020-01-21 15:28:16 +05:30
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
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 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 3fd0a04dde
Merge pull request #2025 from jitendra-webkul/1.0
Issue #1820 fixed
2020-01-10 15:52:03 +05:30
Jitendra Singh 0f52762c3c Issue #1820 fixed 2020-01-10 15:50:39 +05:30
Jitendra Singh 3a52d63ac9
Merge pull request #1985 from rabol/master
Make it possible to specify timezone in .env
2020-01-10 13:32:30 +05:30
Jitendra Singh 14869df230 Issue #1979 fixexd 2020-01-09 17:03:58 +05:30
shubhammehrotra.symfony@webkul.com 242446627b merged with original 2020-01-07 13:10:34 +05:30
shubhammehrotra.symfony@webkul.com 408c9af744 updates 2019-12-30 20:18:35 +05:30
rabol 0abc5ec43e Make it possible to specify currency in .env 2019-12-28 11:22:41 +01:00
rabol a63c2f9fd8 Make it possible to specify timezone in .env 2019-12-28 10:38:54 +01:00
shubhammehrotra.symfony@webkul.com fe43e6535d sidebar updates 2019-12-27 09:43:59 +05:30
shubhammehrotra.symfony@webkul.com 113c5753d7 velocity initial 2019-12-26 18:05:21 +05:30
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
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 c26bf6c820
Merge pull request #1701 from MattApril/env-fix
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
Herbert Maschke ebcc66ab59 remove alkhachatryan/laravel-web-console 2019-11-25 08:02:55 +01:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
Matt April 54babf9079 Moved ADMIN_MAIL_TO into mail config 2019-10-26 11:07:41 -04:00
jitendra 937fda187f Issue #1620, #1671 fixed 2019-10-22 17:38:35 +05:30