Commit Graph

3152 Commits

Author SHA1 Message Date
prateek srivastava 9794fc659e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-13 12:45:07 +05:30
Prashant Singh 685aedf528 getEligble items in action fixed as its was not working as boolean expression 2019-09-13 12:22:50 +05:30
Prashant Singh d02c903470 Support request template 2019-09-13 11:37:00 +05:30
Prashant Singh a7b2925db4 Fixed issue #1452 2019-09-13 11:01:54 +05:30
Jitendra Singh cdbd654f4f
Merge pull request #1451 from prashant-webkul/development
Development
2019-09-13 10:18:24 +05:30
Prashant Singh fa1af6f8e0 Templates moved in ISSUE_TEMPLATE directory 2019-09-13 00:40:42 +05:30
Prashant Singh 6dfa36871e github template added for support, bugs/issues, feature and security vulnerabilities. 2019-09-13 00:37:58 +05:30
Jitendra Singh 928ac803a9
Merge pull request #1450 from rahulshukla-webkul/development
Issue #1447
2019-09-12 21:38:38 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 5fd72de3a9 Issue #1249 2019-09-12 18:31:40 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
rahul shukla 61da74ee2b Issue #1447 2019-09-12 16:25:51 +05:30
Prashant Singh b089149268 Fixed issue #1428 2019-09-12 16:21:03 +05:30
Jitendra Singh 9a443b6f3b
Merge pull request #1446 from prashant-webkul/development
Command line installer fix
2019-09-12 15:52:58 +05:30
Prashant Singh b55f6c5ed4 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-09-12 15:24:05 +05:30
Prashant Singh 2c928ea25c Fixed issue #1288 2019-09-12 15:23:29 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
Prashant Singh 90a965a537 Command line installer fix 2019-09-12 11:51:11 +05:30
Jitendra Singh e604037adf
Merge pull request #1445 from prashant-webkul/development
Fixed issue #1288 #1434 #1444
2019-09-12 11:14:27 +05:30
Prashant Singh d5bbc0230d Fixed issue #1288 2019-09-11 20:15:41 +05:30
Prashant Singh 6c82802371 Fixed issues #1444 & #1434 2019-09-11 20:10:59 +05:30
Jitendra Singh 5c2cb7b90c
Merge pull request #1443 from rahulshukla-webkul/development
Development
2019-09-11 18:26:29 +05:30
rahul shukla d9a0c6078e order number 2019-09-11 17:47:52 +05:30
rahul shukla aab8bd1479 order number 2019-09-11 17:34:11 +05:30
Jitendra Singh ac48a20822
Merge pull request #1343 from lemmeV/master
added configurable order numbers
2019-09-11 15:51:30 +05:30
jitendra e17c2c5f40 Merged with master 2019-09-11 15:23:57 +05:30
Jitendra Singh 8281ea0088
Merge pull request #1441 from rahulshukla-webkul/development
error in cancel mail
2019-09-11 13:57:41 +05:30
Jitendra Singh 3cd49daa5c
Merge pull request #1440 from prashant-webkul/development
Fixed a translation typo in create cart rule form
2019-09-11 13:57:35 +05:30
rahul shukla ce59e8b1d5 error in cancel mail 2019-09-11 13:55:07 +05:30
Prashant Singh e6104668e0 Fixed a translation typo in create cart rule form 2019-09-11 13:52:24 +05:30
Jitendra Singh 7c9d8a06ed
Merge pull request #1439 from prashant-webkul/development
Removed setInvoker method and allowed property to get set in Datagrid…
2019-09-11 13:47:01 +05:30
jitendra 484fb56e54 Price added to downloadable product links 2019-09-11 13:46:33 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Jitendra Singh b3ca0200ac
Merge pull request #1387 from codeinnovers/master
fixed issue  #1371
2019-09-11 13:13:13 +05:30
Prashant Singh d48fe8d435 Removed setInvoker method and allowed property to get set in Datagrid's constructor. 2019-09-11 12:59:51 +05:30
Jitendra Singh fe335a0e70
Merge pull request #1437 from prashant-webkul/development
Datagrid add column, action and mass action dynamic event fire. Command line utility for installation.
2019-09-11 12:35:34 +05:30
jitendra e250bc0602 Tax not getting applied if only order is placed for virtual product and downloadable product or for both. 2019-09-11 12:31:25 +05:30
jitendra 1ce4dfea95 Merge cart issue fixed for downloadable product 2019-09-11 11:21:12 +05:30
Prashant Singh 82ae345fdf Generate products 2019-09-11 07:03:40 +05:30
Prashant Singh 2c45bddb11 Command line installation utility, console status strings written. 2019-09-11 06:41:48 +05:30
Prashant Singh e0778b394a Command line installation utility enchancements 2019-09-11 06:37:41 +05:30
Prashant Singh 2bbb85455a Bagisto command line installer for artisan commands 2019-09-11 06:10:20 +05:30
Prashant Singh b7d604ed31 Datagrid events unleashed 2019-09-11 03:18:32 +05:30
Prashant Singh 1e22e61282 Base sync 2019-09-11 03:11:55 +05:30
Prashant Singh 98e8f3c57d All datagrids are generating before add column, action and mass action 2019-09-11 03:10:38 +05:30
Prashant Singh 7d7cda1f73 Datagrid add column before and after event added 2019-09-11 01:32:35 +05:30
jitendra 128dde536e Fixed issues of bundle, downloadable products 2019-09-10 19:22:11 +05:30
Jitendra Singh 460256e2db
Merge pull request #1435 from ghermans/sessionTime
Increased the session lifetime
2019-09-10 17:58:39 +05:30
Prashant Singh 69e46a7ddd Fixed translation issues in discount forms 2019-09-10 17:58:19 +05:30
Glenn Hermans 218e486baf
Increased the session timeout 2019-09-10 14:25:07 +02:00