Commit Graph

4172 Commits

Author SHA1 Message Date
Steffen Mahler a44fa7445d refactoring of validateCartItem methods of product types 2020-07-04 15:20:59 +02:00
Steffen Mahler 492ad97b6c update annotation 2020-06-24 09:41:40 +02:00
Steffen Mahler be931439aa fix issue in validateCartItem, refactoring of CartRule helper 2020-06-23 16:33:55 +02:00
Steffen Mahler f64a62dc29 merge 'bagisto/master' into check-if-item-in-cart-is-deactivated 2020-06-23 11:47:31 +02:00
Pranshu Tomar 3d7be74d5b Issue #3320 fixed 2020-06-22 16:16:46 +05:30
Pranshu Tomar d79b4e3543 Issue #3319 fixed 2020-06-22 16:08:45 +05:30
Pranshu Tomar 946c14eb90 Issue #3316 fixed 2020-06-22 15:44:44 +05:30
Pranshu Tomar 9029e513e9 Issue #3301 fixed 2020-06-22 14:56:38 +05:30
Glenn Hermans b22efb2b7b fixed #3304 2020-06-20 11:45:20 +02:00
Shubham Mehrotra dac3487d1f remove compare option from customer sidebar 2020-06-19 19:12:12 +05:30
Jitendra Singh 737678e1ee
Merge pull request #3296 from jitendra-webkul/1.0
Undefined type index exception fixed during updation for bookign pro…
2020-06-19 15:06:21 +05:30
Pranshu Tomar 0de9d7b05f Undefinded type index exception fixed during updation for bookign product 2020-06-19 15:04:49 +05:30
Jitendra Singh 996df02d91
Merge pull request #3295 from jitendra-webkul/1.0
Issue #2981 fixed
2020-06-19 14:56:00 +05:30
Pranshu Tomar 28d74ec6a7 Issue #2981 fixed 2020-06-19 14:55:18 +05:30
Jitendra Singh 88da93dac0
Merge pull request #3294 from jitendra-webkul/1.0
Remove button will be enabled by default in date component
2020-06-19 14:50:53 +05:30
Pranshu Tomar ad6bab6a3a Remove button will be enabled by default in date component 2020-06-19 14:49:58 +05:30
Jitendra Singh ad51a0153d
Merge pull request #3292 from jitendra-webkul/1.0
Issue #3289 fixed
2020-06-19 14:02:09 +05:30
Pranshu Tomar 9a4adc50ab Issue #3289 fixed 2020-06-19 14:01:22 +05:30
Jitendra Singh 29223cca7d
Merge pull request #3288 from shubhwebkul/master
option to disable compare feature added
2020-06-19 13:50:00 +05:30
Jitendra Singh ef9bac610a
Merge pull request #3290 from jitendra-webkul/1.0
Issue #3222 fixed
2020-06-19 13:44:21 +05:30
Pranshu Tomar 8478a4a710 Issue #3222 fixed 2020-06-19 13:43:32 +05:30
Shubham Mehrotra 3d011e1c74 translation added 2020-06-19 13:37:14 +05:30
Shubham Mehrotra 76a1034f49 optional compare option in default theme 2020-06-19 13:26:16 +05:30
Shubham Mehrotra 8cc42af537 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-06-19 13:16:24 +05:30
Shubham Mehrotra 3d44f95469 optional compare option 2020-06-19 13:16:01 +05:30
Jitendra Singh 010a7fb021
Merge pull request #3287 from jitendra-webkul/1.0
Issue #3246 fixed
2020-06-19 13:07:07 +05:30
Pranshu Tomar a7a4fd12e5 Issue #3246 fixed 2020-06-19 13:06:16 +05:30
Shubham Mehrotra 8cfe88e045 #3131 2020-06-18 21:05:56 +05:30
Shubham Mehrotra 92cf27b037 Merge branch 'master' of https://github.com/bagisto/bagisto into tensorflow 2020-06-18 17:34:36 +05:30
Shubham Mehrotra 39d646275c implemented search feature 2020-06-18 17:34:13 +05:30
Pranshu Tomar 9189a71828 Issue #3270 fixed 2020-06-18 17:03:34 +05:30
Pranshu Tomar aa34f8168d Issue #3272 fixed 2020-06-18 16:20:44 +05:30
Pranshu Tomar 87b3f2acdc Conflicts resolved 2020-06-18 15:58:18 +05:30
Pranshu Tomar 6840198571 Issue #3273 fixed 2020-06-18 15:55:05 +05:30
Annika Wolff b61f57a698 add additional field 2020-06-18 10:10:16 +02:00
Shubham Mehrotra e55452bb56 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2 2020-06-17 19:17:27 +05:30
Shubham Mehrotra 780e57e5e8 #2937 2020-06-17 19:15:42 +05:30
Jitendra Singh 421e5c1134
Merge pull request #3267 from ahmedusama250/master
catalog rules permissions is missing
2020-06-17 18:14:26 +05:30
Jitendra Singh eae61adca8
Merge pull request #3266 from shubhwebkul/patch-1
bug fixes
2020-06-17 18:12:37 +05:30
ahmedusama250 33947fc72c
Merge pull request #1 from bagisto/master
Catalog Rules missing in the permissions list
2020-06-17 14:00:09 +02:00
Shubham Mehrotra 53a1cd43c7 loader added 2020-06-17 16:30:25 +05:30
Shubham Mehrotra 12965457c8 Merge branch 'tensorflow' into patch-2 2020-06-17 16:28:59 +05:30
Shubham Mehrotra d77aeaf822 added trait SendsPasswordResetEmails 2020-06-17 16:26:22 +05:30
Shubham Mehrotra c36c98a5be bug fixes 2020-06-17 16:08:13 +05:30
Jitendra Singh 2e3264c618
Merge pull request #3263 from jitendra-webkul/1.0
Issue #3254 fixed
2020-06-17 13:00:45 +05:30
Pranshu Tomar c9d59c6f38 Issue #3254 fixed 2020-06-17 12:44:18 +05:30
Jitendra Singh fbd3e10352
Merge pull request #3261 from shubhwebkul/patch-2
misc. fixed design issues
2020-06-17 12:18:13 +05:30
Steffen Mahler 3de5601df0 merge bagisto master, resolve conflicts 2020-06-17 08:29:55 +02:00
Shubham Mehrotra 68ae87598c #3248 2020-06-17 11:42:30 +05:30
Steffen Mahler 967b0903e5 merge master, resolve comnflicts 2020-06-17 08:12:10 +02:00