Commit Graph

724 Commits

Author SHA1 Message Date
rahul shukla b50ef64cec merge with master 2018-12-04 11:53:56 +05:30
rahul shukla 4201a1ec48 export completed 2018-12-04 11:52:01 +05:30
JItendra Singh e7796ced9e
Merge pull request #259 from bagisto/jitendra
Fixed Conflicts
2018-12-04 11:42:34 +05:30
jitendra 5cfdeee743 Fixed Conflicts 2018-12-04 11:41:55 +05:30
rahul shukla 2f555a798c export 2018-12-04 10:52:15 +05:30
JItendra Singh 657bf1265b
Merge pull request #258 from bagisto/jitendra
Jitendra
2018-12-04 10:42:35 +05:30
jitendra 94a1cd9800 Compiled assets for production 2018-12-04 10:42:02 +05:30
JItendra Singh a60ca52eb6
Merge pull request #257 from bagisto/prashant
Prashant
2018-12-04 10:38:35 +05:30
rahul shukla bd1489dac6 export 2018-12-04 10:07:57 +05:30
jitendra f75cfe66fc ACL issue fixed 2018-12-04 09:56:15 +05:30
rahul shukla 27f5e1d93d export 2018-12-04 09:53:52 +05:30
prashant-webkul 40f37cddd4 customer group add and delete fixes 2018-12-03 18:58:57 +05:30
prashant-webkul 5d42bebbf1 Customer group delete bug fix 2018-12-03 18:50:20 +05:30
prashant-webkul 0c8ad35357 link removal from wishlist 2018-12-03 18:39:29 +05:30
prashant-webkul 510f6e6f63 minor fixes in the merge cart function of cart 2018-12-03 18:37:29 +05:30
JItendra Singh 4977428cca
Merge pull request #256 from AliN11/master
Optimized and minified ExceptionHandler
2018-12-03 14:42:35 +05:30
prashant-webkul 94f2637bc0 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-12-03 13:48:18 +05:30
Prashant Singh f546cfce30
Merge pull request #255 from imanghafoori1/master
Update TaxCategoryController.php -> PR #255 accepted.
2018-12-03 13:47:59 +05:30
prashant-webkul 48bece3531 datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also. 2018-12-03 13:41:35 +05:30
Ali Nazari 3ea703c367 optimized ExceptionHandler 2018-12-01 13:33:32 +03:30
Iman 264bc14ed3
Update TaxCategoryController.php 2018-12-01 10:48:19 +03:30
Ali Nazari a794ccff74
Merge pull request #1 from bagisto/master
Sync to the original
2018-11-30 21:09:26 +03:30
prashant-webkul 552bf4b1f9 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-11-30 20:38:15 +05:30
prashant-webkul 7fb67dc161 mass operations and datagrid operations normalization 2018-11-30 20:37:41 +05:30
Prashant Singh 51baeeb0b9
updated readme 2018-11-30 20:36:48 +05:30
Prashant Singh 59293efe83
updated readme 2018-11-30 19:41:29 +05:30
JItendra Singh a71d178b03
Merge pull request #254 from bagisto/jitendra
Category image issue fixed
2018-11-30 18:57:58 +05:30
jitendra 8ae76038fc Category image issue fixed 2018-11-30 18:57:13 +05:30
JItendra Singh 14c3a97ce1
Merge pull request #253 from bagisto/jitendra
Add to cart issue fixed
2018-11-30 14:52:12 +05:30
jitendra f0b1bcc6f4 Add to cart issue fixed 2018-11-30 14:51:35 +05:30
JItendra Singh 14b338556e
Merge pull request #251 from bagisto/prashant
Cart flash message fixed
2018-11-30 14:46:17 +05:30
JItendra Singh 83491fd612
Merge pull request #252 from bagisto/jitendra
Issue #247 (Displaying wrong number of products and sales in category…
2018-11-30 14:46:04 +05:30
prashant-webkul 1ba21f281d Cart flash message fixed 2018-11-30 13:24:54 +05:30
Prashant Singh 57ed86981b
Merge pull request #250 from bagisto/prashant
cart bug fixes and small css fix
2018-11-30 13:13:38 +05:30
prashant-webkul 36f6783db8 cart bug fixes and small css fix 2018-11-30 13:10:41 +05:30
Prashant Singh ac18050967
Updated CHANGELOG for v0.1.x 2018-11-30 12:22:55 +05:30
jitendra 4e8081ed58 Issue #247 (Displaying wrong number of products and sales in category, on dashboard) 2018-11-30 12:15:10 +05:30
JItendra Singh 66639afb6c
Merge pull request #249 from bagisto/rahul
Rahul
2018-11-29 18:14:32 +05:30
rahul shukla 984ff18267 merge with master 2018-11-29 18:13:45 +05:30
JItendra Singh 1bc3fc9b3c
Merge pull request #248 from bagisto/prashant
Prashant
2018-11-29 18:09:41 +05:30
prashant-webkul a6adfe679c admin newsletter datagrid translation fixes 2018-11-29 18:08:37 +05:30
rahul shukla bb310cd5c7 route change 2018-11-29 18:07:58 +05:30
prashant-webkul 5f81a79796 Subscription newsletter migration restored and subsctiption newsletter datagrid in admin 2018-11-29 18:05:56 +05:30
rahul shukla 64939485c5 merge with master 2018-11-29 17:52:25 +05:30
rahul shukla e1b2d1eb01 export for customer 2018-11-29 17:39:39 +05:30
prashant-webkul fad4bb83f7 enter key code enabled in datagrid search box 2018-11-29 15:58:42 +05:30
prashant-webkul e1f7b4deff datagrid issue fixes, some column aliases were using underscores due to a bug in symfony it was getting converted into dot, all the aliases are now underscore free 2018-11-29 15:40:23 +05:30
rahul shukla 77c501f170 dfd 2018-11-29 13:52:08 +05:30
rahul shukla a0df76e775 search issue fixed 2018-11-29 13:43:52 +05:30
prashant-webkul 5de07d1b35 mini cart configurable options displaying all in bold now converted back to normal 2018-11-29 13:29:38 +05:30