Commit Graph

2371 Commits

Author SHA1 Message Date
Jitendra Singh 871bc8c190
Merge pull request #1205 from rahulshukla-webkul/development
assests compile for production
2019-07-24 12:39:48 +05:30
Jitendra Singh d37d5613c6
Merge pull request #1201 from HansSchouten/patch-1
Fix firing the wrong event after storing user
2019-07-24 11:30:08 +05:30
rahul shukla 97320b52ea assests compile for production 2019-07-24 10:40:51 +05:30
Hans Schouten cfb4b8d682
Fix firing the wrong event after storing user 2019-07-23 21:59:28 +02:00
Jitendra Singh e1628196a8
Merge pull request #1199 from rahulshukla-webkul/development
Development
2019-07-23 17:50:10 +05:30
rahul shukla cff63acfc8 reverting changes 2019-07-23 17:49:24 +05:30
rahul shukla 9cd9846d65 set locale on session if not available 2019-07-23 17:47:19 +05:30
rahul shukla 9186c0c5d1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-23 15:58:04 +05:30
rahul shukla f4eb973ba6 reduces number of loop for filter attribute #1192 2019-07-23 15:57:49 +05:30
Jitendra Singh eb90bad4ad
Merge pull request #1188 from rahulshukla-webkul/development
Development
2019-07-23 12:52:13 +05:30
rahul shukla bcd84d9e7f corrction in route 2019-07-23 12:04:09 +05:30
rahul shukla ef5eb1356c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-19 16:30:28 +05:30
rahul shukla 3200cbafc6 Issue #1190. 2019-07-19 16:30:01 +05:30
Jitendra Singh c560dda2e9
Merge pull request #1186 from stoney024/master
Forgot password back link translation
2019-07-18 14:40:34 +05:30
rahul shukla 5ab552fb0b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-18 13:12:29 +05:30
rahul shukla 383e782d3c route correction for customer after login 2019-07-18 13:10:10 +05:30
rahul shukla f61554c5a6 configuration changes for dependent field 2019-07-18 12:51:22 +05:30
Arpad 4a941e461c Forget password notification Subject translation 2019-07-17 14:36:00 +02:00
Arpad 2c3467e611 Forgot password back link translation 2019-07-17 09:30:36 +02:00
Jitendra Singh 9d2a0f8572
Merge pull request #1184 from rahulshukla-webkul/development
Development
2019-07-15 18:06:10 +05:30
rahul shukla 27d6e8894c checkbox type attribute 2019-07-15 18:00:56 +05:30
rahul shukla 1ec288a182 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-15 17:04:10 +05:30
rahul shukla 67bb7704e7 merge with master 2019-07-15 17:03:54 +05:30
Jitendra Singh 12bc679fc1
Merge pull request #1181 from alkhachatryan/master
Update search.blade.php
2019-07-15 12:06:39 +05:30
Alexey 5856d00e4b
Update search.blade.php
Use TOTAL instead of COUNT
2019-07-14 17:27:34 +04:00
Jitendra Singh df0b4cbf95
Merge pull request #1178 from rahulshukla-webkul/development
Development
2019-07-11 19:56:04 +05:30
rahul shukla 64fb91f6a8 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-11 19:53:30 +05:30
rahul shukla 78d44a8be0 rtl css for slider 2019-07-11 19:53:18 +05:30
rahul shukla 20a205deba locale id in cstegory trnaslation 2019-07-11 19:45:48 +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
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