Commit Graph

5393 Commits

Author SHA1 Message Date
rahulshukla-home e52cba981f Issue #3021 2020-05-27 22:09:17 +05:30
rahulshukla-home b8417ff7d3 Issue #2804 2020-05-27 19:07:30 +05:30
rahulshukla-home 9963c87bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-27 18:37:06 +05:30
rahulshukla-home 2c002a0f8a Issue #2729 2020-05-27 18:36:52 +05:30
Jitendra Singh b254736bd5
Merge pull request #3123 from shubhwebkul/master
Issue #1522 resolved
2020-05-27 16:23:20 +05:30
Jitendra Singh 23fd60cf2b
Merge pull request #3121 from Haendlerbund/copy-cart-rules
introduce the ability to copy a cart rule
2020-05-27 16:22:54 +05:30
Jitendra Singh 21eb34c64b
Merge pull request #3027 from Haendlerbund/bugfix-save-booking-products
#3026 fixed
2020-05-27 16:21:41 +05:30
Jitendra Singh 8e3be0c692 Merge pull request #3109 from Haendlerbund/add-field-company-name-to-views
add field company_name to views
2020-05-27 15:04:18 +05:30
Jitendra Singh 40c536e582
Merge pull request #3110 from HansSchouten/patch-1
Add dutch laravel translations
2020-05-27 15:04:02 +05:30
Shubham Mehrotra 9eb14326c4 #1522 2020-05-27 13:03:10 +05:30
Jitendra Singh c5cb04febf
Merge pull request #3112 from rahulcs0082/development
Development
2020-05-27 10:31:26 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Jitendra Singh 26b4ff0ee0
Merge pull request #3117 from Haendlerbund/align-cart-rule-filter
adjust cart rule filter position a few pixels
2020-05-25 14:46:25 +05:30
Herbert Maschke 11fb120b51 adjust cart rule filter position a few pixels to align it as it is in products/index.blade.php 2020-05-25 08:31:12 +02:00
Annika Wolff 8a51417425 revert changes 2020-05-22 12:12:40 +02:00
Annika Wolff 5363b5645f revert changes 2020-05-22 12:09:19 +02:00
Steffen Mahler 5a7ec123c7 fix typo 2020-05-22 12:02:33 +02:00
Annika Wolff f42974f9e8 revert changes, add flag to config 2020-05-22 11:50:17 +02:00
Steffen Mahler 764df61509 trigger pipeline again 2020-05-22 09:57:34 +02:00
rahulshukla-home a500fa9074 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-22 13:13:10 +05:30
rahulshukla-home 01884e09c0 Issue #3089 fixed 2020-05-22 13:12:36 +05:30
Hans Schouten b24b169d4d Add dutch pagination, password and validation translations 2020-05-22 08:59:49 +02:00
Hans Schouten 70dd3d9054
Add dutch auth.php 2020-05-22 08:53:17 +02:00
Steffen Mahler d664c92d30 trigger pipeline 2020-05-22 08:52:03 +02:00
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Jitendra Singh 3568e0d316
Merge pull request #3106 from bagisto/1.0
Install command updated
2020-05-21 15:34:47 +05:30
Pranshu Tomar 33e118c581 Install command updated 2020-05-21 15:19:49 +05:30
Jitendra Singh 8074168daa
Merge pull request #3105 from Haendlerbund/show-company-name-in-order-details-view
add field company_name to bliss views
2020-05-21 11:57:44 +05:30
Jitendra Singh e0940edbb4
Merge pull request #3104 from shubhwebkul/patch-2
Issue #3041 resolved
2020-05-21 11:56:52 +05:30
Jitendra Singh 718a38ff02
Merge pull request #3103 from shubhwebkul/patch-1
Issue #2997 resolved
2020-05-21 11:56:33 +05:30
Jitendra Singh cce9167669
Merge pull request #3102 from rahulcs0082/development
Issue #3067 fixed
2020-05-21 11:56:12 +05:30
Steffen Mahler d0d6f2b046 add field company_name to bliss views 2020-05-20 17:44:03 +02:00
Shubham Mehrotra 0607b15b3f #3041 2020-05-20 19:52:00 +05:30
Shubham Mehrotra 40bbad93b3 remove irrelevant code 2020-05-20 18:27:07 +05:30
Shubham Mehrotra 47ae40d6b1 #2997 2020-05-20 18:24:33 +05:30
rahulshukla-home 4cf8b7cddb Issue #3089 2020-05-20 17:15:10 +05:30
rahulshukla-home 17ae225444 Issue #3067 fixed 2020-05-20 16:19:25 +05:30
Jitendra Singh 4842eb4de6
Merge pull request #3101 from shubhwebkul/patch-2
Issue #3096 resolved
2020-05-20 14:53:46 +05:30
Jitendra Singh 34ff163c06
Merge pull request #3100 from shubhwebkul/patch-1
Issue #3097 resolved
2020-05-20 14:53:11 +05:30
Shubham Mehrotra 7aa860d173 #3096 2020-05-20 13:32:34 +05:30
Shubham Mehrotra 646e4b6241 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-05-20 12:47:44 +05:30
Shubham Mehrotra 2fdd75ab92 #3097 2020-05-20 12:47:26 +05:30
Jitendra Singh 02faf5e610
Merge pull request #3098 from rahulcs0082/development
Issue #3095  fixed.
2020-05-20 12:25:09 +05:30
Jitendra Singh f3a0779473
Merge pull request #3099 from bagisto/1.0
Issue #3095 fixed
2020-05-20 12:24:24 +05:30
Pranshu Tomar b335321c45 Resolve conflicts 2020-05-20 12:22:31 +05:30
Pranshu Tomar 1dc4afc4ee Issue #3095 fixed 2020-05-20 12:21:16 +05:30
rahulshukla-home 15592aa8b1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-20 12:15:36 +05:30
rahulshukla-home 07db69b2f6 Issue #3095 2020-05-20 12:15:19 +05:30
Jitendra Singh 4ef9e3b683
Merge pull request #3094 from rahulcs0082/development
Issue #3073
2020-05-19 19:20:11 +05:30
rahulshukla-home f3dd1e4d99 Issue #3073 2020-05-19 18:46:43 +05:30