Commit Graph

7997 Commits

Author SHA1 Message Date
jitendra a07b04f6bf Conflicts resolved 2022-03-16 15:51:40 +05:30
jitendra 4639c5678e Primary icons chnaged according to dark mode 2022-03-16 15:50:19 +05:30
Glenn Hermans bdf669d416
Merge pull request #6043 from jitendra-webkul/master
Primary button color changed in dark mode
2022-03-16 11:09:06 +01:00
jitendra 6914ad6ee5 Primary button color changed in dark mode 2022-03-16 15:26:30 +05:30
Jitendra Singh d82e6802da
Merge pull request #6042 from jitendra-webkul/master
Admin left nav ui issue fixed
2022-03-16 15:04:54 +05:30
jitendra 65239f7b5f Admin left nav ui issue fixed 2022-03-16 14:50:13 +05:30
Jitendra Singh 2d16681b74
Merge pull request #6036 from jitendra-webkul/master
Velocity carousel navigation position changed to the top on home page
2022-03-16 12:44:46 +05:30
jitendra 74e70cdae2 Velocity carousel navigation position changed to the top on home page 2022-03-16 12:35:49 +05:30
Jitendra Singh 5d083cf5e8
Merge pull request #6035 from devansh-webkul/category-delete
Category Delete Fixed
2022-03-16 12:12:40 +05:30
Devansh 648668c657 Category Fixed 2022-03-16 11:56:12 +05:30
jitendra 8244a0a16f Conflicts resolved 2022-03-16 11:17:06 +05:30
jitendra d3984c3116 Velocity form ui improved 2022-03-16 11:10:47 +05:30
prateek srivastava 56fa99f1e2 responsive quantity changer issue fixed 2022-03-16 11:06:10 +05:30
Jitendra Singh de8319412b
Merge pull request #6032 from jitendra-webkul/master
Velocity quantity box ui issue fixed
2022-03-15 19:25:08 +05:30
jitendra ec0b667939 Velocity quantity box ui issue fixed 2022-03-15 19:08:35 +05:30
Jitendra Singh e5eaa313cb
Merge pull request #6031 from jitendra-webkul/master
Velocity ui issues fixed
2022-03-15 18:46:14 +05:30
jitendra 0e4cc72d0a Velocity product list card price ui improved 2022-03-15 17:56:16 +05:30
Jitendra Singh 34fee4cc60
Merge pull request #6030 from devansh-webkul/notification-issue
Notification Fixed #5921
2022-03-15 17:54:08 +05:30
jitendra 2a8352a3e7 Velocity removed margin from dropdown last list item 2022-03-15 17:32:05 +05:30
Devansh 3927800bce Notification Fixed 2022-03-15 17:32:03 +05:30
jitendra dd24e7c54f Velocity locale switcher text align changed to left 2022-03-15 17:29:53 +05:30
jitendra 8747a21469 Velocity modal box olerlay background color changed 2022-03-15 17:26:17 +05:30
Jitendra Singh af9700fdb3
Merge pull request #6029 from jitendra-webkul/master
Velocity checkout page ui improved
2022-03-15 17:18:13 +05:30
jitendra 30759c3776 Velocity checkout page ui improved 2022-03-15 16:46:56 +05:30
Jitendra Singh 9d2f9b0af7
Merge pull request #6028 from jitendra-webkul/master
Velocity login modal box ui improved
2022-03-15 16:31:14 +05:30
jitendra 4ba77e0287 Velocity login modal box ui improved 2022-03-15 16:22:15 +05:30
Jitendra Singh 42dae59b8a
Merge pull request #6027 from jitendra-webkul/master
Quick view button icon alignment issue fixed
2022-03-15 16:14:00 +05:30
merdan 74cb937809 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-15 15:43:31 +05:00
merdan 0a2bdd7fb8 wishlist 2022-03-15 15:43:16 +05:00
jitendra 3e0a27cbbd Quick view button icon alignment issue fixed 2022-03-15 15:44:55 +05:30
Jitendra Singh c6471def2b
Merge pull request #6025 from devansh-webkul/syncing
New Customer Syncing Added #4356
2022-03-15 15:43:27 +05:30
jitendra 902bc66dde Removed commented css 2022-03-15 15:07:52 +05:30
Jitendra Singh 5246c7059c
Merge pull request #6026 from jitendra-webkul/master
Cart ui issues fixed
2022-03-15 15:07:05 +05:30
jitendra 00b19c79c8 Cart ui issues fixed 2022-03-15 15:06:32 +05:30
jitendra 293f3846f0 Cart ui issues fixed 2022-03-15 15:05:13 +05:30
Devansh e810b84369 New Customer Syncing Added 2022-03-15 14:30:01 +05:30
Jitendra Singh 555414999c
Merge pull request #6024 from jitendra-webkul/master
Issue #5728 fixed
2022-03-15 12:14:58 +05:30
jitendra 23b72c69fa Fixed cart ui issue 2022-03-15 12:00:41 +05:30
jitendra d424794aae Issue #5728 fixed 2022-03-15 11:57:44 +05:30
Jitendra Singh a41a43b0f4
Merge pull request #6013 from devansh-webkul/filter-issue-fixed
Filter Issue Fixed #5995
2022-03-15 11:57:14 +05:30
Jitendra Singh 9f7eb2f546
Merge pull request #6023 from jitendra-webkul/master
Issue #5654 fixed
2022-03-15 11:27:42 +05:30
Devansh b6f26e19a5 Refactored 2022-03-15 11:27:33 +05:30
jitendra 4a3543f91f Issue #5654 fixed 2022-03-15 11:14:00 +05:30
jitendra b2a7d68846 Issue #5654 fixed 2022-03-15 11:09:33 +05:30
Jitendra Singh 9523b25b11
Merge pull request #6022 from jitendra-webkul/master
Issue #6010 fixed'
2022-03-15 10:38:41 +05:30
jitendra 32b6bd2bbe Issue #6010 fixed' 2022-03-15 10:37:58 +05:30
Jitendra Singh e5ff58cece
Merge pull request #6021 from jitendra-webkul/master
Issue #6010 fixed
2022-03-15 10:11:50 +05:30
jitendra 0cbb94b91b Issue #6010 fixed 2022-03-15 10:03:07 +05:30
Jitendra Singh 07edaee93e
Merge pull request #6020 from jitendra-webkul/master
Issue #6019 fixed
2022-03-15 10:01:52 +05:30
jitendra f829f526cb Issue #6019 fixed 2022-03-15 09:52:04 +05:30
Ahmet Arşiv f40630df80 Missing and incorrect Turkish language files have been edited and added 2022-03-14 18:38:31 +03:00
jitendra de335ad228 Changed Carousel navigation icons 2022-03-14 20:46:58 +05:30
jitendra 94f09bb301 Fixed velocity ui issue 2022-03-14 20:22:07 +05:30
jitendra 34a3acc6c0 Issue #6006 fixed 2022-03-14 20:09:02 +05:30
Devansh a6dd937bd4 Filter Issue Fixed 2022-03-14 20:01:44 +05:30
jitendra 34646e3894 Issue #6008 fixed 2022-03-14 20:01:26 +05:30
jitendra 6fae8f21a4 Issue #6008 fixed 2022-03-14 19:59:26 +05:30
Jitendra Singh e5cceb649b
Merge pull request #6009 from devansh-webkul/persist-page
Datagrid Page Persisted #5995
2022-03-14 19:20:04 +05:30
Jitendra Singh 4bc9236900
Merge pull request #6011 from jitendra-webkul/master
Fixed velocity ui issues
2022-03-14 19:07:03 +05:30
jitendra f980fe2cb4 Fixed velocity ui issues 2022-03-14 18:59:24 +05:30
jitendra cd982583cf Fixed velocity ui issues 2022-03-14 18:58:57 +05:30
Devansh d2b7e02d48 Datagrid Page Persisted 2022-03-14 18:35:40 +05:30
merdan b7075a2d3d category filtres 2022-03-14 16:05:40 +05:00
merdan 15c3025312 category filtres 2022-03-14 15:49:37 +05:00
merdan 0d7fbf615a category default limit 2022-03-14 15:38:15 +05:00
Sanjay 3558460ffa Issue #5915 Fixed 2022-03-14 15:08:08 +05:30
merdan 4f33f210ac Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-14 11:21:38 +05:00
Jitendra Singh 42a4ff7005
Merge pull request #6003 from jitendra-webkul/master
Issue #5929 fixed
2022-03-14 11:50:40 +05:30
jitendra 68ce18d327 Issue #5929 fixed 2022-03-14 11:43:04 +05:30
Jitendra Singh 5b329f2518
Merge pull request #5994 from Sanjaybhattwebkul/Hebrew-locale-added
Hebrew Locale Added
2022-03-14 11:33:13 +05:30
Jitendra Singh caf615a1aa
Merge pull request #5993 from Sanjaybhattwebkul/Bengali-locale-added
Bengali Locale Added
2022-03-14 11:33:07 +05:30
Jitendra Singh bce85487df
Merge pull request #5992 from Sanjaybhattwebkul/Sinhalese-locale-added
Sinhalese Locale Added
2022-03-14 11:32:59 +05:30
Jitendra Singh c325b479be
Merge pull request #5991 from Sanjaybhattwebkul/Russian-locale-added
Russian Locale Added
2022-03-14 11:32:43 +05:30
jitendra d5f651557e Compiled assets for production 2022-03-11 20:44:39 +05:30
jitendra 6250d18dbd Uncommented the validator language code 2022-03-11 20:43:39 +05:30
jitendra 5692896138 Issue #5985 fixed 2022-03-11 20:36:06 +05:30
jitendra 49e30f0d64 Resolved conflicts 2022-03-11 20:15:15 +05:30
jitendra 71252adb00 Issue #5976 fixed 2022-03-11 20:13:40 +05:30
merdan 6cf2dcb15c Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-11 18:12:44 +05:00
Jitendra Singh 90e0ddb306
Merge pull request #5996 from jitendra-webkul/master
Fixed issues
2022-03-11 17:41:38 +05:30
jitendra f081ef31b9 Issue #1238 fixed 2022-03-11 17:09:02 +05:30
jitendra 1671fefc4b Issue #1238 fixed 2022-03-11 17:01:44 +05:30
merdan a163050007 category default limit 2022-03-11 16:27:57 +05:00
merdan 1a8de700a0 category default limit 2022-03-11 14:54:32 +05:00
jitendra de4b723b45 Issue #2918 fixed (The booking date should be correct) 2022-03-11 13:32:27 +05:30
merdan 9997c6e99e category default limit 2022-03-11 12:31:08 +05:00
Sanjay 3da5104203 Hebrew-locale-added-for-velocity-package 2022-03-11 12:48:15 +05:30
Sanjay 2b5218a55e Hebrew-locale-added-for-shop-package 2022-03-11 12:43:52 +05:30
Sanjay 09b4fa02f4 Bengali-locale-added-for-shop-package 2022-03-11 12:40:06 +05:30
Sanjay 6a65ed9ccb Bengali-locale-added 2022-03-11 12:35:22 +05:30
Sanjay fd7ef0a17f Sinhalese-Locale-Added-For-Shop-Package 2022-03-11 12:26:10 +05:30
Sanjay 3c959e6844 Sinhalese-locale-added-for-velocity-package 2022-03-11 12:20:24 +05:30
Sanjay 02120d89b8 Russain-locale-added-velocity-package 2022-03-11 12:13:07 +05:30
Sanjay 6513815e3b Russion-locale-added-shop-package 2022-03-11 12:05:49 +05:30
Jitendra Singh 96bcca8f26
Merge pull request #5990 from jitendra-webkul/master
Issue #2918 fixed
2022-03-11 12:00:08 +05:30
jitendra 4490d98ff7 Issue #2918 fixed (The booking date should be highlighted on the calendar view.) 2022-03-11 11:58:20 +05:30
Jitendra Singh 6c699244fb
Merge pull request #5989 from jitendra-webkul/master
Issue #2918 fixed
2022-03-11 11:09:02 +05:30
jitendra 3814c88129 Issue #2918 fixed 2022-03-11 11:08:22 +05:30
anmol chauhan 59bcb71909 issue #5980 fixed 2022-03-10 19:58:30 +05:30
Jitendra Singh a2e64b737c
Merge pull request #5986 from jitendra-webkul/master
Issue #2918 fixed (Added calendar view)
2022-03-10 19:03:21 +05:30
jitendra 6f16bd69e8 Issue #2918 fixed (Added calendar view) 2022-03-10 19:02:50 +05:30
Jitendra Singh 8726540b25
Merge pull request #5984 from Sanjaybhattwebkul/Hindi-locale-booking-product
Hindi Locale Added For Booking Products
2022-03-10 17:50:29 +05:30
Sanjay c4a473e906 Complete-missing-changes 2022-03-10 17:34:28 +05:30
Sanjay 0bb5ec737b Hindi-locale-added-for-booking-products 2022-03-10 16:58:33 +05:30
Jitendra Singh 7244e97967
Merge pull request #5983 from Sanjaybhattwebkul/Hindi-locale-added
Complete changes on Hindi locale-file
2022-03-10 16:49:37 +05:30
Sanjay 27bf899c43 Complete-changes-on-hi_IN-locale-file 2022-03-10 16:39:49 +05:30
merdan a3de765254 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-10 16:09:23 +05:00
merdan d95b3da008 category default limit 2022-03-10 16:09:05 +05:00
Glenn Hermans d1c0139da0
Merge pull request #5975 from Anmol-Chauhan/fixed-wish_compare-multitime-issue
fixed #5968 issue
2022-03-10 11:39:23 +01:00
Jitendra Singh 78dc3c6be4
Merge pull request #5981 from jitendra-webkul/master
Issue #2918 fixed
2022-03-10 15:55:30 +05:30
jitendra b3c99c6763 Added bookings translations 2022-03-10 15:44:57 +05:30
jitendra 96bbe9ab31 Issue #2918 fixed 2022-03-10 15:35:35 +05:30
merdan 79452f85f2 category default limit 2022-03-10 13:53:58 +05:00
merdan 4c1d795e1a Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-10 13:53:15 +05:00
merdan 1b8833fa32 category default limit 2022-03-10 13:29:47 +05:00
merdan 94b891c66e category default limit 2022-03-10 13:24:15 +05:00
merdan 9089514edd category default limit 2022-03-10 13:08:37 +05:00
merdan 95904ff41a category default limit 2022-03-10 13:05:34 +05:00
merdan b39ced2ecb category default limit 2022-03-10 12:59:50 +05:00
Jitendra Singh 2469ea5057
Merge pull request #5972 from Sanjaybhattwebkul/Hindi-locale-added
Hindi Locale Ldded
2022-03-10 13:27:46 +05:30
Sanjay bf100069af Remove-duplicate-values 2022-03-10 13:14:33 +05:30
merdan 2a91ac8790 category default limit 2022-03-10 12:42:10 +05:00
Sanjay 441438bffd Velocity-changes-complete 2022-03-10 13:08:47 +05:30
jitendra 87d3c6490a Fixed some ui issues in datagrid 2022-03-10 12:29:22 +05:30
jitendra 42f7e0e847 Added cursor pointer to sortable table header 2022-03-10 12:23:35 +05:30
jitendra 4e83e8e1f0 Conflicts resolved 2022-03-10 12:09:26 +05:30
jitendra 42937bbac1 Fixed 2022-03-10 12:06:38 +05:30
anmol chauhan 366449748c fixed #5968 issue 2022-03-10 11:16:09 +05:30
merdan 55b60532f4 category default limit 2022-03-09 18:32:57 +05:00
Sanjay f9cac3a0c0 Hindi-locale-added 2022-03-09 18:51:25 +05:30
merdan 4a83a21db8 category default limit 2022-03-09 17:34:01 +05:00
merdan 6328d86253 category default limit 2022-03-09 15:45:53 +05:00
merdan ff6d4a0a84 category default limit 2022-03-09 15:43:30 +05:00
merdan 5a593bbe7b category default limit 2022-03-09 15:39:22 +05:00
merdan 7534ef4b81 fixing pickup 2022-03-09 13:51:07 +05:00
merdan 5bd77bdb84 fixing pickup 2022-03-09 13:49:38 +05:00
prateek srivastava abf9299ca3 issue #5966 fixed 2022-03-09 13:05:30 +05:30
merdan 941e3a3b72 fixing pickup 2022-03-09 11:43:45 +05:00
merdan 3f0ac64cbd Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-07 19:48:45 +05:00
merdan d81feb0196 fixing pickup 2022-03-07 19:48:28 +05:00
prateek srivastava 2cc1bef92f conflict resolved 2022-03-07 11:40:02 +05:30
merdan 14841d08a4 orders api fx 2022-03-06 15:58:45 +05:00
merdan 56c22069e3 orders api 2022-03-06 15:54:17 +05:00
merdan 733fd86041 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-06 13:31:40 +05:00
merdan 5e293570d1 orders modify2 2022-03-06 13:31:22 +05:00
prateek srivastava bd2ea25388 conflict resolved 2022-03-04 19:53:40 +05:30
Prateek Srivastava df484ec1bc
Merge pull request #5955 from prateek-webkul/checkbox-attribute-ui-issue
issue #5805 fixed
2022-03-04 19:48:59 +05:30
prateek srivastava 9ea9584e05 issue #5939 fixed 2022-03-04 19:48:02 +05:30
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