rahul shukla
|
b40c2173a8
|
Issue #2204
|
2020-01-30 15:22:39 +05:30 |
|
rahul shukla
|
3ac48ee883
|
Issue #2192
|
2020-01-29 18:27:47 +05:30 |
|
rahul shukla
|
a5853bb030
|
Issue #2198
|
2020-01-29 16:09:49 +05:30 |
|
rahul shukla
|
97332a1fc3
|
Issue #2192
|
2020-01-29 16:06:56 +05:30 |
|
rahul shukla
|
906366b6d4
|
Issue #2192
|
2020-01-29 13:48:31 +05:30 |
|
rahul shukla
|
50c6970c74
|
#Issue 2190
|
2020-01-29 13:32:16 +05:30 |
Steffen Mahler
|
0d696c6b1a
|
merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring
|
2020-01-28 15:51:50 +01:00 |
|
rahul shukla
|
a71cc1c887
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-01-28 19:08:08 +05:30 |
Jitendra Singh
|
9ccc8b26c5
|
Merge pull request #2187 from jitendra-webkul/1.0
Issue #2182 fixed
|
2020-01-28 19:03:14 +05:30 |
|
rahul shukla
|
ff52bc6708
|
change log updated and Issue #2182
|
2020-01-28 18:09:22 +05:30 |
|
rahul shukla
|
016c3a0ea7
|
change log updated and Issue #2182
|
2020-01-28 18:07:48 +05:30 |
Jitendra Singh
|
2e6d7aff95
|
Issue #2182 fixed
|
2020-01-28 18:01:10 +05:30 |
|
Jitendra Singh
|
ee7a68ba77
|
Merge pull request #2184 from jitendra-webkul/1.0
Issue #2183 fixed
|
2020-01-28 17:44:54 +05:30 |
|
Jitendra Singh
|
96b607d5f6
|
Issue #2183 fixed
|
2020-01-28 17:40:48 +05:30 |
|
Jitendra Singh
|
321dc84a91
|
Merge pull request #2179 from jitendra-webkul/1.0
Shipping discount issue fixed during refund creation
|
2020-01-28 17:37:20 +05:30 |
|
Jitendra Singh
|
efc4a6b8c3
|
Issue #2177 fixed
|
2020-01-28 17:33:08 +05:30 |
|
Jitendra Singh
|
7cf72f16fe
|
Issue #2177 fixed
|
2020-01-28 17:28:58 +05:30 |
|
Jitendra Singh
|
4b376b5ed7
|
Merge pull request #2027 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
Introduce optional company name and sales tax id columns to customer addresses
|
2020-01-28 17:00:36 +05:30 |
|
Jitendra Singh
|
c75e4a0042
|
Merge pull request #2174 from jitendra-webkul/1.0
Issue #2173 fixed
|
2020-01-28 15:19:39 +05:30 |
|
Jitendra Singh
|
c9769717d0
|
Issue #2173 fixed
|
2020-01-28 15:18:51 +05:30 |
|
Jitendra Singh
|
7a77cf380a
|
Merge pull request #2169 from jitendra-webkul/1.0
Issue #2168 fixed
|
2020-01-28 13:58:29 +05:30 |
|
Jitendra Singh
|
64fd205298
|
Issue #2168 fixed
|
2020-01-28 13:47:44 +05:30 |
|
Jitendra Singh
|
ed2de87d06
|
Merge pull request #2166 from jitendra-webkul/1.0
Issues #1189, #1148 fixed
|
2020-01-28 13:24:03 +05:30 |
|
Jitendra Singh
|
7b32b2e516
|
Issues #1189, #1148 fixed
|
2020-01-28 13:18:30 +05:30 |
Florian Bosdorff
|
5188b1b7f9
|
Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-28 08:15:11 +01:00 |
Florian Bosdorff
|
bf53dd49f3
|
remove unused use statement
|
2020-01-27 17:25:37 +01:00 |
|
Florian Bosdorff
|
d125f9eba0
|
add reporting for try-catch-sections
|
2020-01-27 17:06:03 +01:00 |
Herbert Maschke
|
20c2232710
|
remove |alpha_spaces validation from customer addresses city
|
2020-01-27 12:00:25 +01:00 |
|
Herbert Maschke
|
511d812333
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-27 11:40:18 +01:00 |
|
rahul shukla
|
cbaebaa388
|
query optimization and hide of expose model
|
2020-01-25 17:00:31 +05:30 |
|
Herbert Maschke
|
e948b30e35
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-24 15:13:16 +01:00 |
|
Jitendra Singh
|
f80109ba8b
|
Issue #2124 fixed
|
2020-01-24 16:11:17 +05:30 |
MonaHartdegen
|
ccc2188ef1
|
merge bagisto master
|
2020-01-24 10:22:15 +01:00 |
hb-monah
|
f6834b5196
|
Merge branch 'master' into new-bagisto-master
|
2020-01-24 10:16:11 +01:00 |
|
Jitendra Singh
|
4a38df3279
|
Fixed letter case issue in translation
|
2020-01-24 14:04:29 +05:30 |
|
Jitendra Singh
|
d1ab679e3e
|
Issue #2128 fixed
|
2020-01-24 13:54:54 +05:30 |
|
Jitendra Singh
|
d5c0891055
|
Issue #2128 fixed
|
2020-01-24 13:50:40 +05:30 |
|
Herbert Maschke
|
5ebb67dd81
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-23 14:18:17 +01:00 |
|
Jitendra Singh
|
da4980bfbe
|
Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration
Issue 1183/guest checkout configuration
|
2020-01-23 11:51:08 +05:30 |
|
Herbert Maschke
|
4629a3bb0f
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-22 14:59:18 +01:00 |
|
rahul shukla
|
0337959327
|
merge conflicts
|
2020-01-22 18:50:01 +05:30 |
|
rahul shukla
|
01f0fc9a57
|
2089 and updated codeception dependencies
|
2020-01-22 18:44:53 +05:30 |
|
Jitendra Singh
|
80a2ddb88d
|
Issue #1397 fixed
|
2020-01-22 14:58:39 +05:30 |
|
Florian Bosdorff
|
61d9b59e5f
|
Merge master into issue-1183/guest-checkout-configuration
|
2020-01-22 08:10:45 +01:00 |
rahulshukla-webkul
|
8bd9f0bc9d
|
Revert "Resolve #1183 guest checkout configuration"
|
2020-01-22 11:58:56 +05:30 |
|
Jitendra Singh
|
3aec5047f6
|
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
Resolve #1183 guest checkout configuration
|
2020-01-22 11:32:45 +05:30 |
|
Herbert Maschke
|
4596a77c07
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-21 11:36:26 +01:00 |
|
rahul shukla
|
e3db0b164c
|
conflict resolve
|
2020-01-21 13:24:19 +05:30 |
|
Jitendra Singh
|
176feecb55
|
Resolved conflicts
|
2020-01-20 19:59:04 +05:30 |
|
Jitendra Singh
|
b18f2292c4
|
Issue #2071 fixed
|
2020-01-20 19:57:10 +05:30 |
Annika Wolff
|
132dd6c0f0
|
introduce guest checkout configuration
|
2020-01-17 14:42:47 +01:00 |
|
Jitendra Singh
|
8612bd1385
|
Merge pull request #2069 from jitendra-webkul/1.0
Fixed cms textarea field issue
|
2020-01-17 14:58:27 +05:30 |
|
Jitendra Singh
|
6535afb52c
|
Fixed cms textarea field issue
|
2020-01-17 14:57:36 +05:30 |
|
Jitendra Singh
|
a6960f2916
|
Merge pull request #2068 from jitendra-webkul/1.0
Removed Developement menu
|
2020-01-17 14:49:25 +05:30 |
|
Jitendra Singh
|
eb3fdc12c6
|
Removed Developement menu
|
2020-01-17 14:48:39 +05:30 |
|
Jitendra Singh
|
880868738a
|
Merge pull request #2067 from jitendra-webkul/1.0
Issue #2058 fixed
|
2020-01-17 12:06:06 +05:30 |
|
Jitendra Singh
|
7d7e86e85c
|
Issue #2058 fixed
|
2020-01-17 12:05:28 +05:30 |
Annika Wolff
|
976d19cd74
|
Merge Bagisto master into Haendlerbund/Bagisto master (#14)
* added bagisto:install command
* updates for uploading attachments
* Issue #1808
* Issue #1779 fixed
* Issue #2045
* Issue #1971
* Issue #1779 fixed
* fire event on creating/updating slider
* Issue #1863 fixed
* Issue #1863 fixed
* Removed ')' in page edit blade
* Issue #2054 fixed
* Issue #2054 fixed
* Added mail from name field in .env.example file, Issue #2051
Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
|
2020-01-16 13:54:18 +01:00 |
shubhammehrotra.symfony@webkul.com
|
0468b7fa58
|
pass locale data in view_render_event
|
2020-01-16 12:37:52 +05:30 |
|
Herbert Maschke
|
e0c2814f2e
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-15 15:29:55 +01:00 |
|
Herbert Maschke
|
3ab9b62028
|
add vat_id to AddressDataGrid.php
|
2020-01-15 14:17:13 +01:00 |
|
Jitendra Singh
|
d80a3c7a5f
|
Merge pull request #2059 from jitendra-webkul/1.0
Removed ')' in page edit blade
|
2020-01-15 18:42:24 +05:30 |
|
Jitendra Singh
|
b552aba450
|
Removed ')' in page edit blade
|
2020-01-15 18:40:57 +05:30 |
|
Herbert Maschke
|
57aa522282
|
introduce company_name and vat_id also in shop admin backend
|
2020-01-15 14:02:51 +01:00 |
|
Jitendra Singh
|
915213711d
|
Merge pull request #2057 from jitendra-webkul/1.0
Issue #1863 fixed
|
2020-01-15 17:46:03 +05:30 |
|
Jitendra Singh
|
1e73cc9bc8
|
Issue #1863 fixed
|
2020-01-15 17:45:15 +05:30 |
|
Jitendra Singh
|
2049c45b0f
|
Merge pull request #2056 from jitendra-webkul/1.0
Issue #1863 fixed
|
2020-01-15 17:09:20 +05:30 |
|
Jitendra Singh
|
b4319e1f38
|
Issue #1863 fixed
|
2020-01-15 17:08:37 +05:30 |
|
Jitendra Singh
|
a7fe03602f
|
Merge pull request #2049 from rahulshukla-webkul/development
Issue #1971
|
2020-01-14 17:08:17 +05:30 |
|
rahul shukla
|
84feea8f0d
|
Issue #1971
|
2020-01-14 17:04:53 +05:30 |
David Große
|
9524c78ad5
|
various code style improvements
|
2020-01-14 10:49:22 +01:00 |
|
Jitendra Singh
|
0e2b8163e6
|
Merge pull request #2047 from jitendra-webkul/1.0
Issue #1779 fixed
|
2020-01-14 13:24:26 +05:30 |
|
Jitendra Singh
|
05a619d39b
|
Issue #1779 fixed
|
2020-01-14 13:23:49 +05:30 |
|
rahul shukla
|
7110804889
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-01-14 12:37:18 +05:30 |
|
rahul shukla
|
7e1b5fa693
|
Issue #1808
|
2020-01-14 12:37:03 +05:30 |
|
MonaHartdegen
|
4381d54029
|
added blank lines to improve readability
|
2020-01-13 17:05:32 +01:00 |
|
MonaHartdegen
|
d225ddf04a
|
added channel and locale to dropdown to product data grid
|
2020-01-13 16:50:28 +01:00 |
|
shubhammehrotra.symfony@webkul.com
|
2cf8af4815
|
updates for uploading attachments
|
2020-01-13 19:38:04 +05:30 |
|
Jitendra Singh
|
5ce709d31a
|
Merge pull request #2028 from rahulshukla-webkul/development
Issue #1808
|
2020-01-10 16:57:49 +05:30 |
|
rahul shukla
|
6d6efbb49c
|
Issue #1808
|
2020-01-10 16:50:20 +05:30 |
|
Jitendra Singh
|
9faef742d7
|
Issue #1845 fixed
|
2020-01-10 13:53:11 +05:30 |
|
rahul shukla
|
0f0cc82058
|
Issue #1983
|
2020-01-09 13:39:13 +05:30 |
|
rahul shukla
|
6413cdae71
|
added star in state view in datagrid
|
2020-01-09 13:07:43 +05:30 |
|
Jitendra Singh
|
55df0ad02f
|
Merge pull request #2013 from jitendra-webkul/1.0
Issues #1997, #1994 fixed
|
2020-01-08 17:02:39 +05:30 |
|
Jitendra Singh
|
ca0f8bca49
|
Issues #1997, #1994 fixed
|
2020-01-08 17:01:50 +05:30 |
|
Jitendra Singh
|
a0c02e6c4a
|
Merge pull request #2011 from jitendra-webkul/1.0
Tax rates for all states
|
2020-01-07 19:37:42 +05:30 |
|
jitendra
|
fbfd710f1c
|
Tax rates for all states
|
2020-01-07 17:48:43 +05:30 |
|
Jitendra Singh
|
ebddf578b1
|
Merge pull request #1843 from Haendlerbund/feature/update-npm-assets
update npm assets
|
2020-01-07 15:34:29 +05:30 |
|
Jitendra Singh
|
d438d1b4ed
|
Merge pull request #2006 from jitendra-webkul/1.0
Catalog rule and cart rule implemented for all product types
|
2020-01-06 17:52:30 +05:30 |
|
rahul shukla
|
7f3e3001b5
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-01-03 18:05:24 +05:30 |
|
rahul shukla
|
97c63ad035
|
review missing variavle and admin footer text
|
2020-01-03 18:05:14 +05:30 |
|
rahul shukla
|
25dff89054
|
translation added for locales
|
2020-01-03 16:12:23 +05:30 |
|
rahul shukla
|
9b120a978d
|
foter text change
|
2020-01-03 15:57:43 +05:30 |
|
rahul shukla
|
297165859f
|
foter text change
|
2020-01-03 15:35:56 +05:30 |
|
rahul shukla
|
4b2088e66e
|
upgrade to laravel 6
|
2019-12-30 17:10:38 +05:30 |
peternuernberger
|
af28c35bf7
|
Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets
|
2019-12-30 09:32:49 +01:00 |
|
jitendra
|
7aba45486f
|
Indexes created for all product types
|
2019-12-25 19:57:05 +05:30 |
|
rahul shukla
|
23a15be1e0
|
compatible with laravel 5.8
|
2019-12-24 19:31:13 +05:30 |
|
Jitendra Singh
|
a3aa23fcbc
|
Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes
Allow empty option for attributes
|
2019-12-24 13:12:22 +05:30 |
|
jitendra
|
795561ea58
|
Made all changes for discount packages
|
2019-12-21 16:00:22 +05:30 |