jitendra
|
694a10d06f
|
Resolve conflicts
|
2020-08-12 13:19:13 +05:30 |
|
jitendra
|
cd20e616b1
|
Changes for admin multi theme system
|
2020-08-12 13:17:34 +05:30 |
Jitendra Singh
|
ce450cbfec
|
Merge pull request #3729 from shubhwebkul/patch-1
Issue #3727 #3725 resolved
|
2020-08-12 12:20:07 +05:30 |
|
Jitendra Singh
|
b76f83bd5c
|
Merge pull request #3728 from rahulcs0082/development
Issue #3561 fixed
|
2020-08-12 11:38:34 +05:30 |
Shubham Mehrotra
|
8ed48f41f2
|
#3725
|
2020-08-12 10:48:02 +05:30 |
|
Shubham Mehrotra
|
2e275ec7ef
|
#3727
|
2020-08-12 10:42:51 +05:30 |
rahulshukla-home
|
4b5aad6a17
|
Issue #3561 fixed
|
2020-08-11 23:17:06 +05:30 |
Herbert Maschke
|
8614f74b4f
|
Merge branch 'bagisto/master' into introduce-product-copy
|
2020-08-11 16:54:10 +02:00 |
|
Herbert Maschke
|
9109d93028
|
Disallow copying of product variants (having a parent_id)
|
2020-08-11 16:53:09 +02:00 |
|
rahulshukla-home
|
c39c3a0ea1
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-08-11 18:59:28 +05:30 |
|
rahulshukla-home
|
3a2998cab1
|
Issue #3723 fixed
|
2020-08-11 18:58:31 +05:30 |
|
Jitendra Singh
|
8d7faa865c
|
Merge pull request #3695 from devansh-webkul/adding_missing_translation
Added missing translations
|
2020-08-11 18:49:52 +05:30 |
|
Jitendra Singh
|
bebcf38f9c
|
Merge pull request #3711 from akhtarkhan1/select_icon_payment_page
issued fixed #3688
|
2020-08-11 18:46:06 +05:30 |
|
Jitendra Singh
|
65f94c439f
|
Merge pull request #3722 from rahulcs0082/development
Issue #3638 fixed
|
2020-08-11 18:30:09 +05:30 |
|
rahulshukla-home
|
bed01ea9c9
|
Issue #3638 fixed
|
2020-08-11 18:22:14 +05:30 |
Devansh
|
61f0e0f296
|
Merge branch 'master' into adding_missing_translation
|
2020-08-11 17:38:49 +05:30 |
|
Jitendra Singh
|
e19694b98a
|
Merge pull request #3721 from shubhwebkul/patch-2
Issue #3720 resolved
|
2020-08-11 16:59:17 +05:30 |
|
Jitendra Singh
|
aaf0d5c962
|
Merge pull request #3719 from rahulcs0082/development
Issue #3717 fixed
|
2020-08-11 16:58:54 +05:30 |
|
Shubham Mehrotra
|
441740d7a2
|
#3720
|
2020-08-11 15:50:04 +05:30 |
|
Herbert Maschke
|
007eaa7ef2
|
code style improvements
|
2020-08-11 09:43:03 +02:00 |
|
rahulshukla-home
|
c8a70f7f36
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-08-11 12:04:31 +05:30 |
|
Shubham Mehrotra
|
bcc87623d8
|
updates
|
2020-08-11 12:04:10 +05:30 |
|
rahulshukla-home
|
ddcad7544c
|
Issue #3717 fixed
|
2020-08-11 12:02:54 +05:30 |
|
Shubham Mehrotra
|
17a5e453f5
|
updates
|
2020-08-10 22:20:46 +05:30 |
|
Herbert Maschke
|
f23d8d851c
|
fix copying of configurable products
|
2020-08-10 18:26:57 +02:00 |
|
Herbert Maschke
|
3173123dbf
|
also copy related products
|
2020-08-10 18:19:08 +02:00 |
|
Shubham Mehrotra
|
e40afeaf90
|
update
|
2020-08-10 21:43:31 +05:30 |
Akhtar Khan
|
e9f40fa9d7
|
#3688
|
2020-08-10 21:30:52 +05:30 |
|
Shubham Mehrotra
|
e56f2bff93
|
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
|
2020-08-10 21:25:08 +05:30 |
|
Shubham Mehrotra
|
78d015f41f
|
compare feature update
|
2020-08-10 21:24:59 +05:30 |
|
Herbert Maschke
|
c4fdf11633
|
Merge branch 'bagisto/master' into introduce-product-copy
|
2020-08-10 17:43:31 +02:00 |
|
Akhtar Khan
|
76cadf49ca
|
changed files #3688
|
2020-08-10 21:13:09 +05:30 |
|
Akhtar Khan
|
0289094a7f
|
changed files #3688
|
2020-08-10 21:08:56 +05:30 |
|
Akhtar Khan
|
0663644854
|
Merge branch 'master' of https://github.com/bagisto/bagisto into select_icon_payment_page
|
2020-08-10 21:05:48 +05:30 |
|
Jitendra Singh
|
3d5add129f
|
Merge pull request #3712 from devansh-webkul/no_alert_message_issue
Fixed no alert message while deleting customer with pending or processing order from admin end #3704
|
2020-08-10 21:05:03 +05:30 |
|
Herbert Maschke
|
54e6c031bd
|
AbstractType.php improvements
|
2020-08-10 17:34:50 +02:00 |
|
Akhtar Khan
|
48a39ff498
|
Merge branch 'master' of https://github.com/bagisto/bagisto into select_icon_payment_page
|
2020-08-10 21:00:31 +05:30 |
|
Herbert Maschke
|
69dea2b8b3
|
improve the way linked categories are copied
|
2020-08-10 17:28:23 +02:00 |
|
Akhtar Khan
|
3a365a1869
|
final changed #3688
|
2020-08-10 20:57:44 +05:30 |
|
Herbert Maschke
|
3aeb0c75df
|
ability to define if a product type can be copied in AbstractType.php
|
2020-08-10 17:24:36 +02:00 |
Devansh
|
1920035174
|
Alert Message Added
|
2020-08-10 20:52:03 +05:30 |
|
Akhtar Khan
|
44a68c8dbb
|
issued fixed #3688
|
2020-08-10 20:14:18 +05:30 |
|
Shubham Mehrotra
|
f3ebec2833
|
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
|
2020-08-10 19:48:32 +05:30 |
|
Shubham Mehrotra
|
38e7270ba9
|
#3486
|
2020-08-10 19:46:59 +05:30 |
|
Shubham Mehrotra
|
8377c8dc8f
|
#3486
|
2020-08-10 19:43:14 +05:30 |
|
Devansh
|
d7fc4aa233
|
Merge branch 'master' into adding_missing_translation
|
2020-08-10 19:38:48 +05:30 |
|
Jitendra Singh
|
4b1fdc04ac
|
Merge pull request #3705 from devansh-webkul/product_name_blank_issue
Fixed #3656
|
2020-08-10 19:30:58 +05:30 |
|
jitendra
|
9c0ec6f644
|
Support multi admin theme
|
2020-08-10 19:25:51 +05:30 |
|
Jitendra Singh
|
c4abe9cad3
|
Revert "Multi theme system now supported in admin"
|
2020-08-10 19:07:32 +05:30 |
|
jitendra
|
37e7c4c834
|
Merged with master
|
2020-08-10 19:02:15 +05:30 |