Commit Graph

2785 Commits

Author SHA1 Message Date
rahul shukla 3a7e481d01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-30 20:09:55 +05:30
rahul shukla 270bdfa553 delete in product flat 2019-07-30 20:09:40 +05:30
Prashant Singh 0aa1a4bee9 Fixed migration 2019-07-30 19:23:30 +05:30
Prashant Singh 880827f6f4 Customer document migration fix 2019-07-30 19:16:00 +05:30
Prashant Singh 9b0c3456e5 Modules preorder, customer document and group catalog updated 2019-07-30 16:22:27 +05:30
Prashant Singh d8086091cb Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-30 13:54:25 +05:30
Prashant Singh a5def0aa13 Updated Stripe Connexct 2019-07-30 13:53:50 +05:30
rahul shukla 39139f26ca Issues #1228 and #1229 2019-07-30 13:45:13 +05:30
Jitendra Singh 9a211adaa4
Merge pull request #1207 from ArmCM/refactor/code_style
WIP - fix code style laravel
2019-07-30 11:49:27 +05:30
Jitendra Singh 41510db280
Merge pull request #1202 from moe2566/master
Add text direction configuration for locales
2019-07-30 11:48:56 +05:30
rahul shukla c73e12a052 try, catch for password reset. issue #1177 2019-07-30 10:50:05 +05:30
rahul shukla 1b95d3d877 product creation on channel based and admin logo 2019-07-30 10:36:26 +05:30
Jitendra Singh e6d40fa3f0
Merge pull request #1225 from rahulshukla-webkul/development
Development
2019-07-29 15:42:26 +05:30
rahul shukla b39f412842 issue #1217, #1220 and #1218 2019-07-29 14:44:38 +05:30
rahul shukla d83396d437 issue #1217, #1220 and #1218 2019-07-29 14:38:17 +05:30
rahul shukla 2e336c935a test field added for depandenet field in configuaration 2019-07-29 14:34:54 +05:30
rahul shukla 9d9b0b5176 use in product flat column added in attributes 2019-07-29 14:33:33 +05:30
Jitendra Singh ca763343c4
Merge pull request #1215 from rahulshukla-webkul/development
use in product flat added for attribute
2019-07-29 12:21:50 +05:30
rahul shukla dbff16b8b7 disabale zoom on mobile devices 2019-07-29 12:07:39 +05:30
Jitendra Singh a70f1f2b81
Merge pull request #1145 from adpe/adpe-patch-1
Rework and fix anchors in README
2019-07-29 11:01:17 +05:30
Adrian Perez c6f44daa22
Update README.md
Update the backers link and image
2019-07-28 15:34:57 +02:00
Jitendra Singh fdd681a4eb
Merge pull request #1213 from rahulshukla-webkul/development
Development
2019-07-25 11:32:28 +05:30
Prashant Singh f9e91bb0ef Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-25 11:26:34 +05:30
rahul shukla 120851ce0c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-25 11:11:32 +05:30
rahul shukla fca1d6d15c filter code updated 2019-07-25 11:11:18 +05:30
Jitendra Singh 9fa5e2396b
Merge pull request #1210 from rahulshukla-webkul/development
Development
2019-07-25 10:04:14 +05:30
moe2566 09cfa77378
Update anonymous-master.blade.php 2019-07-24 10:19:50 -04:00
Prashant Singh 1a3038ae72 New cart rule actions 2019-07-24 19:32:37 +05:30
rahul shukla 13a982f480 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-24 18:51:03 +05:30
rahul shukla 29763b902e issue of image at checkout #1209 2019-07-24 18:50:44 +05:30
rahul shukla 1dd5faa21d change Datatype for code 2019-07-24 17:55:32 +05:30
ArmCM ae6c6fa193 WIP - fix code style laravel 2019-07-24 02:50:22 -05:00
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
moe2566 e038416f55
Update 2019_07_23_033128_alter_locales_table.php 2019-07-23 19:22:03 -04:00
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
Hans Schouten cfb4b8d682
Fix firing the wrong event after storing user 2019-07-23 21:59:28 +02:00
Prashant Singh 45ce843772 Cart rule new actions implementation 2019-07-23 18:23:49 +05:30
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
Prashant Singh 2acad0e540 Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage 2019-07-23 13:43:37 +05:30
Prashant Singh dfd6ea8c25 Translations fixes in promotions sections 2019-07-23 13:07:22 +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
Prashant Singh 70267e29cb disabled catalog rule 2019-07-22 13:01:54 +05:30
Prashant Singh 0bd422db97 translation fixes in cart rule forms 2019-07-22 13:01:07 +05:30