Commit Graph

5879 Commits

Author SHA1 Message Date
devansh bawari 9fec7ea89b Confliction Resolved On Merging 2021-02-05 19:52:20 +05:30
Glenn Hermans bf1c3f21af
Merge pull request #4550 from prateek-webkul/master
replaced product image and product video helper with facades
2021-02-05 13:49:43 +01:00
rahul shukla 25e3561897 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-05 15:25:38 +05:30
rahul shukla 55f8fd6cc0 Issue #4558 fixed 2021-02-05 15:25:07 +05:30
prateek srivastava d0f06bb463 removed duplicate statement 2021-02-04 19:25:28 +05:30
prateek srivastava 20f2784099 added helper for facades 2021-02-04 18:56:52 +05:30
prateek srivastava fd7fdfe385 changes in facade 2021-02-04 18:12:02 +05:30
Glenn Hermans 953e6d14ea
Merge pull request #4546 from rahulshukla-webkul/development
Issue #4545
2021-02-04 13:11:39 +01:00
rahul shukla 765cd5dab6 missing conditions adeded 2021-02-04 17:05:32 +05:30
prateek srivastava a87ad99201 product-detail image helper removed 2021-02-04 16:41:16 +05:30
prateek srivastava ad18b254c4 fixed facade issue 2021-02-04 16:36:26 +05:30
prateek srivastava d29b0a69a5 fixed conflict 2021-02-04 16:31:22 +05:30
rahul shukla 27c0a4f8ee Order cancelation for downloadble product 2021-02-04 15:26:14 +05:30
devansh bawari 5640880c1a Space Issue Fixed 2021-02-04 10:40:14 +05:30
Glenn Hermans 5f5813520c
Merge pull request #4272 from darinda/patch-1
Allow to disable actions on a per-row (per-record) basis
2021-02-03 15:49:43 +01:00
rahul shukla f6a6501a62 Issue #3893 done 2021-02-03 19:59:31 +05:30
rahul shukla fa045541e5 Issue #4545 2021-02-03 18:48:45 +05:30
Glenn Hermans 14a41c0ff2
Merge pull request #4540 from devansh-webkul/issue-4539
Fixed slider arrow should point out in opposite direction #4539
2021-02-03 13:34:28 +01:00
devansh bawari c57a78b2e3 Merge branch 'master' into optimization 2021-02-02 16:54:14 +05:30
devansh bawari 826bd2ae33 Merge branch 'master' into issue-4539 2021-02-02 16:54:12 +05:30
devansh bawari 9c6f304e39 Merge remote-tracking branch 'upstream/master' into issue-4542 2021-02-02 15:22:44 +05:30
devansh bawari ead9500ef3 Proper Format Date Added 2021-02-02 15:22:15 +05:30
devansh bawari 5240765f2d Added Same As EN For AR Slider 2021-02-02 11:19:08 +05:30
devansh bawari 8804f57ecf Merge branch 'master' into optimization 2021-02-01 19:49:04 +05:30
devansh bawari f8077a7736 Merge branch 'master' into issue-4510 2021-02-01 19:49:00 +05:30
devansh bawari c2992d1b8e API All Product's Extra Information Added 📝 2021-02-01 19:31:45 +05:30
rahul shukla 6c69025a13 Issue #4532 fixed 2021-02-01 17:28:37 +05:30
rahul shukla 1f6f7a3bac corrected spelling 2021-02-01 16:44:46 +05:30
rahul shukla c9d09731e1 chnage according to comment 2021-02-01 16:40:13 +05:30
rahul shukla 8ce02ab43b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-01 15:35:20 +05:30
rahul shukla a8cdf29fc7 Issue #3572, fixes percentage for 2 decimal values 2021-02-01 15:35:04 +05:30
devansh bawari 3fddc7cdfd Typo Checked 2021-02-01 11:38:20 +05:30
devansh bawari cd26f99153 Extra Info Added 2021-02-01 11:35:56 +05:30
Glenn Hermans 9af300b202
Merge pull request #4530 from rahulshukla-webkul/development
Issue #3269 fixed
2021-01-29 15:34:02 +01:00
devansh bawari fe9c39e90e Merge remote-tracking branch 'upstream/master' into optimization 2021-01-29 19:16:02 +05:30
devansh bawari 2e03a4dde4 Merge remote-tracking branch 'upstream/master' into issue-4510 2021-01-29 19:15:59 +05:30
rahul shukla 73e4deebaf Fixes according to chnages 2021-01-29 16:58:35 +05:30
rahul shukla 10f45d9fa8 Issue #3269 fixed 2021-01-29 15:54:39 +05:30
Glenn Hermans e1a32a2f83
Merge pull request #4507 from rahulshukla-webkul/development
Issue #3572 done
2021-01-29 09:59:36 +01:00
rahul shukla bbeccdeaaf fixes accoeding comment 2021-01-29 12:40:48 +05:30
rahul shukla 9ceddf20ec Fixes according to comment 2021-01-28 19:10:28 +05:30
Glenn Hermans 8752e1076a
Merge pull request #4526 from devansh-webkul/ip-fix
Dynamic url for route checking added for datagrids
2021-01-28 13:42:42 +01:00
rahul shukla 1121aac957 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-28 16:12:52 +05:30
rahul shukla f005a92534 Issue #4523 2021-01-28 16:12:35 +05:30
devansh bawari 20db497eae IP Fixed On Datagrid 2021-01-28 13:05:15 +05:30
rahul shukla ec467a2a0f Issue #4495 fixed 2021-01-27 17:24:03 +05:30
devansh bawari dab3393e38 Fixed Extra Question Mark 2021-01-27 15:11:20 +05:30
rahul shukla 5b05cf75f4 Issue #3572 fixes according to comment 2021-01-27 14:58:54 +05:30
rahul shukla 5620817db2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-27 14:07:35 +05:30
devansh bawari 04a28f50f0 Merge branch 'master' into issue-4510 2021-01-27 12:38:50 +05:30