Herbert Maschke
|
fd096e7248
|
stay on phpunit 7.x for a while...
|
2020-03-17 14:24:36 +01:00 |
|
Herbert Maschke
|
5b28d754c2
|
rerun pipeline
|
2020-03-12 16:40:35 +01:00 |
|
Herbert Maschke
|
50f818bc73
|
rerun pipeline
|
2020-03-12 16:32:38 +01:00 |
|
Herbert Maschke
|
c14b1c8946
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-12 16:26:27 +01:00 |
Jitendra Singh
|
30f94375f3
|
Merge pull request #2631 from Haendlerbund/show-multiple-flash-messages-in-admin-panel
bugfix: show multiple flash messages in admin panel
|
2020-03-12 14:53:46 +05:30 |
|
Jitendra Singh
|
90b1267406
|
Merge pull request #2633 from jitendra-webkul/1.0
Issue #2630 fixed
|
2020-03-11 16:48:47 +05:30 |
Jitendra Singh
|
00f8f7ddb0
|
Issue #2630 fixed
|
2020-03-11 16:45:06 +05:30 |
|
Jitendra Singh
|
eb7310f721
|
Merge pull request #2632 from jitendra-webkul/1.0
Issue #2630 fixed
|
2020-03-11 15:45:19 +05:30 |
|
Jitendra Singh
|
ec3be668b6
|
Issue #2630 fixed
|
2020-03-11 15:36:45 +05:30 |
Annika Wolff
|
04c35bb88d
|
uncommented factory loading in TaxServiceProvider, bc. tests will miss it
|
2020-03-11 11:06:17 +01:00 |
|
Annika Wolff
|
65b5ec9232
|
bugfix: show multiple flash messages in admin panel
|
2020-03-11 10:45:18 +01:00 |
|
Jitendra Singh
|
0b946d6d89
|
Merge pull request #2629 from jitendra-webkul/1.0
Removed static text from shop datagrid
|
2020-03-11 12:29:42 +05:30 |
|
Jitendra Singh
|
6063c113bf
|
Removed static text from shop datagrid
|
2020-03-11 12:15:03 +05:30 |
|
Herbert Maschke
|
f6305b94eb
|
update composer.lock
|
2020-03-10 11:35:11 +01:00 |
|
Herbert Maschke
|
00e351ce30
|
adjust code generation to how it should be in AttributeFamilyCest.php
|
2020-03-10 10:55:30 +01:00 |
|
Herbert Maschke
|
7e6de00e0e
|
generate uuid instead of word in AttributeFamilyCest.php to avoid randomly failing test
|
2020-03-10 10:24:26 +01:00 |
|
Herbert Maschke
|
e20bb9cc97
|
remove <<<<HEAD merge conflict marker artifact
|
2020-03-10 10:00:04 +01:00 |
|
Herbert Maschke
|
7a3a1726bc
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-06 15:50:26 +01:00 |
|
Jitendra Singh
|
5859d8dfc2
|
Merge pull request #2625 from jitendra-webkul/booking-product
Remove static text from grid
|
2020-03-06 20:06:21 +05:30 |
|
Jitendra Singh
|
101df848d6
|
Remove static text from grid
|
2020-03-06 20:03:32 +05:30 |
|
Jitendra Singh
|
8ca9bd864c
|
Remove static text from grid
|
2020-03-06 19:49:47 +05:30 |
|
Jitendra Singh
|
741c1f25ee
|
Merge pull request #2624 from jitendra-webkul/booking-product
Up down icon issue fixed
|
2020-03-06 19:10:54 +05:30 |
|
Jitendra Singh
|
27aa309754
|
Up down icon issue fixed
|
2020-03-06 19:04:58 +05:30 |
|
Jitendra Singh
|
9846fb9408
|
Merge pull request #2623 from jitendra-webkul/booking-product
Booking product added and improved code style and code comments
|
2020-03-06 17:51:25 +05:30 |
|
Jitendra Singh
|
2f9724e03d
|
attributeOptionRepository undefined variable issue fixed
|
2020-03-06 17:47:20 +05:30 |
|
Jitendra Singh
|
f07c9b0efa
|
Merge pull request #2622 from Haendlerbund/tiny-refactored-invoice-factory
Tiny refactoring of InvoiceFactory
|
2020-03-06 17:40:41 +05:30 |
|
Annika Wolff
|
f4f5d2ea71
|
make invoice factory php7.3 compatible
|
2020-03-06 12:52:35 +01:00 |
|
Jitendra Singh
|
fcf043ca6f
|
Improved code style
|
2020-03-06 16:09:53 +05:30 |
|
Jitendra Singh
|
73ce8a4dd7
|
Resolved conflicts
|
2020-03-06 16:04:17 +05:30 |
|
Jitendra Singh
|
010ae65691
|
Resolved conflicts
|
2020-03-06 16:02:52 +05:30 |
|
Jitendra Singh
|
276a2e288b
|
Merge pull request #2612 from Haendlerbund/revert-2603-development
Revert "Development"
|
2020-03-06 15:16:08 +05:30 |
|
Jitendra Singh
|
d218821069
|
Merge pull request #2620 from shubhwebkul/velocity-updated
misc. bug fixes
|
2020-03-06 15:05:45 +05:30 |
shubhammehrotra.symfony@webkul.com
|
5ad2b9109f
|
use product flat instead of product entity
|
2020-03-06 14:41:33 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
d212536170
|
image resolution & quick view price issue resolved
|
2020-03-06 13:24:31 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
b564e63ad7
|
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
|
2020-03-06 12:26:13 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
8d167c7b76
|
#2609, #2602 & misc.
|
2020-03-06 12:25:59 +05:30 |
|
Herbert Maschke
|
e40d3ec619
|
fill in correct address attributes
|
2020-03-05 16:16:17 +01:00 |
|
Herbert Maschke
|
7c634046db
|
add ?? operator in case address data fails
|
2020-03-05 16:00:21 +01:00 |
|
Herbert Maschke
|
19ebc48fbc
|
further refactoring of Cart Component
|
2020-03-05 15:52:20 +01:00 |
|
Jitendra Singh
|
955da20b45
|
Improved comments in code
|
2020-03-05 19:49:14 +05:30 |
|
Jitendra Singh
|
b503c50e0b
|
Fixed bug
|
2020-03-05 19:40:47 +05:30 |
|
Jitendra Singh
|
3068ecd9ae
|
Improved comments in code
|
2020-03-05 19:34:30 +05:30 |
|
Jitendra Singh
|
10db1838f2
|
Removed author information from every class
|
2020-03-05 19:28:42 +05:30 |
|
Jitendra Singh
|
42c16cbbfd
|
Improved comments in code
|
2020-03-05 19:13:42 +05:30 |
|
Jitendra Singh
|
d0fa3b2705
|
Replace DB alias with complete class name
|
2020-03-05 19:11:53 +05:30 |
|
Jitendra Singh
|
92261d4214
|
Improved comments in code
|
2020-03-05 19:07:08 +05:30 |
|
Jitendra Singh
|
e1937b4cd2
|
Merge pull request #2618 from rahulshukla-webkul/development
Development
|
2020-03-05 17:14:06 +05:30 |
rahul shukla
|
2d5d865b60
|
Issue #2586
|
2020-03-05 17:03:48 +05:30 |
|
rahul shukla
|
b024a0b176
|
Issue #2606
|
2020-03-05 16:44:52 +05:30 |
|
rahul shukla
|
3ebff8d0c8
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-03-05 16:28:39 +05:30 |