Commit Graph

3433 Commits

Author SHA1 Message Date
rahul shukla b6493a590b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-16 18:56:37 +05:30
rahul shukla 2f8e319fb0 Issue #1232, default item in perpage and label of perpage 2019-12-16 18:56:02 +05:30
Jitendra Singh 54c06a94b1
Merge pull request #1894 from Haendlerbund/move-test
move tests/OrderRepositoryCest.php
2019-12-16 15:08:27 +05:30
David Große b679f543db move tests/OrderRepositoryCest.php into brand new shiny fancy codeception tests/ folder 2019-12-13 14:10:44 +01:00
Jitendra Singh 3dc905331b
Merge pull request #1892 from rahulshukla-webkul/development
Issue #1877
2019-12-13 17:19:12 +05:30
rahul shukla 2d1afb988a Issue #1877 2019-12-13 17:12:03 +05:30
Jitendra Singh 94cfc5a9d5
Merge pull request #1891 from rahulshukla-webkul/development
Issue #1848
2019-12-13 17:08:07 +05:30
rahul shukla 6af302fa95 Issue #1848 2019-12-13 17:06:32 +05:30
Jitendra Singh 70db4ef8c5
Merge pull request #1886 from Haendlerbund/slacken-condition-to-save-downloadable-purchased-link
slackened condition to save downloadable purchase link
2019-12-13 15:44:27 +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
Jitendra Singh 9f5c82068e
Merge pull request #1889 from rahulshukla-webkul/development
Issue #1808
2019-12-13 14:39:54 +05:30
rahul shukla 84feb1760f Issue #1232, option to select the number of data to be shown per pages for all data grids 2019-12-13 14:34:32 +05:30
rahul shukla dc890cedc7 Issue #1270 2019-12-13 10:56:38 +05:30
rahul shukla dade205e81 Issue #1808 2019-12-12 20:10:12 +05:30
Jitendra Singh 88963dc1cf
Merge pull request #1888 from rahulshukla-webkul/development
Issue #1821, price at review page
2019-12-12 19:46:52 +05:30
rahul shukla 7321a2fc74 Issue #1821, price at review page 2019-12-12 19:44:54 +05:30
Jitendra Singh e750145403
Merge pull request #1887 from rahulshukla-webkul/development
Issue #1844, Mass Action Crashes the system
2019-12-12 19:07:49 +05:30
rahul shukla 1125bac079 Issue #1844, Mass Action Crashes the system 2019-12-12 19:04:54 +05:30
Jitendra Singh 0b0e8aadbe
Merge pull request #1885 from Haendlerbund/remove-laravel-web-console-completely
Removed remnants of laravel-web-console
2019-12-12 18:37:14 +05:30
Annika Wolff 85d3c2b64a slackened condition to save downloadable purchase link 2019-12-12 13:39:33 +01:00
MonaHartdegen 2feb9114bd removed remnants of laravel-web-console from development view and language files 2019-12-12 13:23:52 +01:00
Jitendra Singh feb2ee0ad1
Merge pull request #1884 from rahulshukla-webkul/development
Issue #1463
2019-12-12 17:23:31 +05:30
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
Jitendra Singh 2a6ba89999
Merge pull request #1774 from rahulshukla-webkul/development
completed step chaneges in checkout page
2019-12-12 16:28:29 +05:30
rahul shukla b67b389d91 Issue #1594, export information limit by search 2019-12-12 16:26:52 +05:30
rahul shukla e8f0802b9f Issue #1878 2019-12-12 15:23:30 +05:30
rahul shukla c6553ed238 conflict resolve 2019-12-12 14:20:17 +05:30
Jitendra Singh 9e30025575
Merge pull request #1853 from naresh-webkul/master
resolve table prefix issue
2019-12-12 13:49:46 +05:30
rahul shukla b612b9b5a0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-11 15:25:37 +05:30
rahul shukla dbf404d13f Issue #1787 2019-12-11 15:25:19 +05:30
Florian Bosdorff 745153a8cb add migrate:fresh before running tests 2019-12-10 07:22:05 +01:00
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
Jitendra Singh 3eb7d862b1
Merge pull request #1798 from Haendlerbund/configurables-with-varying-variant-types-PR-1782
Configurables with varying variant types - Enhancement
2019-12-04 18:58:59 +05:30
Jitendra Singh 1b026bc913
Merge pull request #1826 from Haendlerbund/18062-feature/improve-sluggable-logic
improve sluggable logic
2019-12-03 17:50:56 +05:30
David Große 9e6b983eb4 add some code documentation to directives/slugify.vue 2019-12-03 11:14:35 +01:00
Herbert Maschke 3efe3a7f61 improve generation of slugs 2019-12-03 11:14:30 +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
Jitendra Singh 2fffe68c99
Merge pull request #1818 from dirk-helbert/locale-fallback
Take the fallback_locale from app.config when locale is not defined i…
2019-12-03 14:42:34 +05:30
Jitendra Singh b7b3441607
Merge pull request #1775 from thyseus/introduce-order-item-events
introduce 'checkout.order.orderitem.save.[before/after]' events
2019-12-03 14:39:11 +05:30
Dirk Helbert 02ca34affa Take the fallback_locale from app.config when locale is not defined in shop 2019-12-01 22:59:16 +01:00
Jitendra Singh 3c9995f5bb
Merge pull request #1811 from shubhwebkul/master
template correction
2019-11-30 08:25:43 +05:30
shubhammehrotra.symfony@webkul.com 26b85fca06 template correction 2019-11-29 19:03:30 +05:30
Annika Wolff 406c32012d add check if property is set 2019-11-27 09:53:11 +01:00
rahul shukla 8948aeaea7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-11-26 18:33:01 +05:30
Annika Wolff 2d23123660 adapt to code standard 2019-11-26 13:45:02 +01:00
Annika Wolff d29b8332e1 undo something stupid when merging branch into recent bagisto master 2019-11-26 13:41:04 +01:00
Annika Wolff 71e8e687c2 PR 1782 Enhancement: Let variants be of other types than simple 2019-11-26 13:32:42 +01:00
rahul shukla 79d9a1d9b3 dtabase prefix added in raw query 2019-11-26 16:06:22 +05:30
Florian Bosdorff 945bbd71cc
Merge branch 'master' into 1754-add-codeception 2019-11-25 16:34:30 +01:00
Jitendra Singh 58bad6fbed
Merge pull request #1793 from shubhwebkul/master
Bagisto text and Indentation
2019-11-25 15:04:59 +05:30