Commit Graph

1374 Commits

Author SHA1 Message Date
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
Jitendra Singh deda73af48 Issue #2594 fixed 2020-03-19 17:07:46 +05:30
Jitendra Singh 5902f0050c
Merge pull request #2681 from vivek-webkul/patch-41
[Updated: Shop & admin email setting added in configuration.]
2020-03-19 15:36:27 +05:30
Jitendra Singh 7faf5bb97f
Merge pull request #2690 from rahulshukla-webkul/development
Issue #2549
2020-03-18 18:52:02 +05:30
rahul shukla 7174ccbfd0 Issue #2549 2020-03-18 18:48:02 +05:30
Jitendra Singh 893564977f Issue #2518 fixed 2020-03-18 17:15:44 +05:30
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
mohd asif d2caa2af98 resolved commit 2020-03-17 09:36:45 +05:30
mohd asif e7a9303b51 updated missing translation for portoguese in admin package 2020-03-16 16:24:04 +05:30
mohd asif 65814e0f04 upadated missing translation for Dutch for admin package 2020-03-16 14:07:08 +05:30
mohd asif 9901209a4b upadated missing translation for persian in admin package 2020-03-16 13:25:14 +05:30
mohd asif 1e5baab3a4 added missed translation for arabic 2020-03-16 10:56:10 +05:30
mohd asif ae1215834b upadated remaining translation for ar 2020-03-13 18:43:14 +05:30
Jitendra Singh 195344e8a2
Merge pull request #2653 from jitendra-webkul/1.0
Issue #2638 fixed
2020-03-13 18:31:15 +05:30
Jitendra Singh 9b60f0b8ec Issue #2638 fixed 2020-03-13 17:51:46 +05:30
mohd asif dd4875004a updated translation for arabic and persia for admin package 2020-03-13 12:29:51 +05:30
mohd asif f01ab851fb fixed some more language translation issue in arabic and persia 2020-03-12 19:30:39 +05:30
mohd asif 9e6ed6f09d fixed translation in all packages 2020-03-12 13:32:56 +05:30
Annika Wolff 65b5ec9232 bugfix: show multiple flash messages in admin panel 2020-03-11 10:45:18 +01:00
Jitendra Singh 101df848d6 Remove static text from grid 2020-03-06 20:03:32 +05:30
Jitendra Singh 8ca9bd864c Remove static text from grid 2020-03-06 19:49:47 +05:30
Jitendra Singh 010ae65691 Resolved conflicts 2020-03-06 16:02:52 +05:30
Jitendra Singh 276a2e288b
Merge pull request #2612 from Haendlerbund/revert-2603-development
Revert "Development"
2020-03-06 15:16:08 +05:30
Jitendra Singh 955da20b45 Improved comments in code 2020-03-05 19:49:14 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh d0fa3b2705 Replace DB alias with complete class name 2020-03-05 19:11:53 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
rahul shukla caccfcf840 Issue #2605 2020-03-05 16:28:19 +05:30
rahul shukla 72d7ca8851 Issue #2616 2020-03-05 16:04:12 +05:30
Jitendra Singh a6ce67151f Improved comments in code 2020-03-05 11:04:57 +05:30
Annika Wolff 152cde9e5c
Revert "Development" 2020-03-04 11:27:34 +01:00
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
rahul shukla e8ad719112 product datagrid locale and channel query improvement 2020-03-03 18:48:23 +05:30
rahul shukla 641b80d28a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-03-03 18:34:00 +05:30
rahul shukla 77b86ee786 query chnages for product datagrid 2020-03-03 18:33:38 +05:30
Jitendra Singh 45ec4532fa Resolved conflicts 2020-03-03 15:59:47 +05:30
Jitendra Singh 4a6ac73bb6 Improved code style 2020-02-28 15:55:53 +05:30
Jitendra Singh 131e3f1e18 Quantity box checks added for booking product 2020-02-28 13:00:29 +05:30
shubhammehrotra.symfony@webkul.com ce56c13fd0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-27 20:21:37 +05:30
Jitendra Singh 0dd0897e68
Merge pull request #2542 from ghermans/shipments
Improved order shipments info
2020-02-27 18:38:53 +05:30
shubhammehrotra.symfony@webkul.com 87f801dbce changes from master 2020-02-27 16:16:29 +05:30
shubhammehrotra.symfony@webkul.com 13312e8234 compare product's dynamic attributes 2020-02-27 16:14:00 +05:30
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
rahul shukla b0b4935006 time added in cart rules 2020-02-26 16:58:53 +05:30
Jitendra Singh 7d2ff93f43 Resolve conflicts 2020-02-25 11:44:34 +05:30
Glenn Hermans 9de680c47d
Fix conflicts 2020-02-24 17:49:43 +01:00
Jitendra Singh 9eb7113aa4 Fixed else if indentation in javascript 2020-02-24 18:53:34 +05:30
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30
rahul shukla 10d8ec249a laguage updated for order 2020-02-24 15:04:18 +05:30