Vivek
|
aea33cfc68
|
[Updated: resolved config/concord.php conflict.]
|
2020-03-16 10:48:01 +05:30 |
Glenn Hermans
|
12280113f5
|
Merge pull request #9 from bagisto/master
|
2020-03-15 22:13:41 +01:00 |
Jitendra Singh
|
7072a60cda
|
Merge pull request #2657 from jitendra-webkul/1.0
Issue #2654 fixed
|
2020-03-13 19:16:48 +05:30 |
Jitendra Singh
|
7413e1577e
|
Issue #2654 fixed
|
2020-03-13 19:15:59 +05:30 |
|
Jitendra Singh
|
65b34add4b
|
Merge pull request #2656 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:08:08 +05:30 |
|
Jitendra Singh
|
e38a95cb3f
|
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:07:14 +05:30 |
|
Jitendra Singh
|
cae24088da
|
Merge pull request #2655 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:04:20 +05:30 |
|
Jitendra Singh
|
4e10d706f5
|
Catalog price rule issue fixed if discounted and normal price is same
|
2020-03-13 19:03:19 +05:30 |
mohd asif
|
ae1215834b
|
upadated remaining translation for ar
|
2020-03-13 18:43:14 +05:30 |
|
Jitendra Singh
|
195344e8a2
|
Merge pull request #2653 from jitendra-webkul/1.0
Issue #2638 fixed
|
2020-03-13 18:31:15 +05:30 |
|
Jitendra Singh
|
9b60f0b8ec
|
Issue #2638 fixed
|
2020-03-13 17:51:46 +05:30 |
|
Jitendra Singh
|
46ab49c489
|
Merge pull request #2652 from jitendra-webkul/1.0
Issue #2649 fixed
|
2020-03-13 17:43:57 +05:30 |
|
Jitendra Singh
|
fd15942132
|
Issue #2649 fixed
|
2020-03-13 17:37:25 +05:30 |
|
Jitendra Singh
|
c0f174e86b
|
Merge pull request #2651 from jitendra-webkul/1.0
Issue #2650 fixed
|
2020-03-13 17:21:36 +05:30 |
|
Jitendra Singh
|
ef7dac9fec
|
Issue #2650 fixed
|
2020-03-13 17:04:00 +05:30 |
|
Jitendra Singh
|
3a9fbbaff3
|
Merge pull request #2648 from jitendra-webkul/1.0
Issue #2643 fixed
|
2020-03-13 16:47:43 +05:30 |
|
Jitendra Singh
|
fbf4ffa1c3
|
Issue #2643 fixed
|
2020-03-13 16:42:04 +05:30 |
|
mohd asif
|
4c1f1ff738
|
translation updated for the velocity package
|
2020-03-13 14:52:30 +05:30 |
|
mohd asif
|
121dc5f395
|
updated translation for the shop package for arabic and persia
|
2020-03-13 13:56:39 +05:30 |
|
Jitendra Singh
|
c2633d06c0
|
Merge pull request #2647 from jitendra-webkul/1.0
Issues #2634, #2635 fixed
|
2020-03-13 12:56:41 +05:30 |
|
Jitendra Singh
|
557e619bdc
|
Issues #2634, #2635 fixed
|
2020-03-13 12:52:26 +05:30 |
|
mohd asif
|
dd4875004a
|
updated translation for arabic and persia for admin package
|
2020-03-13 12:29:51 +05:30 |
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 |
|
mohd asif
|
f01ab851fb
|
fixed some more language translation issue in arabic and persia
|
2020-03-12 19:30:39 +05:30 |
|
mohd asif
|
f797456d1a
|
added missing translation for the arabic of velocity packages
|
2020-03-12 17:39:17 +05:30 |
|
mohd asif
|
54d8ff9487
|
added tranlation fa for velocity package
|
2020-03-12 16:09:05 +05:30 |
|
mohd asif
|
ed2045b1b8
|
language for fa and pt_br
|
2020-03-12 15:29:11 +05:30 |
|
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 |
|
mohd asif
|
9e6ed6f09d
|
fixed translation in all packages
|
2020-03-12 13:32:56 +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 |
|
Vivek Sharma
|
ffd918af20
|
[Updated: Changed Velocity's models related code.]
|
2020-03-07 11:43:22 +05:30 |
|
Herbert Maschke
|
7a3a1726bc
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-06 15:50:26 +01:00 |
|
Glenn Hermans
|
6873cf4007
|
Merge pull request #8 from bagisto/master
|
2020-03-06 15:38:50 +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 |
|
Glenn Hermans
|
2d68f3e6b4
|
Merge pull request #7 from bagisto/master
|
2020-03-06 15:26:12 +01:00 |
|
Jitendra Singh
|
8ca9bd864c
|
Remove static text from grid
|
2020-03-06 19:49:47 +05:30 |