Commit Graph

1645 Commits

Author SHA1 Message Date
Prashant Singh d8d645eb41 fixing csrf issue for datagrid delete 2019-04-08 20:26:04 +05:30
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
Prashant Singh 747f214739 fix in progress for get routes performing actions more than redirect 2019-04-08 04:51:02 +05:30
Prashant Singh 82e56334c2 Fixed modal style issues, localization of routes issue and updated description string of version command 2019-04-07 06:30:55 +05:30
Prashant Singh c7482f576e Some styles fixes on auth pages of customer and footer bottom 2019-04-07 03:44:18 +05:30
Prashant Singh 1033bd8d31 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-04-06 02:23:12 +05:30
Prashant Singh 8cfcf3d484 order view for customer fixed 2019-04-06 02:18:31 +05:30
Prashant Singh 61fd02ed57 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 19:38:56 +05:30
Prashant Singh 1e6579bedf in fix 2019-04-05 19:38:44 +05:30
Jitendra Singh 1f528736ec
Merge pull request #807 from rahulshukla-webkul/development
Development
2019-04-05 19:32:01 +05:30
rahul shukla 28c45c9bfa issue #802 2019-04-05 19:29:04 +05:30
rahul shukla 2c9862db57 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 19:19:26 +05:30
rahul shukla 91477e50c0 issue #802 sqllite 2019-04-05 19:19:10 +05:30
Jitendra Singh cdd0e5c81f
Merge pull request #806 from rahulshukla-webkul/development
Development
2019-04-05 16:57:59 +05:30
rahul shukla ee189baf7a merge with master 2019-04-05 16:55:09 +05:30
rahul shukla fdb6284856 issue #760 wishlist 2019-04-05 16:54:09 +05:30
Prashant Singh e88bf10c55 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 12:00:10 +05:30
Jitendra Singh 4b73c3e980
Merge pull request #805 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-05 11:44:18 +05:30
jitendra e83a27a31b Issue #803 fixed 2019-04-05 11:42:52 +05:30
Jitendra Singh 89613136ff
Merge pull request #795 from imanghafoori1/flatten_code
flatten code
2019-04-05 11:10:49 +05:30
Prashant Singh dadbf2bd6a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 10:47:16 +05:30
Prashant Singh 380f265ef1 H tag font sizes fix 2019-04-05 10:46:57 +05:30
Jitendra Singh d102b107fe
Merge pull request #804 from rahulshukla-webkul/development
Development
2019-04-05 10:33:43 +05:30
imanghafoori ca93e36826 flatten code 2019-04-04 23:53:59 +04:30
imanghafoori 07806c44fc flatten code 2019-04-04 23:51:33 +04:30
rahul shukla 4c2a0a08fc email subscription & newsletter verifiaction 2019-04-04 19:34:01 +05:30
rahul shukla 7be61550a4 change in query for muliselect attribute & layered navigation 2019-04-04 19:11:32 +05:30
Jitendra Singh a173b515a7
Merge pull request #801 from rahulshukla-webkul/development
Development
2019-04-04 15:50:13 +05:30
rahul shukla e0ab120b9b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-04 15:44:17 +05:30
rahul shukla 9c8f4f9522 issue #799 multiselect attribute & layered navigation 2019-04-04 15:43:33 +05:30
Prashant Singh 5c94a8a21f changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui 2019-04-04 14:50:59 +05:30
Jitendra Singh 708bfbaadb
Merge pull request #800 from prashant-webkul/development
Development
2019-04-04 14:21:26 +05:30
Prashant Singh ed9413a1bc syntax fixed 2019-04-04 13:29:48 +05:30
Prashant Singh 6381c9bcff Added artisan command to display current version of Bagisto version 2019-04-04 13:11:45 +05:30
Prashant Singh 530245d094 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-04 13:04:11 +05:30
Prashant Singh 0f8e402380 added version in configuration of Bagisto 2019-04-04 13:03:53 +05:30
Jitendra Singh d18b862f85
Merge pull request #796 from imanghafoori1/fix_docblocks
fix docblocks
2019-04-04 12:07:55 +05:30
Jitendra Singh 8ac9c7b8ba
Merge pull request #793 from prateek-webkul/development
issue fixed #791
2019-04-04 11:56:34 +05:30
Jitendra Singh d5a46daad8
Merge pull request #794 from imanghafoori1/class
refactor using ::class
2019-04-04 11:22:47 +05:30
imanghafoori 56933912eb fix docblocks 2019-04-03 18:13:59 +03:30
imanghafoori 2daf56c4fd refactor using ::class 2019-04-03 17:24:45 +03:30
prateek srivastava 504a5ec038 issue fixed #791 2019-04-03 18:03:11 +05:30
Jitendra Singh 86198676a1
Merge pull request #792 from prateek-webkul/development
Development
2019-04-03 16:15:16 +05:30
prateek srivastava 1cb03f9ac3 admin scroller bug fixed 2019-04-03 15:23:12 +05:30
Jitendra Singh 3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach
flatten code
2019-04-03 14:49:22 +05:30
Jitendra Singh d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
Flatten code
2019-04-03 14:49:06 +05:30
Iman 759782c735 fix doc blocks (#787) 2019-04-03 12:34:35 +05:30
rahulshukla-webkul 23bb48e759 Development (#790)
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop

* issue #785 product name display

* merge with master & assests compile
2019-04-03 12:17:47 +05:30
prateek srivastava b655a848d7 admin scroller bug fixed 2019-04-03 12:17:23 +05:30
rahulshukla-webkul 9314d9159c Development (#789)
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop
2019-04-03 11:37:48 +05:30