Commit Graph

2354 Commits

Author SHA1 Message Date
Prashant Singh 093a485470 Opted out Dusk & Debugbar packages out of auto discovery 2019-07-10 13:59:33 +05:30
Prashant Singh ade06ac9f1 Cleaned tests 2019-07-10 13:44:33 +05:30
Prashant Singh 4a4690d479 Cleaned tests directory 2019-07-10 13:33:00 +05:30
Prashant Singh abd3913d45 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-10 10:37:29 +05:30
Jitendra Singh a3ec809d15
Merge pull request #1170 from rahulshukla-webkul/development
Development
2019-07-09 14:49:54 +05:30
rahul shukla 135450c445 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-09 14:47:55 +05:30
rahul shukla cc4dfcad76 issue #1160, filterable attribute & configuration updated for validation 2019-07-09 14:47:40 +05:30
Prashant Singh 316ec39aaf Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title 2019-07-09 11:18:02 +05:30
Prashant Singh 869265e7a5 Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields 2019-07-09 10:11:19 +05:30
Jitendra Singh e91b2c2125
Merge pull request #1165 from rahulshukla-webkul/development
yarn.lock file in git ignore
2019-07-08 17:50:59 +05:30
rahul shukla 99fbb1b9d9 cached clear for git ignore 2019-07-08 17:50:00 +05:30
rahul shukla 00a07f9ea2 yarn.lock file in git ignore 2019-07-08 17:20:40 +05:30
Jitendra Singh 3129ecc8f3
Merge pull request #1156 from am-shb/master
Add intl extension to composer.json
2019-07-08 17:16:03 +05:30
rahul shukla 8d939e13c1 yarn.lock file in git ignore 2019-07-08 17:15:18 +05:30
Jitendra Singh 9d23e931ad
Merge pull request #1164 from rahulshukla-webkul/development
slider delete issue
2019-07-08 17:12:42 +05:30
rahul shukla f9e9dfbae1 slider delete issue 2019-07-08 17:10:42 +05:30
Jitendra Singh 89132ca1ff
Merge pull request #1163 from rahulshukla-webkul/development
issue #1062
2019-07-08 15:46:29 +05:30
rahul shukla 6fec08f814 check updated, issue #1162 2019-07-08 15:45:15 +05:30
rahul shukla 3511c08e46 issue #1062 2019-07-08 15:38:05 +05:30
Jitendra Singh 10081847f4
Merge pull request #1161 from rahulshukla-webkul/development
Development
2019-07-08 15:11:08 +05:30
rahul shukla 79d25c7d2e issue #1060 2019-07-08 15:09:42 +05:30
rahul shukla 746a17dcf6 conflict resolve 2019-07-08 13:13:34 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
Jitendra Singh 2c45ddee13
Merge pull request #1157 from danielpinon/patch-1
Updating translations of languages ​​in pt_BR
2019-07-08 12:13:54 +05:30
Jitendra Singh 0e84ac682f
Merge pull request #1158 from danielpinon/patch-2
Clearing duplicity
2019-07-08 12:08:42 +05:30
Daniel Pinon 723f6ad639
Clearing duplicity 2019-07-06 23:59:59 -03:00
Daniel Pinon c5fe78014c
Updating translations of languages ​​in pt_BR 2019-07-06 23:58:01 -03:00
Prashant Singh 8c19d9e0ce removed dead code 2019-07-06 17:47:45 +05:30
Prashant Singh c8e8df1699 Added configuration for cart rules 2019-07-06 17:41:58 +05:30
Amir Shahbandegan ec40ccb41b
Added intl extension to composer.json 2019-07-06 12:01:26 +04:30
Jitendra Singh 729aaff1aa
Merge pull request #1152 from rahulshukla-webkul/development
slider edit issue
2019-07-05 18:48:40 +05:30
rahul shukla 54481ebbfe slider edit issue 2019-07-05 18:15:22 +05:30
Jitendra Singh aae9ffa9a8
Merge pull request #1151 from rahulshukla-webkul/development
Development
2019-07-05 14:18:13 +05:30
rahul shukla 2f2f97a6d0 category check condition for sorting 2019-07-05 13:33:06 +05:30
rahul shukla f9863f440f category check condition for sorting 2019-07-05 13:24:46 +05:30
Prashant Singh 3fe220428c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-05 13:23:56 +05:30
Jitendra Singh 2a0d15d15a
Merge pull request #1150 from rahulshukla-webkul/development
Development
2019-07-04 14:40:12 +05:30
rahul shukla cfaee2f432 issue #1147 2019-07-04 13:56:18 +05:30
rahul shukla 9eb4b89344 json removed 2019-07-04 13:25:08 +05:30
rahul shukla 44a72db99e maximum price according to category 2019-07-04 13:20:21 +05:30
rahul shukla 60435b724f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-04 12:38:36 +05:30
rahul shukla c56d94f7a4 issue #968 and dependent field 2019-07-04 12:38:20 +05:30
Prashant Singh f8d38e9bbd Enabled usage parameters of cart rule in create and edit form 2019-07-03 11:37:09 +05:30
Prashant Singh 12c321e80e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-02 12:45:59 +05:30
Prashant Singh bfe52a7d3c Enabling coupon usage option for cart rules and start of the program convertxtoproductid 2019-07-02 12:45:30 +05:30
Jitendra Singh 47d375b264
Merge pull request #1146 from prateek-webkul/dev
change in Get root category
2019-07-01 18:12:18 +05:30
prateek srivastava 0e0cd7237a change in Get root category 2019-07-01 18:07:43 +05:30
Jitendra Singh e9608d87ef
Merge pull request #1143 from prashant-webkul/development
Development
2019-06-29 18:49:00 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +05:30
Prashant Singh be2b55a898 fixed event fire on movetocart from wishlist 2019-06-29 18:44:23 +05:30