merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
751 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

751 Commits

Author SHA1 Message Date
JItendra Singh ac3a2d5860
Merge pull request #336 from bagisto/rahul 
Rahul
 2018-12-18 13:40:04 +05:30
rahul shukla 9cdc16a50b conflict resolve 2018-12-18 13:39:15 +05:30
rahul shukla e3e80dde1e #305 & #298 2018-12-14 17:36:49 +05:30
rahul shukla b298a3973a validation in shipping & payment methods and issue #308 & #295 2018-12-14 15:26:01 +05:30
JItendra Singh c26af29596
Merge pull request #317 from bagisto/jitendra 
Modified config creation
 2018-12-14 15:03:39 +05:30
jitendra 9a699a64e5 Modified config creation 2018-12-14 15:02:59 +05:30
JItendra Singh dec1e2254f
Merge pull request #316 from bagisto/jitendra 
Removed event from menu, acl, config creation
 2018-12-14 13:58:14 +05:30
jitendra 2decdeb194 Removed event from menu, acl, config creation 2018-12-14 13:56:05 +05:30
rahul shukla 8cd04be89c shipping & payment methods 2018-12-14 11:56:52 +05:30
JItendra Singh 56d014f1af
Merge pull request #313 from bagisto/jitendra 
Jitendra
 2018-12-13 16:29:07 +05:30
jitendra 0bdd9e1a2a Refactor Menu system and core config data system 2018-12-13 16:28:28 +05:30
jitendra 15135d64d7 Fixed menu sort issue 2018-12-12 16:26:20 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +05:30
JItendra Singh e4530c0965
Merge pull request #299 from bagisto/jitendra 
Jitendra
 2018-12-07 12:41:02 +05:30
jitendra 9d41172512 Refactor core config system 2018-12-07 12:38:29 +05:30
jitendra 3515adeb03 Refactor core config system 2018-12-07 12:35:34 +05:30
JItendra Singh 14b619b747
Merge pull request #294 from bagisto/rahul 
Rahul
 2018-12-07 11:01:50 +05:30
rahul shukla c90789a210 merge with master 2018-12-07 11:00:02 +05:30
rahul shukla b78cc23797 shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable 2018-12-07 10:55:33 +05:30
JItendra Singh 5f5249abe4
Merge pull request #292 from bagisto/jitendra 
Product flat migration added
 2018-12-07 10:52:17 +05:30
jitendra 2fa8799694 Product flat migration added 2018-12-07 10:51:40 +05:30
JItendra Singh f69ac4870b
Merge pull request #290 from bagisto/jitendra 
Issue #287 (Customer order grid pending payment status issues)
 2018-12-06 17:36:47 +05:30
jitendra 7af2514748 Issue #287 (Customer order grid pending payment status issues) 2018-12-06 17:36:08 +05:30
JItendra Singh afa69be0ce
Merge pull request #289 from bagisto/jitendra 
Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165
 2018-12-06 17:30:10 +05:30
jitendra e29c5f39f0 Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165 2018-12-06 17:29:26 +05:30
JItendra Singh fa1ff2c9c1
Merge pull request #265 from bagisto/jitendra 
View Render Event system implemented
 2018-12-04 18:07:58 +05:30
jitendra aa3ba95250 View Render Event system implemented 2018-12-04 16:35:30 +05:30
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