Commit Graph

292 Commits

Author SHA1 Message Date
prateek srivastava d29b0a69a5 fixed conflict 2021-02-04 16:31:22 +05:30
devansh bawari 5640880c1a Space Issue Fixed 2021-02-04 10:40:14 +05:30
Vivek a489e1a926 [Updated: Duplicate queries removed.] 2021-02-01 19:01:08 +05:30
devansh bawari 2d0c8562d8 Merge branch 'master' into vul-issue 2021-01-14 21:00:01 +05:30
prateek srivastava d94f786efb Merge branch 'master' of https://github.com/bagisto/bagisto 2021-01-06 15:48:15 +05:30
Glenn Hermans fd08d1786f
Merge pull request #4426 from devansh-webkul/issue-4423
Fixed quantity box position in RTL #4423
2021-01-05 12:49:31 +01:00
Jitendra Singh b14a16be06
Merge pull request #4429 from jitendra-webkul/master
Email marketing added
2021-01-05 11:50:53 +05:30
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +05:30
devansh bawari b392eec9cf Name Issue Fixed 2021-01-04 19:48:01 +05:30
prateek srivastava 5935fbf28c product Image helper removed 2021-01-04 17:44:33 +05:30
prateek srivastava b57bcdc39e product video facade added 2021-01-04 16:38:38 +05:30
prateek srivastava 7157318d18 product image facade added 2021-01-04 13:57:45 +05:30
devansh bawari 2b2ff45614 Some Publishables That Came With Package 2021-01-04 12:37:18 +05:30
devansh bawari 2e27be566d Merge branch 'master' into new-published-files
Merged with master.
2020-11-26 14:38:44 +05:30
jitendra 711beb1786 Added Bagisto Debugbar 2020-11-24 17:48:37 +05:30
devansh bawari 7c182f0aa4 New Published According To Composer JSON 2020-11-19 17:40:43 +05:30
devansh bawari c1ed893bdf Barry Debugger Dependency Set 2020-11-04 14:40:00 +05:30
devansh bawari 0cea670a06 Fixed RTL Issue 2020-10-16 11:50:05 +05:30
devansh bawari 724774c1bc Isue Fixed 2020-10-09 19:58:55 +05:30
Jitendra Singh a7fe0f78a6
Merge pull request #3853 from Haendlerbund/global-callable-for-saleable
ability to globally set a callable for isSaleable
2020-10-01 16:36:55 +05:30
jitendra 4292a400e0 Issue #3964 fixed 2020-09-24 14:59:48 +05:30
Jitendra Singh a141db55fc
Merge pull request #3918 from Haendlerbund/sql-query-improvements
introduce CachableInterface for some Repositories (prettus)
2020-09-23 17:34:44 +05:30
Devansh 11190d3994 🙂 Extended Default Config 2020-09-10 16:21:30 +05:30
Devansh 284f788416 Fixed Migration Path Issue 2020-09-09 13:00:26 +05:30
Herbert Maschke d5e1efc8aa more CacheableInterface's 2020-09-09 08:28:29 +02:00
Herbert Maschke 363caf748c introduce CachableInterface for some Repositories (prettus) 2020-09-09 08:08:07 +02:00
jitendra 15d4123df9 Issue #3905 fixed 2020-09-07 20:00:57 +05:30
Herbert Maschke cb32fe31bf ability to globally set a callable for isSaleable 2020-09-01 07:59:00 +02:00
Devansh fdd6881076 Env Validator Added 2020-08-25 17:21:20 +05:30
jitendra 40357f57c9 Removed dev dependencies from require in composer.json 2020-08-12 13:51:12 +05:30
Herbert Maschke c4fdf11633 Merge branch 'bagisto/master' into introduce-product-copy 2020-08-10 17:43:31 +02:00
Herbert Maschke 3aeb0c75df ability to define if a product type can be copied in AbstractType.php 2020-08-10 17:24:36 +02:00
jitendra 9c0ec6f644 Support multi admin theme 2020-08-10 19:25:51 +05:30
Jitendra Singh c4abe9cad3
Revert "Multi theme system now supported in admin" 2020-08-10 19:07:32 +05:30
jitendra 37e7c4c834 Merged with master 2020-08-10 19:02:15 +05:30
jitendra 44181411bd Multi theme system now supported in admin 2020-08-10 19:00:31 +05:30
Herbert Maschke 3670a6210b introduce ability to make original and copy be linked to each other 2020-08-10 09:31:56 +02:00
Herbert Maschke 96e6c56375 doc improvements 2020-08-07 21:48:13 +02:00
Herbert Maschke 80d2cda443 add ability to skip product attributes when doing a copy 2020-08-03 13:32:26 +02:00
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
jitendra 2adb5f26d3 Added blade file hint feature for frontend 2020-07-13 21:44:56 +05:30
jitendra fa05bc8f0a Issue #3425 fixed 2020-07-06 13:22:46 +05:30
jitendra 03b6f679bf Remove defaul scout driver from scout config 2020-07-02 17:15:27 +05:30
jitendra 75a40efccd Remove defaul scout driver from scout config 2020-07-02 17:09:51 +05:30
jitendra e5f90b92d0 Added support for search with algolia and elasticsearch 2020-07-02 17:00:21 +05:30
Pranshu Tomar 4681205f17 Social login completed 2020-06-26 19:09:53 +05:30
Pranshu Tomar c9d59c6f38 Issue #3254 fixed 2020-06-17 12:44:18 +05:30
Pranshu Tomar 5b398574ae Migrate to laravel 7 2020-06-09 12:54:46 +05:30
Pranshu Tomar 10c31e27ad Updated change log file 2020-04-28 18:59:18 +05:30
Pranshu Tomar b3b20a904c Auto exchange rate feature added 2020-04-27 19:57:13 +05:30
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