rahulshukla-home
|
1d502be939
|
Issue #2890
|
2020-04-15 15:11:08 +05:30 |
|
rahulshukla-home
|
b65601ecd0
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-04-13 23:04:02 +05:30 |
|
rahulshukla-home
|
b88e239ad2
|
Issue #2543 fixed
|
2020-04-13 23:03:45 +05:30 |
Jitendra Singh
|
fdd991a27b
|
Merge pull request #2879 from jitendra-webkul/1.0
Issue #2871 fixed
|
2020-04-13 21:06:30 +05:30 |
Pranshu Tomar
|
dd46e23628
|
Issue #2871 fixed
|
2020-04-13 20:58:34 +05:30 |
|
Jitendra Singh
|
94a08b7c86
|
Merge pull request #2867 from VaD1ke/translation-fixes
Translation fixes
|
2020-04-13 16:01:44 +05:30 |
Carlos Augusto Gartner
|
1f30769a98
|
Created new view_render_events for admin order and invoice view
|
2020-04-12 22:08:51 -03:00 |
|
Carlos Augusto Gartner
|
5a3e1919d7
|
Added view_render_event to admin order view
|
2020-04-12 21:55:07 -03:00 |
VaD1ke
|
e1ae7216d5
|
Fix save-category btn translation for langs with noun case
|
2020-04-11 13:09:20 +03:00 |
|
VaD1ke
|
fe84dbb2fc
|
Translate mass-update for review status in admin grid
|
2020-04-11 13:03:31 +03:00 |
|
Jitendra Singh
|
9375ed6a8e
|
Merge pull request #2852 from rahulcs0082/development
Issue #2713 fixed
|
2020-04-09 15:34:27 +05:30 |
|
Pranshu Tomar
|
66ea50bb5c
|
Issue #2851 fixed
|
2020-04-09 15:16:24 +05:30 |
|
Pranshu Tomar
|
7d360626e0
|
Issue #2851 fixed
|
2020-04-09 14:24:25 +05:30 |
|
rahulshukla-home
|
b58cc7e3e5
|
Issue #2713 fixed
|
2020-04-09 13:55:40 +05:30 |
shivam kumar
|
61f27800fd
|
issue #2792 resolved
|
2020-04-07 19:51:42 +05:30 |
Shubham Mehrotra
|
0005241794
|
misc. updates
|
2020-03-30 21:09:40 +05:30 |
|
Carlos Augusto Gartner
|
3ab051c07a
|
Added translation to velocity and fixed some admin translations
|
2020-03-25 12:59:15 -03:00 |
|
rahulshukla-home
|
4510a42d34
|
testing
|
2020-03-24 02:17:17 +05:30 |
Jitendra Singh
|
1ff5aaab92
|
Issue #2706 fixed
|
2020-03-23 14:48:03 +05:30 |
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 |
|
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 |
|
Jitendra Singh
|
881027ca4e
|
Converted configuration boolean type to switch
|
2020-02-12 13:45:26 +05:30 |
|
Jitendra Singh
|
300feaec0f
|
Converted checkbox into switch
|
2020-02-11 17:56:25 +05:30 |
|
Jitendra Singh
|
0caa8010d2
|
Issue #2424 fixed
|
2020-02-11 16:37:10 +05:30 |
|
Herbert Maschke
|
c27b70b420
|
load correct locale in CategoryController.php
|
2020-02-10 15:21:03 +01:00 |
|
Herbert Maschke
|
d574ab1beb
|
Merge branch 'bagisto/master' into locale-improvements
|
2020-02-10 15:11:43 +01:00 |
|
Herbert Maschke
|
45160d2099
|
fix some javascript i have destroyed previously accidentally
|
2020-02-10 15:07:14 +01:00 |
|
Herbert Maschke
|
38dbb6384d
|
obey the default channel and configured default locale in product edit form
|
2020-02-10 15:05:03 +01:00 |
Steffen Mahler
|
59f1956a21
|
merge bagisto/master into fix-tax-handling
|
2020-02-08 20:48:27 +01:00 |
|
Jitendra Singh
|
3c11496274
|
Merge pull request #2351 from aayush-webkul/master
Added old() function in Admin and Shop package
|
2020-02-07 15:53:24 +05:30 |
shaiv-webkul
|
f47f06de31
|
#2180 fixed
|
2020-02-07 15:48:20 +05:30 |
|
shaiv-webkul
|
d43efc505a
|
Merge branch 'master' of https://github.com/bagisto/bagisto
|
2020-02-07 15:29:52 +05:30 |
|
Steffen Mahler
|
b94fc9fc8c
|
merge master and resolve conflicts
|
2020-02-07 10:44:04 +01:00 |
|
rahul shukla
|
40517df331
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2020-02-07 13:49:15 +05:30 |
|
rahul shukla
|
0358a84a2c
|
Issue #2357
|
2020-02-07 13:49:01 +05:30 |
|
shaiv-webkul
|
13047f266f
|
Merge branch 'master' of https://github.com/bagisto/bagisto
|
2020-02-07 13:24:16 +05:30 |
|
Jitendra Singh
|
e94d1ad146
|
Merge pull request #2365 from jitendra-webkul/1.0
Issue #1977 fixed
|
2020-02-07 13:19:55 +05:30 |
|
Jitendra Singh
|
e517d66e71
|
Issue #1977 fixed
|
2020-02-07 13:18:48 +05:30 |
|
shaiv-webkul
|
3516322e1f
|
#2180 issue fixed
|
2020-02-07 13:10:03 +05:30 |
|
Jitendra Singh
|
e8b34451ed
|
Merge pull request #2361 from jitendra-webkul/1.0
Issue #1977 fixed
|
2020-02-07 12:57:04 +05:30 |
|
Jitendra Singh
|
cc5df27870
|
Issue #1977 fixed
|
2020-02-07 12:56:18 +05:30 |
Aayush Bhatt
|
7fc6fd7d3d
|
old() function implimented in admin and shop package
|
2020-02-06 22:04:33 +05:30 |
|
Aayush Bhatt
|
75ef8f9b54
|
Duplicate old() function removed
|
2020-02-06 20:23:56 +05:30 |
|
Aayush Bhatt
|
d9f2f1ab3d
|
Duplicate old() functioon fixed and working in admin panel
|
2020-02-06 20:07:26 +05:30 |
|
Aayush Bhatt
|
2a0d461d9e
|
old() function implemented in admin package
|
2020-02-06 18:52:10 +05:30 |
|
Jitendra Singh
|
e18027c612
|
Merge pull request #2332 from jitendra-webkul/1.0
Issue #2126 fixed
|
2020-02-06 17:13:13 +05:30 |
|
Jitendra Singh
|
9f80cff693
|
Issue #2126 fixed
|
2020-02-06 17:12:41 +05:30 |
|
rahul shukla
|
0bd6096e26
|
Issue #2189
|
2020-02-06 15:57:31 +05:30 |
|
Aayush Bhatt
|
ff1e315fc7
|
Admin dropdown UI fixed
|
2020-02-06 12:26:35 +05:30 |
|
Aayush Bhatt
|
0694fbd7eb
|
Issue #2189 resolved
|
2020-02-06 11:59:45 +05:30 |
|
Aayush Bhatt
|
28a4aaa5ac
|
Bug fixed
|
2020-02-06 11:57:53 +05:30 |
|
Jitendra Singh
|
47b010ce6b
|
Merge pull request #2296 from jitendra-webkul/1.0
Issue #2295 fixed
|
2020-02-05 19:39:58 +05:30 |
|
Jitendra Singh
|
9f86e4fcca
|
Issue #2295 fixed
|
2020-02-05 19:38:52 +05:30 |
|
Jitendra Singh
|
98390b2ce7
|
Merge pull request #2291 from jitendra-webkul/1.0
Issue #1267 fixed
|
2020-02-05 18:59:46 +05:30 |
|
Jitendra Singh
|
4ef21c827a
|
Issue #1267 fixed
|
2020-02-05 18:53:57 +05:30 |
MonaHartdegen
|
b0946ef97d
|
added ids to sections in accordians/downloadable.blade.php
|
2020-02-05 13:23:50 +01:00 |
|
rahul shukla
|
16e4a109ea
|
Configurtion form validation improvement
|
2020-02-05 16:07:00 +05:30 |
|
rahul shukla
|
ff37467e70
|
Issue #2239
|
2020-02-05 12:06:16 +05:30 |
|
rahul shukla
|
a2d642f35d
|
revert tpye
|
2020-02-05 11:32:29 +05:30 |
|
rahul shukla
|
1b5b47fc80
|
Issue #2269
|
2020-02-05 11:29:57 +05:30 |
|
rahul shukla
|
832e66025e
|
Issue #2270
|
2020-02-05 11:14:45 +05:30 |
|
Steffen Mahler
|
ae467fc182
|
merge master, refactoring tests
|
2020-02-04 18:13:09 +01:00 |
|
Steffen Mahler
|
0d6aee18e4
|
merge remote-tracking branch 'bagisto/master' into fix-tax-handling
|
2020-02-04 17:55:53 +01:00 |
|
Annika Wolff
|
53c5d107a6
|
Merge branch 'master' into small-bugfix-and-tiny-refactoring
|
2020-02-04 14:08:46 +01:00 |
|
Steffen Mahler
|
7c661efd88
|
add unit tests, refactoring
|
2020-02-04 11:18:40 +01:00 |
|
Steffen Mahler
|
cb5e3a47f6
|
fix tax handling, add functional cest for cart
|
2020-02-04 08:50:37 +01:00 |
|
Jitendra Singh
|
453908a768
|
Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
add ability to provide company_name in address during checkout
|
2020-02-04 11:40:39 +05:30 |