Commit Graph

1031 Commits

Author SHA1 Message Date
Prashant Singh 1fd1cb2a9d
Merge pull request #9 from bagisto/master
syncing master with Bagisto's master
2019-01-25 04:46:41 +00:00
JItendra Singh 893d0a3c3b
Merge pull request #480 from jitendra-webkul/jitendra
Category add link fixed
2019-01-21 17:19:20 +05:30
jitendra 5381f8ea8e Fixed 2019-01-21 17:18:39 +05:30
jitendra 14730fe432 Category add link fixed 2019-01-21 16:19:38 +05:30
JItendra Singh 0df4204fa1
Merge pull request #479 from jitendra-webkul/jitendra
Seeder issue fixed
2019-01-21 15:52:14 +05:30
jitendra dd36c2adf1 Seeder issue fixed 2019-01-21 15:51:28 +05:30
JItendra Singh 8b57098ca0
Merge pull request #478 from jitendra-webkul/jitendra
Asset compiled for production
2019-01-21 15:27:10 +05:30
jitendra 42eb46e78c Asset compiled for production 2019-01-21 15:26:00 +05:30
JItendra Singh 85fbb95c45
Merge pull request #477 from jitendra-webkul/jitendra
Category seeder added
2019-01-21 14:37:38 +05:30
jitendra 61c10dd48d Category seeder added 2019-01-21 14:36:38 +05:30
JItendra Singh b845744365
Merge pull request #475 from jitendra-webkul/jitendra
Added view event manager to checkout and cart page
2019-01-18 18:16:42 +05:30
jitendra 33a75c306d Added view event manager to checkout and cart page 2019-01-18 18:16:05 +05:30
JItendra Singh e7c5c373e2
Merge pull request #474 from jitendra-webkul/jitendra
Inventory issue fix
2019-01-18 17:24:25 +05:30
jitendra 70a24a64b9 Inventory issue fix 2019-01-18 17:23:36 +05:30
JItendra Singh 71df0dea94
Merge pull request #473 from jitendra-webkul/jitendra
Issue #389 fixed
2019-01-18 16:49:58 +05:30
jitendra b418b27de3 Issue #389 fixed 2019-01-18 16:49:03 +05:30
JItendra Singh 63f141e3bd
Merge pull request #472 from jitendra-webkul/jitendra
Issues fixed
2019-01-18 16:41:22 +05:30
jitendra fbbf1fe99f Issues fixed 2019-01-18 16:40:40 +05:30
JItendra Singh a877be009e
Merge pull request #471 from prashant-webkul/development
Datagrid display issue fixed when toggling mass actions.
2019-01-18 15:04:30 +05:30
Prashant Singh bcb2661722 Datagrids display issue fixed when toggling massactions 2019-01-18 14:59:19 +05:30
Prashant Singh 0edebcf5c7 Table display issues when use mass actions filters and products flat events 2019-01-18 13:08:42 +05:30
JItendra Singh 871bf40d3a
Merge pull request #470 from jitendra-webkul/jitendra
Global Event bus added for vue
2019-01-18 13:05:32 +05:30
jitendra 00b9007d99 Global Event bus added for vue 2019-01-18 13:04:49 +05:30
JItendra Singh afce42bf0c
Merge pull request #469 from rahulshukla-webkul/development
Development
2019-01-18 12:10:47 +05:30
rahul shukla 00ac9bbc01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-18 12:06:34 +05:30
rahul shukla e2cfd0683c installer changes for windows 2019-01-18 12:05:53 +05:30
JItendra Singh 02aaeff1b5
Merge pull request #468 from jitendra-webkul/jitendra
Issue #457 fixed
2019-01-18 11:01:38 +05:30
jitendra 4363dc17b2 Issue #457 fixed 2019-01-18 11:00:55 +05:30
JItendra Singh 6fd66a7cb4
Merge pull request #467 from jitendra-webkul/jitendra
Extra new line removed from order repository
2019-01-18 10:49:21 +05:30
jitendra c596ee8abe Extra new line removed from order repository 2019-01-18 10:48:25 +05:30
JItendra Singh 4615c39504
Merge pull request #466 from prashant-webkul/development
datagrid's configuration dependency is removed and dynamic row format…
2019-01-18 10:46:01 +05:30
Prashant Singh e2037c4892 datagrid's configuration dependency is removed and dynamic row format is back 2019-01-18 10:33:42 +05:30
rahul shukla bd9ddfb0d7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 20:22:20 +05:30
rahul shukla d50bb3e962 configuration message 2019-01-17 20:22:01 +05:30
JItendra Singh f0d600d510
Merge pull request #465 from jitendra-webkul/jitendra
Updated event code for order action
2019-01-17 17:29:50 +05:30
jitendra 4488002522 Updated event code for order action 2019-01-17 17:29:07 +05:30
JItendra Singh d49cc6e04b
Merge pull request #464 from jitendra-webkul/jitendra
Added Order Cancel Event
2019-01-17 17:21:16 +05:30
jitendra d19d57997e Added Order Cancel Event 2019-01-17 17:17:53 +05:30
JItendra Singh 914b192399
Merge pull request #463 from prashant-webkul/development
Development
2019-01-17 16:55:01 +05:30
Prashant Singh e7b2bdb72c sort issue fixed, will not work when false is passed 2019-01-17 16:51:59 +05:30
Prashant Singh 0e94d67a79 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 16:42:26 +05:30
JItendra Singh fc923e5c61
Merge pull request #462 from jitendra-webkul/jitendra
Sub Total Column added to the order grid
2019-01-17 16:25:38 +05:30
jitendra 5130a640c1 Sub Total Column added to the order grid 2019-01-17 16:24:57 +05:30
Prashant Singh 83e44c75f5 mass action validation 2019-01-17 16:17:30 +05:30
Prashant Singh f1cae49dab key too long fix by reducing key length to 191 bytes 2019-01-17 15:35:44 +05:30
JItendra Singh c58dfe11ee
Merge pull request #461 from prashant-webkul/development
Development
2019-01-17 15:27:29 +05:30
Prashant Singh eb373d7ecb More changes in datagrid, regarding implementation of wrapper columns 2019-01-17 15:24:58 +05:30
rahul shukla bac0d48ab3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 15:18:11 +05:30
rahul shukla e018d6555f export issue 2019-01-17 15:17:44 +05:30
Prashant Singh 98858ee12a changes in readme 2019-01-17 13:09:16 +05:30