Commit Graph

8690 Commits

Author SHA1 Message Date
Devansh 9b4772c4e3
Merge branch 'bagisto:master' into out-of-stock-issue 2021-06-29 18:03:36 +05:30
Jitendra Singh 733d4b01f9
Merge pull request #4983 from bagisto/dependabot/composer/league/flysystem-1.1.4
Bump league/flysystem from 1.1.3 to 1.1.4
2021-06-29 17:55:03 +05:30
dependabot[bot] 6f0b516532
Bump league/flysystem from 1.1.3 to 1.1.4
Bumps [league/flysystem](https://github.com/thephpleague/flysystem) from 1.1.3 to 1.1.4.
- [Release notes](https://github.com/thephpleague/flysystem/releases)
- [Changelog](https://github.com/thephpleague/flysystem/blob/2.x/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/flysystem/compare/1.1.3...1.1.4)

---
updated-dependencies:
- dependency-name: league/flysystem
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-29 11:58:39 +00:00
devansh bawari 340d9946e6 Merge branch 'master' into out-of-stock-issue 2021-06-29 14:29:50 +05:30
Jitendra Singh b847d73f48
Merge pull request #4982 from devansh-webkul/exception-improvement
Debug Check Added In Exceptions
2021-06-29 14:26:40 +05:30
devansh bawari af78f2bf71 Debug Check Added 2021-06-29 14:02:46 +05:30
devansh bawari 084873cf7d Comments Updated 2021-06-29 13:04:47 +05:30
devansh bawari 41cbbed644 Out Of Stock Fixed 2021-06-29 12:22:15 +05:30
Glenn Hermans 63b5c53cba
Merge pull request #4973 from bagisto-europe/refunds
fixed #4971
2021-06-28 18:04:40 +02:00
Glenn Hermans da82837bf6
Merge pull request #4961 from devansh-webkul/conf-merge-issue
Configurable Merge Issue Fixed #4959
2021-06-28 12:42:05 +02:00
Glenn Hermans f1570f7144
Merge pull request #4975 from devansh-webkul/french-translations
French Translations Added #4963
2021-06-28 12:35:01 +02:00
devansh bawari 7ac07f4eee Translations Added To Velocity Theme 2021-06-28 14:24:33 +05:30
devansh bawari d701d121fc Translations Added For Shop Package 2021-06-28 14:14:10 +05:30
devansh bawari 32b3c845c9 French Translation Added To Admin Package 2021-06-28 13:35:02 +05:30
Glenn Hermans f80a3d68ab
fixed #4971 2021-06-26 04:08:10 +02:00
Glenn Hermans 7368743c16
Merge pull request #17 from bagisto-europe/master
Update branch
2021-06-26 04:05:57 +02:00
Glenn Hermans e22d584048
Merge pull request #16 from bagisto/master
Update fork
2021-06-26 04:05:13 +02:00
Glenn Hermans 9c25af6395
Merge pull request #4968 from devansh-webkul/datagrid-lang-issue
Datagrid Language Issue Fixed #4965
2021-06-26 03:11:42 +02:00
Glenn Hermans 9544df3c12
Merge pull request #4966 from devansh-webkul/downloadable-link
Downloadable Links Moved To Private Disk #4962
2021-06-26 03:11:32 +02:00
Glenn Hermans 463c5200ad
Merge pull request #15 from bagisto/master
Update fork
2021-06-25 18:42:59 +02:00
Glenn Hermans aea6560f44
Merge pull request #4958 from devansh-webkul/payment-term
Added Payment Terms #4927
2021-06-25 18:39:46 +02:00
devansh bawari f7b145b21a Merge branch 'master' into downloadable-link 2021-06-25 19:54:18 +05:30
devansh bawari bd3312d6d0 Merge branch 'master' into conf-merge-issue 2021-06-25 19:53:44 +05:30
devansh bawari 53c681b931 Merge branch 'master' into datagrid-lang-issue 2021-06-25 19:53:14 +05:30
devansh bawari ed2eeef482 Confliction Resolved 2021-06-25 19:50:58 +05:30
Glenn Hermans 92c402ceeb
Merge pull request #4956 from devansh-webkul/invoice-number
Enhancement completed for ability for admin to set an invoice prefix #4926
2021-06-25 15:40:45 +02:00
devansh bawari b4002774c6 Some More Fixes 2021-06-25 11:05:46 +05:30
devansh bawari 75ce0f8209 Merge branch 'master' into datagrid-lang-issue 2021-06-25 10:03:14 +05:30
devansh bawari 5ebe626f6d Merge branch 'master' into conf-merge-issue 2021-06-25 10:02:41 +05:30
devansh bawari 6787b8135f Merge branch 'master' into downloadable-link 2021-06-25 09:59:43 +05:30
devansh bawari 4b2553c455 Merged With Master. Resolved Confliction. 2021-06-25 09:43:12 +05:30
Glenn Hermans 122031a159
Merge pull request #4967 from devansh-webkul/ui-issue
Search Icon Added #4964
2021-06-24 18:25:50 +02:00
Glenn Hermans bcd9949b77
Merge pull request #4953 from devansh-webkul/velocity-header-count
Fixed realtime compare number which is not decreased when deleting product from compare page #4951
2021-06-24 18:11:59 +02:00
Glenn Hermans 117a991ccf
Merge pull request #4944 from bagisto-europe/invoice-state
fixed #3453
2021-06-24 18:10:59 +02:00
devansh bawari c3d0016ebe Translation Added In New Theme Also 2021-06-24 20:01:05 +05:30
devansh bawari 2b4c6c6455 Translation To Old Datagrid Added 2021-06-24 19:32:25 +05:30
devansh bawari eae0dba864 Lang Added 2021-06-24 19:31:54 +05:30
devansh bawari c3d848b597 Search Icon Added 2021-06-24 18:25:54 +05:30
devansh bawari a38f90ee19 Removed URL Key. As Not Needed. 2021-06-24 15:54:14 +05:30
devansh bawari 55ffb9908d Git Ignore Updated 2021-06-24 15:44:57 +05:30
devansh bawari da7cb3a16b Private Disk Added 2021-06-24 15:44:26 +05:30
devansh bawari 0958d9bdb7 Invoice Date Added #4960 2021-06-24 11:33:32 +05:30
devansh bawari 2b1918b830 Configurable Merge Issue Fixed 2021-06-24 10:21:19 +05:30
Glenn Hermans 980213de6e
fixed datagrid 2021-06-23 17:00:44 +02:00
devansh bawari 86bc2528c9 Merge branch 'master' into payment-term 2021-06-23 19:15:40 +05:30
devansh bawari 56654e1c20 Merge branch 'master' into invoice-number 2021-06-23 19:05:10 +05:30
devansh bawari b61e32fb9a Merge branch 'master' into velocity-header-count 2021-06-23 19:04:42 +05:30
Glenn Hermans 20cd22fd1b
Merge pull request #4940 from devansh-webkul/default-variant-enhancement
Default Variant Enhancement Completed #4911
2021-06-23 14:54:22 +02:00
devansh bawari 01c198b919 Shop Translations Added 2021-06-23 13:31:42 +05:30
devansh bawari cbe3b84bb8 Admin Translations Added 2021-06-23 13:25:29 +05:30