Commit Graph

1435 Commits

Author SHA1 Message Date
Carlos Augusto Gartner cbfe9a53dd Created default laravel translation for pt_BR 2019-03-26 15:17:45 -03:00
Jitendra Singh 423fb8c446
Merge pull request #683 from jitendra-webkul/jitendra
'getAll' function of ProductRepository modified
2019-03-12 18:33:11 +05:30
jitendra ff1154c422 'getAll' function of ProductRepository modified 2019-03-12 18:32:23 +05:30
Jitendra Singh 7ad71d1d58
Merge pull request #682 from jitendra-webkul/jitendra
Update get all product function
2019-03-12 18:24:00 +05:30
jitendra 961e00227f Update get all product function 2019-03-12 18:23:11 +05:30
Jitendra Singh 45afd5652e
Merge pull request #681 from cagartner/pt-br-translation
Added pt-br translation
2019-03-12 17:57:37 +05:30
Carlos Augusto Gartner 2e2d7d7642 Added pt-br translation 2019-03-12 09:19:27 -03:00
Jitendra Singh 5ff2731e63
Merge pull request #680 from jitendra-webkul/jitendra
Editor added on category description textarea
2019-03-12 16:45:56 +05:30
jitendra a7eec79fbd Editor added on category description textarea 2019-03-12 16:45:08 +05:30
Jitendra Singh 0dc25c9276
Merge pull request #679 from jitendra-webkul/jitendra
Fixed slider controller namespace issue
2019-03-12 16:04:35 +05:30
jitendra 99e866d055 Fixed slider controller namespace issue 2019-03-12 16:03:57 +05:30
Jitendra Singh ba5b074a77
Merge pull request #678 from jitendra-webkul/jitendra
Jitendra
2019-03-12 12:05:34 +05:30
jitendra 12a4c6dc09 Fixed conflict and Assets compiled for prodcution 2019-03-12 12:04:55 +05:30
jitendra 42b5f91764 Feature Request #666 implented 2019-03-12 11:59:00 +05:30
Jitendra Singh 4dc7ef649c
Merge pull request #673 from prashant-webkul/development
disabled side menu toggle for admin, created configuration for produc…
2019-03-12 09:57:57 +05:30
Prashant Singh 9cfbdc6c1b Filterable checks implemented in datagrid 2019-03-11 19:36:58 +05:30
Prashant Singh 238c248852 Filterable checks implemented in datagrid 2019-03-11 19:36:15 +05:30
Jitendra Singh ff45ce45d3
Merge pull request #674 from jitendra-webkul/jitendra
Modified Slider Model
2019-03-11 18:44:06 +05:30
jitendra 91c55a7010 Modified Slider Model 2019-03-11 18:43:06 +05:30
Prashant Singh bd525ef606 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-11 18:42:34 +05:30
Prashant Singh 20247136a0 disabled side menu toggle for admin, created configuration for product types 2019-03-11 18:39:42 +05:30
Jitendra Singh 7d85d4efa8
Merge pull request #672 from rahulshukla-webkul/development
issue #670
2019-03-11 17:59:14 +05:30
rahul shukla 19f4429de0 issue #670 2019-03-11 17:57:15 +05:30
Jitendra Singh 43f7d7e9c1
Merge pull request #665 from rahulshukla-webkul/development
issue #655
2019-03-08 14:32:24 +05:30
rahul shukla 3ad2aec865 issue #655 2019-03-08 13:31:16 +05:30
Jitendra Singh d1489fa498
Merge pull request #663 from jay-thanki/patch-2
subscriber_email email changes
2019-03-08 11:54:13 +05:30
Jitendra Singh a60365b3d1
Merge pull request #662 from jay-thanki/patch-1
subscriber_email changes
2019-03-08 11:54:04 +05:30
Jay Thanki 727e6a2b89
subscriber_email email changes
change email subscriber_email as footer field assign to this field.
2019-03-08 11:31:31 +05:30
Jay Thanki 23db740306
subscriber_email changes
email names are same for signup form and footer email address field. so i changed footer email addess to subscriber_email
2019-03-08 11:31:18 +05:30
Jitendra Singh bf8f56a469
Merge pull request #661 from rahulshukla-webkul/development
installer migration run
2019-03-08 10:32:52 +05:30
rahul shukla b8055abedf installer migration run 2019-03-08 10:29:01 +05:30
JItendra Singh c6326c3386
Merge pull request #659 from rahulshukla-webkul/development
Development
2019-03-07 18:32:44 +05:30
rahul shukla 4e803a638b reverting category changes 2019-03-07 18:31:18 +05:30
rahul shukla faf2400a75 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-07 18:22:08 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
JItendra Singh 4d898d48db
Merge pull request #654 from prashant-webkul/development
Some html attributes added on the checkout pages
2019-03-07 12:37:00 +05:30
Prashant Singh 1e215e43c0 Some html attributes added on the checkout pages 2019-03-07 10:05:05 +05:30
JItendra Singh 3b71aaf88a
Merge pull request #653 from prashant-webkul/development
assets for the UI package compiled for production
2019-03-06 14:29:13 +05:30
Prashant Singh 17755bcc2d assets for the UI package compiled for production 2019-03-06 11:54:27 +05:30
JItendra Singh 2a9293448b
Merge pull request #651 from rahulshukla-webkul/development
Development
2019-03-05 18:41:59 +05:30
rahul shukla c2ae22a262 merge with master 2019-03-05 18:35:44 +05:30
rahul shukla 76aa1da818 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 18:33:58 +05:30
rahul shukla 95c898c4a8 up-sell, cross-sell & related-product 2019-03-05 18:32:15 +05:30
JItendra Singh a8c019885f
Merge pull request #650 from prashant-webkul/development
Development
2019-03-05 16:59:47 +05:30
Prashant Singh aac1c583f5 assets compiled for production 2019-03-05 16:32:12 +05:30
Prashant Singh 7ae4be56b8 fixed issue #642, made changes in layout of checkout section, various display bugs had been fixed 2019-03-05 16:28:55 +05:30
rahul shukla eb38784f7f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 15:16:35 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
JItendra Singh 899ec68089
Merge pull request #649 from jitendra-webkul/jitendra
Product gallery selected thumbnail border color changed to brand color
2019-03-05 13:18:24 +05:30
jitendra 1079331358 Conflict fixed 2019-03-05 13:17:58 +05:30