Commit Graph

2325 Commits

Author SHA1 Message Date
Jitendra Singh 049ec2a32a
Merge pull request #6200 from devansh-webkul/removed-middleware
Removed extra middlewares
2022-03-31 17:13:43 +05:30
jitendra dd9be9a981 Updated users page title 2022-03-31 16:59:07 +05:30
Devansh 22b1725d85 Removed Extra Middlewares 2022-03-31 16:58:52 +05:30
jitendra ae91626e1e Issue #6172 fixed 2022-03-30 13:58:13 +05:30
jitendra b1938481d9 Issue #6144 fixed 2022-03-30 10:11:26 +05:30
merdan 5de0c82f74 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-29 17:06:50 +05:00
jitendra 4bace8ad4b Issue #2278 fixed 2022-03-28 15:15:15 +05:30
jitendra 6edd13c4e2 Admin left side menu z-index issue fixed 2022-03-28 13:15:07 +05:30
jitendra 0fd71e0a83 Issue #4959 fixed 2022-03-28 12:46:15 +05:30
jitendra 106301f356 Issue #6121 fixed 2022-03-28 11:48:06 +05:30
jitendra 67e4615961 Removed vue component string binding due unhandled escaping for other locales 2022-03-28 11:36:23 +05:30
jitendra e9543befb6 Issue #6144 fixed 2022-03-28 11:07:17 +05:30
merdan b6c46480aa Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
2022-03-25 16:18:54 +05:00
jitendra a4cd3a8630 Issue #1466 fixed 2022-03-25 13:00:13 +05:30
jitendra 5fb810852f Issue #6119 fixed 2022-03-25 11:39:16 +05:30
jitendra 828ef3827d Issue #6111 fixed 2022-03-25 11:19:31 +05:30
jitendra a081ddc96c Issue #6119 fixed 2022-03-25 11:10:19 +05:30
jitendra 930819dadc Issue #6114 fixed 2022-03-25 10:29:43 +05:30
jitendra bd58694b6e Merge with master 2022-03-24 12:51:07 +05:30
merdan d3409841b9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-17 16:36:07 +05:00
Devansh bb550c3820 Export Fixed 2022-03-17 14:24:33 +05:30
jitendra 5770c86e8f Issue #6038 fixed 2022-03-16 16:34:18 +05:30
jitendra 42855c6769 Form control locale-chanel label alignment fixed 2022-03-16 16:19:32 +05:30
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
Devansh 648668c657 Category Fixed 2022-03-16 11:56:12 +05:30
merdan 74cb937809 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-15 15:43:31 +05:00
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
Ahmet Arşiv f40630df80 Missing and incorrect Turkish language files have been edited and added 2022-03-14 18:38:31 +03: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 68ce18d327 Issue #5929 fixed 2022-03-14 11:43:04 +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 1671fefc4b Issue #1238 fixed 2022-03-11 17:01:44 +05:30
jitendra de4b723b45 Issue #2918 fixed (The booking date should be correct) 2022-03-11 13:32:27 +05:30
Sanjay 27bf899c43 Complete-changes-on-hi_IN-locale-file 2022-03-10 16:39:49 +05:30
merdan 4c1d795e1a Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-10 13:53:15 +05:00
Sanjay f9cac3a0c0 Hindi-locale-added 2022-03-09 18:51:25 +05:30
merdan 3f0ac64cbd Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-07 19:48:45 +05:00
prateek srivastava 2cc1bef92f conflict resolved 2022-03-07 11:40:02 +05:30
merdan 733fd86041 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-06 13:31:40 +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
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