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

867 Commits

Author SHA1 Message Date
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
JItendra Singh 4e89ce082e
Merge pull request #422 from jitendra-webkul/jitendra 
Channel root category feature added
 2018-12-31 16:35:50 +05:30
jitendra cb3da5fc08 Channel root category feature added 2018-12-31 16:34:26 +05:30
JItendra Singh e387cec43f
Merge pull request #420 from jitendra-webkul/jitendra 
Moved catalog event from controllers to repositories
 2018-12-27 18:59:41 +05:30
JItendra Singh 27d3f517fe
Merge pull request #419 from jitendra-webkul/jitendra 
Removed auth middleware from controllers
 2018-12-27 18:58:56 +05:30
jitendra abd3bba617 Moved catalog event from controllers to repositories 2018-12-27 18:57:39 +05:30
jitendra 9581082f56 Removed auth middleware from controllers 2018-12-27 17:05:05 +05:30
JItendra Singh 857db4f244
Merge pull request #418 from prashant-webkul/development 
Development
 2018-12-27 16:34:07 +05:30
Prashant Singh 0d64d96c9c Merge branch 'master' of https://github.com/prashant-webkul/bagisto into development 2018-12-27 16:29:57 +05:30
Prashant Singh 8fb2c1a99a
Merge pull request #5 from bagisto/master 
Necessary merge with master to fetch the new improvements of shipping
 2018-12-27 16:29:42 +05:30
Prashant Singh 0a2a6c4234 conflicts in class attribute of storefront search and datagrid's search box 2018-12-27 16:22:44 +05:30
JItendra Singh be2cf2372d
Merge pull request #417 from jitendra-webkul/jitendra 
Changed registration page input tag to button
 2018-12-27 13:04:47 +05:30
jitendra fec802b4af Changed registration page input tag to button 2018-12-27 13:03:54 +05:30
JItendra Singh 9a730af7ed
Merge pull request #416 from jitendra-webkul/jitendra 
Refactor state grouping by country
 2018-12-27 11:36:17 +05:30
jitendra 336284ee6e Refactor state grouping by country 2018-12-27 11:35:10 +05:30
JItendra Singh dfd30bc2b3
Merge pull request #415 from jitendra-webkul/jitendra 
License link added in readme file
 2018-12-26 20:11:29 +05:30
jitendra 1bc6ea72e8 License link added in readme file 2018-12-26 20:10:38 +05:30
JItendra Singh 575f4b4bf2
Merge pull request #414 from bagisto/add-license-1 
Create LICENSE
 2018-12-26 19:54:56 +05:30
JItendra Singh 0cb5eacd9e
Create LICENSE 2018-12-26 19:54:44 +05:30
JItendra Singh 69875dac77
Merge pull request #411 from jitendra-webkul/jitendra 
Per unit and per order feature added in Flatrate shipping
 2018-12-26 19:34:00 +05:30
jitendra de90ab1d6a Per unit and per order feature added in Flatrate shipping 2018-12-26 19:33:01 +05:30
JItendra Singh feb6c8cc76
Merge pull request #409 from jitendra-webkul/jitendra 
Get config for shipping and payment method updated
 2018-12-26 18:54:06 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
JItendra Singh a3d2f121aa
Merge pull request #408 from jitendra-webkul/jitendra 
Jitendra
 2018-12-26 18:35:51 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
Prashant Singh 1cd685cee9 Merge branch 'master' of https://github.com/prashant-webkul/bagisto into development 2018-12-26 15:40:11 +05:30
Prashant Singh 759994d259
Merge pull request #4 from bagisto/master 
Merge pull request #406 from prashant-webkul/master
 2018-12-26 15:39:25 +05:30
Prashant Singh 24cf46fb4a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2018-12-26 15:33:13 +05:30
jitendra 2e668c7020 Inventory source selection feature added during shipment creation 2018-12-26 15:30:23 +05:30
JItendra Singh 2de5528372
Merge pull request #406 from prashant-webkul/master 
Merge pull request #3 from bagisto/master
 2018-12-26 15:28:57 +05:30
Prashant Singh e39e842bd5 erge branch 'master' of https://github.com/prashant-webkul/bagisto 2018-12-26 15:11:52 +05:30
Prashant Singh bb6eb04b30
Merge pull request #3 from bagisto/master 
merge with head to base forks
 2018-12-26 15:11:23 +05:30
Prashant Singh 182bdba0e6
Merge branch 'master' into master 2018-12-26 15:11:09 +05:30
Prashant Singh f040129cbb Merged with master #404 2018-12-26 15:02:38 +05:30
rahul shukla 95161d9101 changes in config 2018-12-26 14:59:52 +05:30
JItendra Singh c5c1cbf4ae
Merge pull request #404 from rahulshukla-webkul/development 
Development
 2018-12-26 14:57:55 +05:30
rahul shukla 54e359fb1a Merge branch 'master' of https://github.com/rahulshukla-webkul/bagisto into rahul 2018-12-26 14:53:13 +05:30
rahulshukla-webkul 4c2df325e9
Merge pull request #1 from bagisto/master 
merge with master
 2018-12-26 14:52:34 +05:30
rahul shukla 1e25226997 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-26 14:47:50 +05:30
rahul shukla 9bb9ae5ce7 configuration changes 2018-12-26 14:46:27 +05:30
Prashant Singh ee0ab9107d Shipping origin configuration 2018-12-26 13:59:51 +05:30
Prashant Singh 14ee9beb69 Slider validation fix, wasn't able to create slider layers 2018-12-24 15:33:39 +05:30
Prashant Singh ebbad1013f datagrid checkbox alignment issue resolved 2018-12-24 13:19:39 +05:30
Prashant Singh 851b25447f Merge branch 'master' of https://github.com/bagisto/bagisto 2018-12-24 11:18:43 +05:30
Prashant Singh bd02219f13
Merge pull request #2 from prashant-webkul/Prashant 
datagrid date filter was not working with aliases is not fixed #392
 2018-12-22 18:16:50 +05:30
Prashant Singh c939a57303
Merge pull request #394 from prashant-webkul/Prashant 
Prashant -> fixes for #392 #319 #304 #378, #379 #373 #369
 2018-12-22 18:10:22 +05:30
Prashant Singh 3789587584 datagrid date filter was not working with aliases is not fixed #392 2018-12-22 18:07:45 +05:30
Prashant Singh b2a63c05cd
Merge pull request #1 from prashant-webkul/Prashant 
Prashant
 2018-12-22 16:21:45 +05:30