Commit Graph

7619 Commits

Author SHA1 Message Date
rahul shukla 54002459f3 Issue #3572 done 2021-01-20 20:55:12 +05:30
rahul shukla 4ba2ed0e3b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-20 15:00:51 +05:30
rahul shukla ed1ae6aed5 Issue #4435 and #4436 2021-01-20 15:00:37 +05:30
Glenn Hermans 18111309a5
Merge pull request #4422 from devansh-webkul/vul-issue
Vulnerability Fixed For PHP Office
2021-01-20 10:23:43 +01:00
devansh bawari 6d788b096a Merge branch 'master' into vul-issue 2021-01-20 14:21:01 +05:30
Glenn Hermans 76debfbe8b
Merge pull request #4497 from devansh-webkul/ignored-files-and-clean-up
Ignored files and clean up
2021-01-19 15:32:18 +01:00
Jitendra Singh 59a239445b
Merge pull request #4496 from dev-smlee/master
fix typo
2021-01-19 19:33:21 +05:30
devansh bawari cd94346364 Merge remote-tracking branch 'upstream/master' into ignored-files-and-clean-up 2021-01-19 13:26:04 +05:30
devansh bawari 0b7475c2bb Some Cleanups And Ignored Files 2021-01-19 13:24:20 +05:30
andy cdd037e0ae fix typo 2021-01-19 16:09:53 +09:00
Glenn Hermans 775ab910d1
Added missed condition in marketing 2021-01-18 18:02:42 +01:00
rahul shukla 9f67e46ef8 added missed condition in marketing 2021-01-18 20:13:46 +05:30
Glenn Hermans 5b52af7c67
Merge pull request #4488 from rahulshukla-webkul/development
Issue #4432 fixed
2021-01-18 14:22:47 +01:00
devansh bawari 1fd9b6fa87 Merge branch 'master' into vul-issue 2021-01-18 18:51:17 +05:30
rahul shukla e61d89a3d0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-18 16:24:09 +05:30
rahul shukla 142f04ad41 fixing as per comment 2021-01-18 16:23:53 +05:30
Glenn Hermans 2b276acd55
Merge pull request #4493 from devansh-webkul/temp-fix
Manual Require Added Till Merging Of Autoloading Fix #4420
2021-01-18 10:59:48 +01:00
devansh bawari 99f797c814 Manual Require Added 2021-01-18 10:51:32 +05:30
Glenn Hermans 0a22c34b4d
Merge pull request #4485 from devansh-webkul/issue-4481
Fixed shipping costs which are not calculated with grand total #4481
2021-01-15 23:13:48 +01:00
rahul shukla 98d8738744 enhancement #4468 added for velocity theme 2021-01-15 19:03:39 +05:30
rahul shukla 57b89f53ee enhancement #4468 added for velocity theme 2021-01-15 19:00:55 +05:30
rahul shukla 3420f282ff Issue #4432 fixed 2021-01-15 18:26:27 +05:30
Glenn Hermans b168a3f0b5
Merge pull request #4487 from rahulshukla-webkul/development 2021-01-15 13:29:10 +01:00
rahul shukla 228473851e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-15 16:53:42 +05:30
Glenn Hermans 1368124ed4
Merge pull request #4464 from devansh-webkul/issue-4399
Fixed role-based security issue in which user with no permission has acces to some admin pages/controls #4399
2021-01-15 12:19:17 +01:00
rahul shukla 349c39fdc9 Enhancement #4468 done 2021-01-15 15:57:54 +05:30
rahul shukla ada41f9416 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-15 13:28:06 +05:30
rahul shukla 6d59ac6515 Issue #4486 fixed 2021-01-15 13:27:46 +05:30
devansh bawari bf154aa2c4 Added Case Back 2021-01-15 11:09:07 +05:30
Glenn Hermans 3ea4f189e8
Merge pull request #4484 from ghermans/install_docs
Fixed url & removed OS/CPU requirements
2021-01-14 18:52:21 +01:00
Glenn Hermans c5677ec93b
Removed security risk 2021-01-14 18:50:29 +01:00
Glenn Hermans 2e316bf619
Merge pull request #4483 from ghermans/install_docs 2021-01-14 18:42:29 +01:00
Glenn Hermans 7b6b620730
Removed bagisto-standard from installation steps 2021-01-14 18:34:40 +01:00
Glenn Hermans ebc31b1af6
Merge pull request #11 from bagisto/master 2021-01-14 18:33:14 +01:00
Glenn Hermans d3b5d3e90c
Merge pull request #4482 from ghermans/publish-shop-views
Publish the shop views to the themes directory
2021-01-14 18:26:16 +01:00
Glenn Hermans c127e7429c
Added publish path for shop views 2021-01-14 18:08:57 +01:00
Glenn Hermans ac60723ef0
Merge pull request #10 from bagisto/master 2021-01-14 18:07:07 +01:00
devansh bawari 2d0c8562d8 Merge branch 'master' into vul-issue 2021-01-14 21:00:01 +05:30
devansh bawari 567d3b6380 Merge remote-tracking branch 'upstream/master' into issue-4399 2021-01-14 20:16:49 +05:30
devansh bawari a37f0dc027 Latest Translation Key Added 2021-01-14 20:16:35 +05:30
devansh bawari 88ac63470e ACL Added For Addresses, Notes, Promotions And Copy Product 2021-01-14 20:06:12 +05:30
Glenn Hermans 317f970184
Merge pull request #4477 from ghermans/dutch-translations
Updated translations
2021-01-14 04:59:56 +01:00
Glenn Hermans 745f9ea337
Updated status and calculate tax for admin 2021-01-14 03:52:15 +01:00
Glenn Hermans d2e8de597c
Merge pull request #9 from bagisto/master 2021-01-13 23:19:52 +01:00
devansh bawari af78612c54 Merge remote-tracking branch 'upstream/master' into issue-4399 2021-01-13 18:51:31 +05:30
Glenn Hermans 7fd932992e
Merge pull request #4469 from dejavuejs/patch-2
Asynchronous callbacks for checkout page.
2021-01-13 14:00:55 +01:00
devansh bawari 0283c56df1 Syncing Of Method With Routes 2021-01-13 18:30:20 +05:30
devansh bawari 27e26d7d35 Feature Hidden If Not Authorised 2021-01-13 18:29:57 +05:30
Glenn Hermans 534a1e3b6e
Merge pull request #4475 from rahulshukla-webkul/development
Issue #4392 fixed
2021-01-13 13:58:58 +01:00
rahul shukla 2af7c2cdc1 Issue #4392 fixed 2021-01-13 16:42:47 +05:30