Commit Graph

4751 Commits

Author SHA1 Message Date
rahul shukla 469ed35ede Issue #2155 2020-01-28 10:55:00 +05:30
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
shubhammehrotra.symfony@webkul.com fb5ee7c6d7 view order page updates 2020-01-27 19:49:02 +05:30
Jitendra Singh 0cd4a2678a
Merge pull request #1996 from Haendlerbund/introduce-api-token-columns-into-database
add missing api_token columns to database (table customers and admins)
2020-01-27 18:31:13 +05:30
Steffen Mahler 223c96b205 . 2020-01-27 13:06:31 +01:00
Jitendra Singh b8115c808e
Merge pull request #2144 from Haendlerbund/trigger-db-prefixes
fix trigger according to optional db-prefix
2020-01-27 17:21:26 +05:30
Jitendra Singh 0b3a7a6c6a
Merge pull request #2157 from jitendra-webkul/1.0
Removed commented code
2020-01-27 16:52:08 +05:30
Jitendra Singh 8176317a59 Removed commented code 2020-01-27 16:46:58 +05:30
Jitendra Singh 3e2e6f2c75
Merge pull request #2156 from jitendra-webkul/1.0
Issue #2087 fixed
2020-01-27 16:42:01 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
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
Herbert Maschke 08891a43b6 use correct vatId() formatter 2020-01-27 11:31:46 +01:00
shubhammehrotra.symfony@webkul.com 4eb858aed7 directory structure updates 2020-01-27 15:12:46 +05:30
Jitendra Singh 10c1a14c45
Merge pull request #2153 from rahulshukla-webkul/development
Issue #2149
2020-01-27 15:09:29 +05:30
rahul shukla 2c2e6588c1 Issue #2149 2020-01-27 15:03:37 +05:30
Jitendra Singh 3a69b97bd2
Merge pull request #2151 from rahulshukla-webkul/development
Development
2020-01-27 13:35:08 +05:30
Jitendra Singh 0a2116a77c
Merge pull request #2150 from jitendra-webkul/1.0
Issue #2054 fixed
2020-01-27 13:34:14 +05:30
rahul shukla 41ae3048ff Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-27 13:24:37 +05:30
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
shubhammehrotra.symfony@webkul.com 752daa6d89 updates 2020-01-27 13:23:28 +05:30
shubhammehrotra.symfony@webkul.com eebba89ea7 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-01-27 13:22:17 +05:30
Jitendra Singh 3a2fb2c03a Issue #2054 fixed 2020-01-27 13:10:30 +05:30
Jitendra Singh c37818dcb9
Merge pull request #2148 from jitendra-webkul/1.0
Issue #2146 fixed
2020-01-27 12:39:05 +05:30
Jitendra Singh edf5dc34fd Issue #2146 fixed 2020-01-27 12:38:13 +05:30
Jitendra Singh 4e94d540e9
Merge pull request #2138 from rahulshukla-webkul/development
Development
2020-01-27 10:54:12 +05:30
Florian Bosdorff d2a8911aaa fix trigger according to optional db-prefix 2020-01-26 21:10:57 +01:00
shubhammehrotra.symfony@webkul.com 1b368789e5 bagisto velocity theme updates 2020-01-26 14:17:05 +05:30
rahul shukla cbaebaa388 query optimization and hide of expose model 2020-01-25 17:00:31 +05:30
rahulshukla-webkul 212a32f302
Merge pull request #2137 from bagisto/revert-2065-velocity
Revert "Bagisto theme added"
2020-01-25 14:58:46 +05:30
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30
Jitendra Singh ddc420c1c1
Merge pull request #2065 from shubhwebkul/velocity
Bagisto theme added
2020-01-25 12:40:49 +05:30
Herbert Maschke 8a927d32c1 repair italian factory 2020-01-24 15:26:33 +01:00
Herbert Maschke 80dc92efa4 remove redundant factory registration 2020-01-24 15:21:27 +01:00
Herbert Maschke bd03852619 remove redundant function 2020-01-24 15:17:17 +01:00
Herbert Maschke 6c83e03fe4 remove redundant use statement 2020-01-24 15:16:26 +01:00
Herbert Maschke e948b30e35 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-24 15:13:16 +01:00
MonaHartdegen f54117aabf removed test and factory (did not work properly) 2020-01-24 15:04:34 +01:00
shubhammehrotra.symfony@webkul.com 221aa5ba66 updates from bagisto 2020-01-24 19:03:22 +05:30
shubhammehrotra.symfony@webkul.com 3f377c929e Merge branch 'master' of https://github.com/bagisto/bagisto into velocity 2020-01-24 18:52:45 +05:30
Jitendra Singh f4ee571dc7
Merge pull request #2127 from Haendlerbund/basic-backend-tests
add basic backend tests
2020-01-24 18:50:50 +05:30
shubhammehrotra.symfony@webkul.com 80ef6e8820 responsive updates 2020-01-24 18:49:50 +05:30
Herbert Maschke 22dbfded51 update package.json 2020-01-24 14:00:51 +01:00
Jitendra Singh cb45802acd
Merge pull request #2135 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-24 16:49:14 +05:30
Jitendra Singh eec113ad80 Resolve conflict 2020-01-24 16:48:30 +05:30
Jitendra Singh 195a37fea3 Issue #1779 fixed 2020-01-24 16:44:45 +05:30
Jitendra Singh 00bed27d49
Merge pull request #2134 from jitendra-webkul/1.0
Issue #2124 fixe
2020-01-24 16:17:41 +05:30
Jitendra Singh f80109ba8b Issue #2124 fixed 2020-01-24 16:11:17 +05:30
Jitendra Singh 6068dda972
Merge pull request #2133 from rahulshukla-webkul/development
Issue #2132
2020-01-24 15:00:06 +05:30