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 |
Annika Wolff
|
154a933dc6
|
Merge branch 'master' into fix-tax-handling
|
2020-02-20 17:19:28 +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 |
prateek srivastava
|
36f795f09a
|
assets for production
|
2020-02-19 16:25:40 +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 |