prateek srivastava
|
2d91fa90c9
|
issue #5802 fixed
|
2022-03-04 18:58:54 +05:30 |
|
prateek srivastava
|
c0c8bdd231
|
issue #5805 fixed
|
2022-03-04 18:53:18 +05:30 |
|
prateek srivastava
|
2d4fbf2348
|
admin navbar in mobile fixed
|
2022-03-04 17:14:12 +05:30 |
 merdan
|
88639941d4
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-04 16:09:33 +05:00 |
Glenn Hermans
|
0a52fe69ad
|
Merge pull request #5947 from Sanjaybhattwebkul/order-translation
Order-status-translation-done
|
2022-03-04 12:00:07 +01:00 |
Prateek Srivastava
|
a6b23b2a14
|
Merge pull request #5948 from prateek-webkul/forgot-password-ui
issue #5938 fixed
|
2022-03-04 13:40:13 +05:30 |
|
prateek srivastava
|
bb96967da9
|
issue #5938 fixed
|
2022-03-04 13:08:46 +05:30 |
Sanjay
|
6d061738b1
|
Order-status-translation-done
|
2022-03-04 13:07:32 +05:30 |
Jitendra Singh
|
010eb02c28
|
Merge pull request #5937 from Sanjaybhattwebkul/forget-password
asterisk icon added for required fields
|
2022-03-04 12:58:42 +05:30 |
|
Sanjay
|
08020c9d78
|
asterisk-icon-added-forRequired-fields
|
2022-03-04 10:07:39 +05:30 |
|
merdan
|
cd27bc4535
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-03 13:32:06 +05:00 |
anmol chauhan
|
b26b5af82a
|
fixed issue #5915
|
2022-03-03 12:40:35 +05:30 |
|
merdan
|
89e7e74475
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-03 12:05:46 +05:00 |
|
Jitendra Singh
|
97d93c6751
|
Merge pull request #5930 from jitendra-webkul/master
Issue #5929 fixed
|
2022-03-02 19:14:30 +05:30 |
jitendra
|
9cb04aa3ee
|
Issue #5929 fixed
|
2022-03-02 19:00:58 +05:30 |
|
Jitendra Singh
|
85a2964a54
|
Merge pull request #5917 from Sanjaybhattwebkul/admin-translation
Issue #5916 Fixed
|
2022-03-02 18:36:51 +05:30 |
|
Sanjay
|
c0a5ee4b20
|
changes complete
|
2022-03-02 18:27:45 +05:30 |
|
Sanjay
|
d975c9d972
|
Merge branch 'admin-translation' of https://github.com/Sanjaybhattwebkul/bagisto into admin-translation
|
2022-03-02 18:26:32 +05:30 |
|
jitendra
|
1a65c26133
|
Issue #5926 fixed
|
2022-03-02 17:45:55 +05:30 |
|
jitendra
|
cc455d4e96
|
Issue #5770 fixed
|
2022-03-02 17:03:53 +05:30 |
|
merdan
|
5151348f6d
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-02 16:11:08 +05:00 |
|
prateek srivastava
|
73bdb167fd
|
revert changes on permission issue
|
2022-03-02 16:12:06 +05:30 |
|
Sanjay
|
e5c6f067b2
|
customerDatagrid-translation-added
|
2022-03-02 15:42:38 +05:30 |
|
merdan
|
eca9a68aeb
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-02 14:47:35 +05:00 |
|
prateek srivastava
|
cb5546c9b4
|
issue #5913 fixed
|
2022-03-02 13:59:51 +05:30 |
|
prateek srivastava
|
5d557e5b43
|
issue #5908 fixed
|
2022-03-02 11:12:50 +05:30 |
|
merdan
|
221d070446
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-01 18:13:44 +05:00 |
|
prateek srivastava
|
3710da6d66
|
issue #5903 fixed
|
2022-03-01 15:46:36 +05:30 |
|
Sanjay
|
bd6215789d
|
Changes complete
|
2022-03-01 15:12:59 +05:30 |
|
merdan
|
4fcd6e5209
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-03-01 14:02:24 +05:00 |
|
Sanjay
|
a2b22127f0
|
Issue #5893 Fixed
|
2022-03-01 12:02:19 +05:30 |
|
Prateek Srivastava
|
ce4ec2d565
|
Merge pull request #5897 from Anmol-Chauhan/slider-multidelete
Issue #5777 fixed
|
2022-03-01 11:50:54 +05:30 |
|
anmol chauhan
|
84814c58bb
|
Issue #5777 fixed
|
2022-02-28 19:56:24 +05:30 |
|
anmol chauhan
|
268e4850cd
|
issue #5696 fixed
|
2022-02-28 19:32:54 +05:30 |
|
merdan
|
cf740f86c7
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-02-28 17:06:59 +05:00 |
|
Prateek Srivastava
|
7c7d104777
|
Merge pull request #5890 from prateek-webkul/cms-ui-issue
issue #5717 fixed
|
2022-02-28 16:26:18 +05:30 |
|
Prateek Srivastava
|
c85752d045
|
Merge pull request #5889 from prateek-webkul/admin-config-mobile
issue #5707 fixed
|
2022-02-28 15:34:14 +05:30 |
|
merdan
|
e2c55597b1
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-02-28 14:20:24 +05:00 |
|
prateek srivastava
|
c75b6c4f7c
|
issue #5717 fixed
|
2022-02-28 14:12:15 +05:30 |
|
Prateek Srivastava
|
fb8e9d5229
|
Merge pull request #5886 from Sanjaybhattwebkul/translation-issues
Issue #5885 fixed
|
2022-02-28 14:00:47 +05:30 |
|
prateek srivastava
|
7ee27c858a
|
issue #5707 fixed
|
2022-02-28 13:57:18 +05:30 |
|
Sanjay
|
e8e199c7be
|
Issue #5887 Fixed
|
2022-02-28 13:41:00 +05:30 |
|
Sanjay
|
ef8e3a7582
|
Issue #5885 fixed
|
2022-02-28 12:39:48 +05:30 |
|
prateek srivastava
|
7fd00bbde8
|
added viewport height
|
2022-02-25 19:20:05 +05:30 |
|
merdan
|
757c4096b5
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-02-25 15:12:15 +05:00 |
|
prateek srivastava
|
bd68c702d5
|
ise #5755 fixed
|
2022-02-25 12:42:29 +05:30 |
|
prateek srivastava
|
f1688d7cb9
|
issue #5772 fixed
|
2022-02-25 11:31:50 +05:30 |
|
prateek srivastava
|
8fc8ecfb89
|
fixed search icon issue in admin panel
|
2022-02-24 18:18:03 +05:30 |
|
merdan
|
298edeb037
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
|
2022-02-24 17:02:34 +05:00 |
|
Prateek Srivastava
|
cf74ea0e67
|
Merge pull request #5868 from Sanjaybhattwebkul/category-filter
Issue #5855 Fixed
|
2022-02-24 13:15:49 +05:30 |
|
Sanjay
|
d3e7d6210f
|
Fixex header-translation-issues
|
2022-02-24 12:02:17 +05:30 |
|
Sanjay
|
875a9efe40
|
Issue #5855 Fixed
|
2022-02-23 16:50:04 +05:30 |
|
Sanjay
|
03e9be2c35
|
Complete changes
|
2022-02-23 14:54:03 +05:30 |
|
Sanjay
|
048139c0b2
|
issue #5865 fixed
|
2022-02-23 10:33:30 +05:30 |
|
merdan
|
84d77539e9
|
Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
Conflicts:
composer.lock
packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
|
2022-02-22 17:50:56 +05:00 |
|
prateek srivastava
|
97c0be5f88
|
fixed ui for rtl-notification-search
|
2022-02-21 19:59:52 +05:30 |
|
prateek srivastava
|
bcc4cf629b
|
issue #5809 fixed
|
2022-02-21 19:45:08 +05:30 |
|
prateek srivastava
|
a7c7ae789b
|
issue #5828 fixed
|
2022-02-21 14:40:35 +05:30 |
|
Glenn Hermans
|
8d7a2518b0
|
Merge pull request #5843 from Sanjaybhattwebkul/add-astric-icon
Issue #5840 Fixed
|
2022-02-18 13:50:57 +01:00 |
|
Sanjay
|
7516a4eac1
|
AstricIcon-added
|
2022-02-18 18:04:39 +05:30 |
|
Sanjay
|
ec56a86842
|
notification-translation-issue-fixed
|
2022-02-18 15:19:01 +05:30 |
|
prateek srivastava
|
6844aee49e
|
issue #5835 fixed
|
2022-02-17 19:15:42 +05:30 |
|
prateek srivastava
|
c28995ccbb
|
issue #5803 fixed
|
2022-02-17 11:02:22 +05:30 |
|
prateek srivastava
|
23666466f4
|
issue #5803 fixed
|
2022-02-16 13:34:09 +05:30 |
|
prateek srivastava
|
bdc29b455e
|
issue #5808 fixed
|
2022-02-16 13:11:24 +05:30 |
Devansh
|
36bdad4304
|
Multiple Flash Messages Fixed
|
2022-02-11 19:18:21 +05:30 |
|
Devansh
|
9d99fdf186
|
All Destroy Method Updated
|
2022-02-11 18:04:38 +05:30 |
Deepak Singh Gusain
|
6f0f4cae85
|
resolve conflicts
|
2022-02-11 10:23:28 +05:30 |
Devansh
|
fc5e58b7a8
|
Merge pull request #5771 from kideny/master
add zh_CN language
|
2022-02-10 20:25:26 +05:30 |
kideny
|
3713fad54f
|
add more files
|
2022-02-10 21:59:54 +08:00 |
|
Deepak Singh Gusain
|
3d86db36bd
|
Fixed date related issue
|
2022-02-10 16:25:01 +05:30 |
|
Deepak Singh Gusain
|
13ebcdd649
|
resolve conflicts
|
2022-02-10 15:34:06 +05:30 |
|
Devansh
|
8fb29e4cdc
|
Merge pull request #5782 from devansh-webkul/reverted-file
Reverted One Address Index File #5774
|
2022-02-10 14:57:13 +05:30 |
|
Devansh
|
5e1c8203ee
|
Reverted Index File
|
2022-02-10 13:09:30 +05:30 |
|
Deepak Singh Gusain
|
f3b6cd67ce
|
Fixed the calender issue at mobile view
|
2022-02-10 11:59:23 +05:30 |
|
Deepak Singh Gusain
|
825d7aa991
|
Fixed dashboard ui issue
|
2022-02-10 10:54:02 +05:30 |
|
Deepak Singh Gusain
|
4de476a940
|
Mobile view Layout shifting issue
|
2022-02-10 10:28:22 +05:30 |
|
Deepak Singh Gusain
|
d9372834cd
|
Fixed Layout shifting admin panel
|
2022-02-10 10:13:31 +05:30 |
|
Devansh
|
393b749650
|
Message Updated
|
2022-02-08 18:51:21 +05:30 |
|
Devansh
|
329cf9c08c
|
Merge branch 'master' into datagrid-plus-trait
|
2022-02-08 17:12:00 +05:30 |
|
Devansh
|
46ccea3118
|
Fixed Typo
|
2022-02-08 16:24:08 +05:30 |
|
Devansh
|
33015405aa
|
Fixed Cart Rule Coupon Creation
|
2022-02-08 15:35:30 +05:30 |
|
Devansh
|
5bb56f708c
|
Datagrid Trait Plus Added And Test Case Improved
|
2022-02-07 16:06:38 +05:30 |
|
merdan
|
91b7e84cb6
|
Merge branch 'master' of https://github.com/bagisto/bagisto into dev
Conflicts:
packages/Webkul/Core/src/Core.php
packages/Webkul/Product/src/Models/ProductImage.php
|
2022-02-05 14:43:51 +05:00 |
|
Devansh
|
22933b19a5
|
Merge branch 'master' into optional-fields-checkout
|
2022-02-03 18:32:42 +05:30 |
|
Devansh
|
a4559d6fb9
|
Merge pull request #5737 from devansh-webkul/draggable-images-enhancement
|
2022-02-03 18:28:49 +05:30 |
|
Devansh
|
6d8ef13120
|
Variant Images Handled
|
2022-02-03 17:44:45 +05:30 |
|
Devansh
|
3b91f5edbd
|
Video Draggable Feature Added
|
2022-02-03 14:08:34 +05:30 |
|
merdan
|
3ccddbf443
|
category filters
|
2022-02-03 13:34:16 +05:00 |
|
Devansh
|
ff1f77fe8e
|
Suspend Customer Ability Added In Admin
|
2022-02-02 15:47:09 +05:30 |
|
Devansh
|
8c800bc925
|
Some Validations Updated
|
2022-02-02 13:04:39 +05:30 |
|
Deepak Singh Gusain
|
d70d06a495
|
Fixed ui issue of booking product admin panel
|
2022-02-02 12:59:30 +05:30 |
|
Devansh
|
5317fedd21
|
Positions Updated
|
2022-02-02 12:09:29 +05:30 |
|
Devansh
|
c9a4a6c4f1
|
Added Migration And Position And Updated Image Repository
|
2022-02-01 20:34:28 +05:30 |
|
Devansh
|
836f3679b1
|
Vue Draggable Added
|
2022-02-01 18:18:55 +05:30 |
|
Devansh
|
c9b60b2c10
|
Squashed All Commits
|
2022-02-01 16:44:16 +05:30 |
|
merdan
|
690a33710f
|
Merge branch 'master' of https://github.com/bagisto/bagisto into dev
Conflicts:
.env.example
README.md
composer.json
composer.lock
config/app.php
config/scout.php
packages/Webkul/API/Http/Controllers/Shop/AddressController.php
packages/Webkul/API/Http/Resources/Checkout/Cart.php
packages/Webkul/API/Http/Resources/Sales/Order.php
packages/Webkul/API/Http/routes.php
packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php
packages/Webkul/Core/src/Resources/lang/fa/validation.php
packages/Webkul/Core/src/Resources/lang/it/app.php
packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
packages/Webkul/Core/src/Resources/lang/tr/app.php
packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php
packages/Webkul/Velocity/publishable/assets/js/components.js
packages/Webkul/Velocity/publishable/assets/js/manifest.js
public/installer/Classes/Requirement.php
|
2022-02-01 15:01:06 +05:00 |
|
Glenn Hermans
|
235294c042
|
Merge pull request #5725 from devansh-webkul/duplicate-invoice
Duplicate Invoice Ability Added #5525
|
2022-01-31 16:34:09 +01:00 |
|
Devansh
|
a02a1e23ad
|
Select Option Text Added
|
2022-01-31 17:54:05 +05:30 |
|
Devansh
|
4e62451d49
|
Duplicate Invoice Ability Added
|
2022-01-31 17:43:35 +05:30 |
|
Deepak Singh Gusain
|
99732c18c6
|
fixed conflicts
|
2022-01-25 17:35:39 +05:30 |
|
Deepak Singh Gusain
|
c2f9a14e4b
|
responsive velocity header
|
2022-01-25 17:01:38 +05:30 |
|
Deepak Singh Gusain
|
38d1f41ab1
|
Fixed the ui issue of button overlap
|
2022-01-25 16:31:20 +05:30 |
|
Deepak Singh Gusain
|
069f288ec5
|
hover issue at nav har
|
2022-01-25 16:25:23 +05:30 |
|
Deepak Singh Gusain
|
69044a7b85
|
formatted scss
|
2022-01-25 16:07:47 +05:30 |
|
Deepak Singh Gusain
|
b3d5cd1e18
|
Fixed header ui issue
|
2022-01-25 16:02:17 +05:30 |
|
Deepak Singh Gusain
|
64809c47b3
|
resolve the conflicts , merge master and some changes in navbar
|
2022-01-25 11:33:32 +05:30 |
|
Deepak Singh Gusain
|
65b2721403
|
Merge branch 'master' into cms-redirect-issue
|
2022-01-24 18:39:20 +05:30 |
|
Deepak Singh Gusain
|
cee7c3a085
|
Fixed issue of cms redirect
|
2022-01-24 18:37:40 +05:30 |
|
Deepak Singh Gusain
|
d206346995
|
Dark Mode Pending color issue
|
2022-01-24 12:43:51 +05:30 |
|
Deepak Singh Gusain
|
b5c54d4f85
|
fixed conflicts
|
2022-01-21 19:46:51 +05:30 |
|
Deepak Singh Gusain
|
c16e124cc5
|
resolve conflicts
|
2022-01-21 19:29:58 +05:30 |
|
Devansh
|
d7a4d48e17
|
Merge pull request #5618 from deepaksinghgusain227/update-style-navbar-notification
some style changes for notification and navbar
|
2022-01-21 18:55:20 +05:30 |
|
Devansh
|
db94d4f3e1
|
Property Name Change
|
2022-01-21 17:12:21 +05:30 |
|
Devansh
|
d697e70402
|
Update ProductCategoryUniqueSlug.php
|
2022-01-21 17:01:24 +05:30 |
|
Deepak Singh Gusain
|
5a82c501a6
|
recompile assets
|
2022-01-21 15:30:42 +05:30 |
|
Devansh
|
9bcff0ef15
|
Slug Bug Fixed
|
2022-01-21 15:21:19 +05:30 |
|
Deepak Singh Gusain
|
afc72fecbd
|
rtl with mobile view
|
2022-01-21 15:17:31 +05:30 |
|
Deepak Singh Gusain
|
786075045d
|
fixed conflicts at nav left
|
2022-01-21 14:19:32 +05:30 |
|
Deepak Singh Gusain
|
227d2157fa
|
resloved conflicts
|
2022-01-21 12:42:19 +05:30 |
|
Deepak Singh Gusain
|
2cb8af2b27
|
resolved conflicts
|
2022-01-21 12:06:10 +05:30 |
|
Deepak Singh Gusain
|
b8c80b337b
|
created varibles for the hardcoded color
|
2022-01-21 11:50:12 +05:30 |
|
Deepak Singh Gusain
|
9c3905e5d1
|
Merge branch 'master' into update-style-navbar-notification
|
2022-01-21 10:37:42 +05:30 |
|
Deepak Singh Gusain
|
7a15b10951
|
icon issue
|
2022-01-20 19:32:13 +05:30 |
|
Deepak Singh Gusain
|
b8cc78e971
|
Fixed the issue of sidebar only one tab at one time issue
|
2022-01-20 19:27:32 +05:30 |
|
Deepak Singh Gusain
|
841693b7de
|
resolved Confilicts
|
2022-01-20 16:40:43 +05:30 |
|
Deepak Singh Gusain
|
d2dde1ccc2
|
Navigation bar
|
2022-01-20 16:38:06 +05:30 |
|
Devansh
|
9d09e79533
|
Merge pull request #5658 from deepaksinghgusain227/navbar-top-account-ui
Fixed Admin Account Ui issue
|
2022-01-20 14:59:52 +05:30 |
|
Deepak Singh Gusain
|
732a7f83b1
|
work on locale-icon
|
2022-01-20 14:39:56 +05:30 |
|
Devansh
|
fd1de0f48e
|
Merge pull request #5656 from devansh-webkul/added-support
Enhancement Done For Invoice PDF
|
2022-01-20 11:15:14 +05:30 |
|
Deepak Singh Gusain
|
2e85c41c69
|
Fixed Admin Account Ui issue
|
2022-01-20 11:12:13 +05:30 |
|
Deepak Singh Gusain
|
65260abdff
|
resolved conflicts
|
2022-01-20 10:35:52 +05:30 |
|
Deepak Singh Gusain
|
a639f503d0
|
resolved conflicts
|
2022-01-20 10:32:25 +05:30 |
|
Devansh
|
41b0d284b9
|
Enhanced PDF
|
2022-01-19 23:36:04 +05:30 |
|
Devansh
|
c89120cc4d
|
Fixed Euro Currency Support
|
2022-01-19 20:43:28 +05:30 |
|
Deepak Singh Gusain
|
e475f8a05c
|
Fixed Locale Issue
|
2022-01-19 17:52:13 +05:30 |
|
Deepak Singh Gusain
|
98a89fa0da
|
Fixed multi select ui issue
|
2022-01-19 10:19:11 +05:30 |
|
Deepak Singh Gusain
|
65c0723014
|
fixed conflicts
|
2022-01-19 09:55:34 +05:30 |
|
Glenn Hermans
|
2577714d76
|
Merge pull request #5639 from deepaksinghgusain227/notification-tooltip
fixed when we hover over bell icon tooltip is not showing
|
2022-01-18 15:14:41 +01:00 |
|
Deepak Singh Gusain
|
a3d74c8531
|
added notification-title in place of title
|
2022-01-18 18:49:43 +05:30 |
|
Deepak Singh Gusain
|
b4c9938e9c
|
merge master
|
2022-01-18 18:44:16 +05:30 |
|
Deepak Singh Gusain
|
8e3d6667f9
|
formatted scss
|
2022-01-18 18:41:26 +05:30 |
|
Deepak Singh Gusain
|
1cbd3524cc
|
add scss for rtl and normal direction
|
2022-01-18 18:34:44 +05:30 |
|
Deepak Singh Gusain
|
7d38c0aedd
|
changes in nl translation
|
2022-01-18 18:15:25 +05:30 |
|
Deepak Singh Gusain
|
95ff54505c
|
turkish translation added for notification
|
2022-01-18 18:01:14 +05:30 |
|
Deepak Singh Gusain
|
cdbb3484f8
|
portuguese translation added for notification
|
2022-01-18 17:57:31 +05:30 |
|
Deepak Singh Gusain
|
4efa5daa3f
|
polish translation added for notification
|
2022-01-18 17:52:56 +05:30 |
|
Deepak Singh Gusain
|
d5ef4d61b0
|
dutch translation added for notification
|
2022-01-18 17:49:56 +05:30 |
|
Deepak Singh Gusain
|
b50afe02a7
|
italian translation added for notification
|
2022-01-18 17:45:49 +05:30 |
|
Deepak Singh Gusain
|
c7e9c74d47
|
Finnish translation added for notification
|
2022-01-18 17:41:21 +05:30 |