Commit Graph

1874 Commits

Author SHA1 Message Date
Prashant Singh ea04a8c944 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 18:38:32 +05:30
Prashant Singh 025a5a9146 changed product zoomer config 2019-04-09 18:38:17 +05:30
rahul shukla b27afc6e1e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 18:00:19 +05:30
rahul shukla e5d71fa280 change in jquery for wishlist icon for zoom 2019-04-09 17:59:58 +05:30
naresh verma 642ef2b1c1 reverting config changes 2019-04-09 17:23:37 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
jitendra fb6ffaa9d9 JWT implemented for customer api authorization 2019-04-09 16:27:33 +05:30
rahul shukla 5e15e05c78 tax category message change 2019-04-09 16:15:04 +05:30
Jitendra Singh 7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
Development
2019-04-09 15:52:46 +05:30
rahul shukla 6a7f247d7a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 15:30:52 +05:30
Jitendra Singh a8f00f37f7
Merge pull request #811 from jitendra-webkul/jitendra
Theme finder issue fixed (Shop changes was reflecting in admin)
2019-04-09 15:23:36 +05:30
jitendra 6b247993e4 Theme finder issue fixed (Shop changes was reflecting in admin) 2019-04-09 15:22:45 +05:30
rahul shukla a3999d7a23 merge with master 2019-04-09 15:13:26 +05:30
rahul shukla 9d89ec816d comment, variable name changes 2019-04-09 14:17:18 +05:30
Jitendra Singh 4840b0361b
Merge pull request #810 from prashant-webkul/development
Development
2019-04-09 14:15:59 +05:30
rahul shukla 09aa34b36a issue #749 fixed again & reduce query 2019-04-09 14:05:57 +05:30
Prashant Singh 1ec1c5d83c fixed some bugs 2019-04-09 13:29:31 +05:30
Prashant Singh 1ca1ae5b61 Changed responses for all backend destroy functions and removed dead commented code 2019-04-09 13:17:19 +05:30
Prashant Singh b3bf66c6e2 Base sync with master 2019-04-09 12:53:31 +05:30
Prashant Singh 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
Jitendra Singh 8d4e44cd67
Merge pull request #809 from rahulshukla-webkul/development
Development
2019-04-09 12:13:38 +05:30
rahul shukla 8e7c3c7f22 restore migration 2019-04-09 12:12:35 +05:30
rahul shukla dbde05e0cd change in delete query 2019-04-09 12:05:52 +05:30
Prashant Singh 09d6afc72a Implemented customer configuration based features:
1. Email Verification.
2. Email Subscription.
2019-04-09 08:03:31 +05:30
Prashant Singh 6c74b2ca42 admin assets compiled for production 2019-04-09 06:33:36 +05:30
Prashant Singh 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
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
rahul shukla efd38ab99e issue #718 2019-04-08 19:33:23 +05:30
rahul shukla 57aaa28966 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-08 16:54:42 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +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