Commit Graph

5581 Commits

Author SHA1 Message Date
Jitendra Singh a0efc250a7
Merge pull request #3283 from jitendra-webkul/1.0
Updated changelog
2020-06-18 18:35:17 +05:30
Pranshu Tomar 5047988b28 Updated changelog 2020-06-18 18:34:13 +05:30
Jitendra Singh c4b8eb3e1b
Merge pull request #3282 from jitendra-webkul/1.0
Fixed typo in changelog
2020-06-18 17:45:47 +05:30
Pranshu Tomar 80f863db91 Fixed typo in changelog 2020-06-18 17:43:17 +05:30
Jitendra Singh bafd02b9ab
Merge pull request #3281 from shubhwebkul/tensorflow
implemented tensorflow image search feature in velocity
2020-06-18 17:40:43 +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
Jitendra Singh e55971c182
Merge pull request #3279 from jitendra-webkul/1.0
Changelog updated
2020-06-18 17:10:17 +05:30
Pranshu Tomar e0bc1d3fc3 Changelog updated 2020-06-18 17:09:23 +05:30
Jitendra Singh daf307b513
Merge pull request #3278 from jitendra-webkul/1.0
Issue #3270 fixed
2020-06-18 17:04:50 +05:30
Pranshu Tomar 9189a71828 Issue #3270 fixed 2020-06-18 17:03:34 +05:30
Jitendra Singh dca986f8fc
Merge pull request #3277 from jitendra-webkul/1.0
Issue #3272 fixed
2020-06-18 16:22:17 +05:30
Pranshu Tomar aa34f8168d Issue #3272 fixed 2020-06-18 16:20:44 +05:30
Jitendra Singh c996930c4c
Merge pull request #3276 from jitendra-webkul/1.0
Issue #3273 fixed
2020-06-18 16:00:20 +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
Jitendra Singh 49425d0e01
Merge pull request #3275 from Haendlerbund/order-item-factory-extension
OrderItemFactory extension
2020-06-18 15:08:41 +05:30
Annika Wolff b61f57a698 add additional field 2020-06-18 10:10:16 +02:00
Shubham Mehrotra 1b8fb76dd2 Merge branch 'master' of https://github.com/bagisto/bagisto into tensorflow 2020-06-18 13:21:10 +05:30
Jitendra Singh 15a07fde3c
Merge pull request #3271 from shubhwebkul/patch-2
checkout enhancements
2020-06-18 13:16:02 +05:30
Shubham Mehrotra af35928a79 Merge branch 'master' of https://github.com/bagisto/bagisto into tensorflow 2020-06-18 13:06:31 +05:30
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
Jitendra Singh 8007d4710d
Merge pull request #3268 from jitendra-webkul/1.0
Updated change file
2020-06-17 18:10:01 +05:30
Pranshu Tomar 0ac19954b1 Updated change file 2020-06-17 18:09:12 +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 1045c10754 Merge branch 'master' of https://github.com/bagisto/bagisto into tensorflow 2020-06-17 16:43:46 +05:30
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
Jitendra Singh 4b8c82f5d4
Merge pull request #3262 from shubhwebkul/master
velocity fixed design issues
2020-06-17 12:17:47 +05:30
Shubham Mehrotra 68ae87598c #3248 2020-06-17 11:42:30 +05:30
Shubham Mehrotra 2f0475eb15 #3249 2020-06-17 11:24:21 +05:30
Shubham Mehrotra 976cd9f940 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2 2020-06-17 10:24:44 +05:30
Shubham Mehrotra bf8828326d resolved design issues 2020-06-17 10:21:55 +05:30
AhmedUsama 74d4c15cdf fix in route in permissions of catalog roles 2020-06-17 00:07:46 +02:00
AhmedUsama a5dd53299c Add catalog rules in permissions list in select tree of role 2020-06-16 23:58:42 +02:00
Jitendra Singh e156fa95fc
Merge pull request #3260 from jitendra-webkul/1.0
Issue fixed if booking product is null
2020-06-16 21:30:13 +05:30
Pranshu Tomar 960b7058b8 Issue fixed if booking product is null 2020-06-16 21:29:33 +05:30
Jitendra Singh e845c291c6
Merge pull request #3259 from jitendra-webkul/1.0
Issue #3219 fixed
2020-06-16 20:56:22 +05:30
Pranshu Tomar d761fc2d7e Issue #3219 fixed 2020-06-16 20:55:29 +05:30
Jitendra Singh 24e75d028e
Merge pull request #3258 from jitendra-webkul/1.0
Issue #3237 fixed
2020-06-16 19:50:12 +05:30
Pranshu Tomar 2ed98a2838 Issue #3237 fixed 2020-06-16 19:49:01 +05:30
Jitendra Singh d4876260d6
Merge pull request #3257 from bagisto/revert-3244-patch-1
Revert "Issue #3238 resolved"
2020-06-16 19:35:25 +05:30