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

454 Commits

Author SHA1 Message Date
prashant-webkul f5b4cc4c46 tiny mce integration on the way 2018-10-27 19:05:01 +05:30
prashant-webkul a643127eb3 Login page client validation issue fixed, login page wrong sign up translation issue fixed 2018-10-27 17:37:22 +05:30
prashant-webkul 18ff527319 Multiple addresses implemented for customer with the option of making the default address also, new radio button for checkout address selection made 2018-10-27 16:43:57 +05:30
rahul shukla fe0e9a51bf merge with master 2018-10-27 15:54:46 +05:30
rahul shukla da7ab87fa2 customer changes 2018-10-27 15:48:03 +05:30
prashant-webkul 8e2d45e498 TinyMCE integration and Slider Content Fixes 2018-10-26 19:59:24 +05:30
rahul shukla 68e6e5bb79 loader 2018-10-26 19:29:53 +05:30
prashant-webkul 32af436609 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 19:15:54 +05:30
prashant-webkul e3ce3ae45d slider fixes 2018-10-26 19:15:51 +05:30
JItendra Singh 7d68e20de6
Merge pull request #93 from bagisto/prashant 
Prashant
 2018-10-26 19:14:05 +05:30
jitendra 27b1f1fad9 Issues fixed 2018-10-26 19:13:01 +05:30
prashant-webkul 5d3047a0b4 Cart bug fixes and order datagrid bug fixes 2018-10-26 17:53:25 +05:30
prashant-webkul e5e2bf338e Disabled buy now until next merge 2018-10-26 16:47:54 +05:30
jitendra fbe8f844e1 Fixed seeders 2018-10-26 13:54:10 +05:30
jitendra 0231c26da2 Final Commit to first version 2018-10-26 13:16:18 +05:30
JItendra Singh fd399c1661
Merge pull request #88 from bagisto/prashant 
Prashant
 2018-10-26 13:07:29 +05:30
prashant-webkul 17e4491956 Merged With Master 2018-10-26 13:00:08 +05:30
rahul shukla 80f37ff0cb footer icon 2018-10-26 12:59:37 +05:30
prashant-webkul 74ba1afc64 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 12:58:52 +05:30
prashant-webkul d56061539b Bug fixes 2018-10-26 12:58:38 +05:30
jitendra 2d24f24c9c Conflict resolved 2018-10-26 12:54:39 +05:30
rahul shukla d9f4f73a58 conflict 2018-10-26 12:53:37 +05:30
jitendra 9c8c9c2a97 Now compiled asset will store in publishable folder 2018-10-26 12:52:43 +05:30
prashant-webkul d267a5bb27 Bug fixes 2018-10-26 12:40:30 +05:30
prashant-webkul 462dc9fafb Bug Fixes 2018-10-26 12:35:19 +05:30
rahul shukla fef483cb62 footer icon 2018-10-26 12:32:46 +05:30
prashant-webkul 74605cbeff storefront header fixed 2018-10-26 11:57:57 +05:30
rahul shukla 16fece01eb link &n margin on review 2018-10-26 11:32:07 +05:30
jitendra 69ea3a1830 Product grid inventory update implemented after order created 2018-10-26 11:28:24 +05:30
prashant-webkul cc9ad2c8ad Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 11:17:24 +05:30
prashant-webkul f69e396bfd Product grid update event bind successful 2018-10-26 11:14:42 +05:30
JItendra Singh d25172baff
Merge pull request #81 from bagisto/jitendra 
Issues fixed
 2018-10-26 10:24:09 +05:30
jitendra 52bf973307 Issues fixed 2018-10-26 10:23:35 +05:30
rahul shukla 007f945b05 conflict resolve 2018-10-26 09:59:33 +05:30
prashant-webkul d05b6451cc Product grid bug fixes 2018-10-26 09:54:26 +05:30
jitendra cc7b20e607 Merged 2018-10-26 09:51:39 +05:30
rahul shukla c8fd85fe4b conflict resolve 2018-10-26 09:50:46 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
JItendra Singh ee38c2be7f
Merge pull request #78 from bagisto/prashant 
Prashant
 2018-10-26 09:50:07 +05:30
prashant-webkul 7e75da7bdf Product datagrid event binded with product create 2018-10-26 09:49:19 +05:30
rahul shukla 781b960fa8 reviews issue 2018-10-25 21:45:28 +05:30
prashant-webkul 021d918937 product datagrid event binding 2018-10-25 19:35:28 +05:30
prashant-webkul 55f6e2f29a left with only the save product function for creating products datagrid 2018-10-25 19:29:34 +05:30
JItendra Singh 99a0590c69
Merge pull request #77 from bagisto/rahul 
Rahul
 2018-10-25 15:35:27 +05:30
prashant-webkul dc939d4ff2 Addition data for adding configurable product to cart, fixed 2018-10-25 15:33:49 +05:30
prashant-webkul ef37be5eca Merge with master 2018-10-25 15:26:24 +05:30
jitendra 210da46a12 Issue fixed 2018-10-25 15:25:10 +05:30
rahul shukla 84ba1d4fc6 error changes 2018-10-25 14:36:51 +05:30
rahul shukla af5b9d9f06 conflict resolve 2018-10-25 13:58:06 +05:30
prashant-webkul 1b83b23e53 merged with conflicted assets, recompile storefront 2018-10-25 13:51:03 +05:30
rahul shukla c9037806b0 error pages 2018-10-25 13:50:30 +05:30
prashant-webkul 683b18e424 Cart Bug Fixes and Category items fixes for visible in menu only 2018-10-25 13:49:23 +05:30
rahul shukla f281d01a53 error pages 2018-10-25 13:37:21 +05:30
jitendra 930cba9436 Issues fixed 2018-10-25 13:16:45 +05:30
jitendra 0f6bcfde49 Seeders added 2018-10-25 11:01:47 +05:30
rahul shukla d1e49a2170 logo-img 2018-10-25 10:56:03 +05:30
rahul shukla 8d9627c194 customer changes 2018-10-25 10:38:51 +05:30
rahul shukla 52999c971e Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-25 10:19:17 +05:30
JItendra Singh 2cdf0aedf0
Merge pull request #71 from bagisto/prashant 
Prashant
 2018-10-25 10:19:06 +05:30
prashant-webkul b055a65d24 Customer password reset route 2018-10-25 10:18:14 +05:30
jitendra c8e8240080 Merged Changes 2018-10-25 10:16:55 +05:30
rahul shukla 832d75485f product review 2018-10-25 10:13:26 +05:30
jitendra a95f56325c Issue fixed 2018-10-25 09:44:23 +05:30
prashant-webkul ec1ade3f57 Product Grid Autosync on Product Update Done 2018-10-23 18:47:28 +05:30
rahul shukla de0ea34e8a conflict resolve 2018-10-23 17:24:27 +05:30
rahul shukla 489c1cdd1b customer group & responsive 2018-10-23 17:21:04 +05:30
prashant-webkul 2c32f510b2 merged with master 2018-10-23 17:19:13 +05:30
JItendra Singh 56e8597c6f
Merge pull request #68 from bagisto/jitendra 
Dashboard completed
 2018-10-23 17:16:22 +05:30
prashant-webkul 96b40bf2c3 Products DataGrid 2018-10-23 17:16:00 +05:30
jitendra 13ae5d58c0 Dashboard completed 2018-10-23 17:15:44 +05:30
prashant-webkul 5016e03b1c Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products. 2018-10-22 18:48:46 +05:30
prashant-webkul 701c8e3602 Wishlist move to cart code is tested and its working fine 2018-10-22 16:10:05 +05:30
rahul shukla 399ba55982 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-22 11:18:29 +05:30
rahul shukla 5dc60d0fe1 customer group 2018-10-22 11:17:42 +05:30
prashant-webkul 1c78140272 Made the way to add configurable product to wishlist on the storefront. 2018-10-18 18:13:45 +05:30
prashant-webkul 371d2bb742 Wrote the code for moving configurable product to the wishlist 2018-10-18 17:42:41 +05:30
prashant-webkul 806ffb460f Order Datagrid, Datagrid Currency Capabilities via wrapper and UI fixes in storefront navigation bar, admin panel menu item, datagrid actions checks before rendering of datagrid 2018-10-18 16:34:55 +05:30
prashant-webkul d33b5c276e Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 15:52:47 +05:30
prashant-webkul 40ecc72b04
Merge pull request #67 from bagisto/jitendra 
Jitendra
 2018-10-18 15:52:22 +05:30
jitendra 1d5e1f5a21 Cart issues fixed 2018-10-18 15:21:08 +05:30
jitendra 70c47f44a9 Fixed cart issues 2018-10-18 15:01:19 +05:30
prashant-webkul 0b1f362d4b Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 14:00:31 +05:30
JItendra Singh 053b72e015
Merge pull request #66 from bagisto/jitendra 
Badge css added in Ui
 2018-10-18 13:59:16 +05:30
jitendra ad2fa3a678 Badge css added in Ui 2018-10-18 13:58:35 +05:30
prashant-webkul 6865545172 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 13:50:46 +05:30
JItendra Singh 6c0dfa6a96
Merge pull request #65 from bagisto/jitendra 
Front currency switcher, currency edit page and locale edit page added
 2018-10-18 13:49:45 +05:30
jitendra 12d68fcb57 Front currency switcher, currency edit page and locale edit page added 2018-10-18 13:49:03 +05:30
rahul shukla bd752c7e3e conflict 2018-10-18 12:55:00 +05:30
prashant-webkul db2b647de3 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 12:45:36 +05:30
prashant-webkul 51026b0dfd Mergin 2018-10-18 12:45:32 +05:30
JItendra Singh 14140d647a
Merge pull request #64 from bagisto/jitendra 
user on 404 page fixed
 2018-10-18 11:55:13 +05:30
jitendra 258262935a user on 404 page fixed 2018-10-18 11:54:36 +05:30
rahul shukla e91d6f184b loader css change 2018-10-18 11:00:04 +05:30
JItendra Singh e2229bc634
Merge pull request #63 from bagisto/prashant 
Prashant
 2018-10-18 10:46:46 +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 ef69538ccb Refactor css 2018-10-18 10:25:45 +05:30
prashant-webkul c670891b4f Customer Password Resets Migration File 2018-10-17 20:01:12 +05:30
prashant-webkul 3a1029290f Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-17 19:50:55 +05:30