Commit Graph

1284 Commits

Author SHA1 Message Date
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
Jitendra Singh c52e19d53d
Merge pull request #2546 from rahulshukla-webkul/development
Development
2020-02-24 13:47:58 +05:30
Jitendra Singh e552183e9a
Merge pull request #2523 from ghermans/dutch
#2512 - Dutch translations and removing static text
2020-02-24 13:34:27 +05:30
rahul shukla e927ebd821 product name issue 2020-02-24 12:31:18 +05:30
Glenn Hermans ea69a74443
Added translations 2020-02-22 15:15:55 +01:00
Glenn Hermans e3413d5f45
Updated shipments table view 2020-02-22 15:15:09 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Jitendra Singh 2e24c2e2e5 Updated event booking system 2020-02-21 19:13:15 +05:30
ghermans d4ce50da9f #2512 more translations 2020-02-21 09:44:12 +01:00
ghermans 22f5391f5c More translations 2020-02-21 01:48:25 +01:00
ghermans 6174a78926 More translations 2020-02-21 01:16:32 +01:00
ghermans 89ebea48e6 removed spacing 2020-02-20 20:24:39 +01:00
ghermans fbfb493629 Fixed #2530 2020-02-20 20:22:17 +01:00
Annika Wolff 154a933dc6
Merge branch 'master' into fix-tax-handling 2020-02-20 17:19:28 +01:00
Glenn Hermans 9e08585b85 #2512 - Added more dutch translations 2020-02-20 17:06:30 +01:00
Glenn Hermans 361ef64fa7 #2527 Added translations for order status 2020-02-20 15:12:05 +01:00
Glenn Hermans 1688342f18 #2527 Replaced static text in order datagrid 2020-02-20 15:11:37 +01:00
ghermans 79a78cc9c9 #2512 - Added more dutch translations 2020-02-20 13:27:01 +01:00
Glenn Hermans 416a7b849a 2512 - Added more dutch translations 2020-02-20 12:37:00 +01:00
Glenn Hermans d71d39208d 2512 - Removed static text and wrong translations 2020-02-20 12:36:13 +01:00
ghermans f45f83ab89 #2512 - Added more dutch translations 2020-02-20 09:59:27 +01:00
ghermans cb99ea652b #2512 - Started dutch translations 2020-02-20 04:08:19 +01:00
Jitendra Singh 07b3e3d76a
Merge pull request #2507 from prateek-webkul/master
issue #2470 fixed
2020-02-19 18:47:16 +05:30
Jitendra Singh a31fba56b1 Resolved conflicts 2020-02-19 17:23:18 +05:30
Jitendra Singh a72401dbba Improved attribute package code style 2020-02-19 17:09:17 +05:30
Vivek Sharma 20b7d78359 [Updated: resolved admin user delete issue.] 2020-02-19 16:22:19 +05:30
Jitendra Singh 99d506db94 Improved admin package code standard 2020-02-19 15:56:44 +05:30
Jitendra Singh b4c68c7f0b Improved datagrid code 2020-02-19 15:44:27 +05:30
prateek srivastava 6052b6355d Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-19 15:42:35 +05:30
prateek srivastava 74251ef2d2 issue 2470 fixed 2020-02-19 15:42:00 +05:30
rahul shukla 6133f84690 Product quantitity in datagrid 2020-02-19 11:53:14 +05:30
rahulshukla-webkul 5bfe263e10
Revert "add improvements to locale determination on product creation" 2020-02-18 18:14:22 +05:30
Jitendra Singh 7d161e31ef
Merge pull request #2373 from Haendlerbund/locale-improvements
add improvements to locale determination on product creation
2020-02-18 15:10:14 +05:30
Herbert Maschke b0e37edd63 only send emails when configured so 2020-02-17 16:52:58 +01:00
Herbert Maschke 5cbbf7c4f6 add english i18n strings for email notification setup 2020-02-17 16:35:31 +01:00
Herbert Maschke a889b1f31f add mail notification defaults (everything true) to Config/system.php 2020-02-17 16:25:14 +01:00