Commit Graph

398 Commits

Author SHA1 Message Date
rahul shukla e91d6f184b loader css change 2018-10-18 11:00:04 +05:30
rahul shukla 7fe85d0549 loader changes 2018-10-18 10:45:35 +05:30
rahul shukla b5be4cf320 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-18 10:33:45 +05:30
rahul shukla dde2a626e6 laoder changes 2018-10-18 10:33:00 +05:30
JItendra Singh 66b3e0cf6e
Merge pull request #62 from bagisto/jitendra
Refactor css
2018-10-18 10:26:22 +05:30
jitendra ef69538ccb Refactor css 2018-10-18 10:25:45 +05:30
JItendra Singh 22713906d2
Merge pull request #61 from bagisto/jitendra
Get current channel code updated
2018-10-17 19:29:11 +05:30
jitendra b02d87626a Get current channel code updated 2018-10-17 19:27:51 +05:30
JItendra Singh 997a55e26e
Merge pull request #60 from bagisto/jitendra
Theme issue fixed
2018-10-17 16:17:34 +05:30
jitendra 9756480f42 Theme issue fixed 2018-10-17 16:17:03 +05:30
JItendra Singh 331828820a
Merge pull request #59 from bagisto/jitendra
Jitendra
2018-10-17 16:04:14 +05:30
jitendra b0a12d85a3 COnflict resloved 2018-10-17 16:03:25 +05:30
jitendra faab00c3b8 Bug fixed 2018-10-17 16:00:31 +05:30
JItendra Singh ea6625a33b
Merge pull request #58 from bagisto/rahul
Rahul
2018-10-17 15:22:22 +05:30
rahul shukla 2a96a3ee71 merge master 2018-10-17 15:18:34 +05:30
rahul shukla 541264f86a Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-17 15:16:35 +05:30
JItendra Singh db0f32ac37
Merge pull request #57 from bagisto/jitendra
Channel logo and favicon implementation added
2018-10-17 15:16:01 +05:30
jitendra 892bf53cc9 Channel logo and favicon implementation added 2018-10-17 15:15:18 +05:30
rahul shukla b329567370 conflict 2018-10-17 15:14:22 +05:30
rahul shukla 8009b5c647 error & loader 2018-10-17 13:10:08 +05:30
JItendra Singh 0bd7d83531
Merge pull request #56 from bagisto/prashant
Prashant
2018-10-17 13:06:58 +05:30
prashant-webkul 5fb2f78039 Merged with Master 2018-10-17 12:56:34 +05:30
prashant-webkul 3a3c89484d before merge 2018-10-17 12:53:01 +05:30
JItendra Singh ea4a793edf
Merge pull request #55 from bagisto/jitendra
Sales email templates added
2018-10-17 12:52:22 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
prashant-webkul c05ea63603 Before Merge 2018-10-17 12:30:48 +05:30
prashant-webkul ddc57abdfa Datagrid UI and Configuration fixes 2018-10-17 11:27:40 +05:30
prashant-webkul f195b335b6 Data Grid Configuration Fixes 2018-10-16 18:56:30 +05:30
prashant-webkul 91a4fabcfb Grid Sort Fixes 2018-10-16 17:18:45 +05:30
prashant-webkul 3a17aacd90 Wishlist Move To Cart For Simple Products Done 2018-10-15 20:18:58 +05:30
prashant-webkul 2f427d1550 After merge 2018-10-15 17:21:03 +05:30
prashant-webkul 8784fffe92 before merge 2018-10-15 17:19:28 +05:30
JItendra Singh 0b95681324
Merge pull request #54 from bagisto/rahul
Rahul
2018-10-15 16:18:49 +05:30
rahul shukla ec03cbd63e conflict resolve 2018-10-15 16:16:50 +05:30
rahul shukla f1a0a2bcda order 2018-10-15 16:15:29 +05:30
JItendra Singh d211e4d832
Merge pull request #53 from bagisto/jitendra
Order cancel implemented
2018-10-15 16:09:48 +05:30
jitendra 7f1675e37c Order cancel implemented 2018-10-15 16:09:09 +05:30
rahul shukla 5cc562d972 reviews 2018-10-15 14:32:26 +05:30
prashant-webkul 2613f9b93f Account pages for the customer fixed 2018-10-15 14:07:29 +05:30
rahul shukla 8717edf059 customer pannel 2018-10-15 13:52:27 +05:30
prashant-webkul 4bd252edde Customer account layout bug fixes 2018-10-15 13:51:42 +05:30
prashant-webkul f5188d4b83 Customer account styles generalized 2018-10-15 13:50:37 +05:30
rahul shukla ba2ad4bd28 customer fixes 2018-10-15 10:22:00 +05:30
prashant-webkul 1bf6ce539e Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 18:35:04 +05:30
JItendra Singh bc617e8b1e
Merge pull request #52 from bagisto/jitendra
Tax issue fixed
2018-10-12 18:34:55 +05:30
jitendra e92010f55f Tax issue fixed 2018-10-12 18:34:15 +05:30
prashant-webkul b33d7c1aa1 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
Countries and States list component to be devised for system wide usage.
2018-10-12 18:24:58 +05:30
JItendra Singh 3214e71438
Merge pull request #51 from bagisto/jitendra
Countries and States models added
2018-10-12 18:24:50 +05:30
prashant-webkul a7e813ff0d Before merge 2018-10-12 18:24:13 +05:30
jitendra 1e16931ba3 Countries and States models added 2018-10-12 18:24:10 +05:30