Commit Graph

5585 Commits

Author SHA1 Message Date
devansh bawari 18322873aa Removed From One Page 2020-11-10 13:06:40 +05:30
devansh bawari d054bf8242 Reverted Two Files 2020-11-10 12:40:36 +05:30
devansh bawari 8c0395e8f7 One File Reverted 2020-11-10 12:15:02 +05:30
devansh bawari 5f75fa7fb2 Component Added For Both Themes 2020-11-10 12:08:46 +05:30
vishal.kushwaha650 24db2e81d4 remove wrong if condition 2020-11-10 11:55:37 +05:30
vishal.kushwaha650 d668f6de16 Same image warning issue resolved 2020-11-10 11:39:06 +05:30
devansh bawari 9eb317402e Component Added For Default Theme 2020-11-10 11:37:03 +05:30
vishal.kushwaha650 445c912217 Add Translation and implement in default theme 2020-11-10 10:45:49 +05:30
devansh bawari 5ce0a82fea Recompiled 2020-11-10 09:57:31 +05:30
devansh bawari 6639cf03cc Merge remote-tracking branch 'upstream/master' into issue-3929 2020-11-10 09:56:07 +05:30
Jitendra Singh 679594076b
Merge pull request #4245 from devansh-webkul/default_depend
Required Field Depend On Status
2020-11-09 22:02:07 +05:30
devansh bawari 6c211183a1 Added On The Basis Of Status 2020-11-09 20:07:27 +05:30
devansh bawari d27bbd7027 Added For Default Theme As Well 2020-11-09 19:44:41 +05:30
devansh bawari 19e04369f6 Dummy Translation Added 2020-11-09 18:38:18 +05:30
devansh bawari 4890420b2d Merge remote-tracking branch 'upstream/master' into issue-4029
Merged With Master
2020-11-09 18:25:37 +05:30
devansh bawari e47662e6a5 Warning Message Added In Place Order As Well 2020-11-09 18:23:47 +05:30
jitendra 67fc98db83 Conflicts resolved 2020-11-09 17:02:00 +05:30
jitendra f65c0c22a8 Updated typo for paypal label and changed the default sort order for payment methods 2020-11-09 17:00:25 +05:30
devansh bawari a3a858a459 Minimum Order Check Added To Cart 2020-11-09 16:53:32 +05:30
Jitendra Singh 2e8c26b606
Merge pull request #4243 from mo7amedmamdouh/bugfix/fix-rtl-carousel-slider
Bugfix carousel RTL
2020-11-09 16:03:32 +05:30
Mohamed Mamdouh d1e1cbbc89 Bugfix - correctly inject direction prob to slider 2020-11-09 11:58:14 +02:00
devansh bawari 9bc9f7e217 Console Log Removed 2020-11-09 14:56:39 +05:30
devansh bawari fd90a5ab37 Merge remote-tracking branch 'upstream/master'
Merged With Master
2020-11-09 14:20:48 +05:30
devansh bawari 433225ad81 Required Field Depend On Status 2020-11-09 14:20:32 +05:30
vishal.kushwaha650 d91d7cec58 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-4228 2020-11-09 10:25:55 +05:30
vishal.kushwaha650 7c15850520 Issue #4228 Fixed 2020-11-09 10:22:57 +05:30
Mohamed Mamdouh 8a74a22325 Bugfix carousel RTL 2020-11-08 17:34:11 +02:00
devansh bawari 40bde1a95d Merge remote-tracking branch 'upstream/master' into issue-4234
Merged With Master
2020-11-06 15:54:19 +05:30
devansh bawari 03a1f44def Default Value Added 2020-11-06 15:53:44 +05:30
Jitendra Singh 4ed2df4814
Merge pull request #4231 from vishal-webkul/issue-4229
Issue #4229 Fixed
2020-11-05 20:25:47 +05:30
devansh bawari 8534e55d0b Added In Responsive 2020-11-05 19:10:46 +05:30
vishal.kushwaha650 e03fab4d0c Issue #4229 Fixed 2020-11-05 18:18:05 +05:30
devansh bawari a189924823 Stopped Migration From Getting Published 2020-11-05 13:41:02 +05:30
devansh bawari a621542417 Finishing Done 2020-11-03 18:31:56 +05:30
devansh bawari e69543b31b Common Component Completed 2020-11-03 17:20:47 +05:30
devansh bawari d2f9e786fa Strict Typing Check Added For Common Component 2020-11-03 14:53:38 +05:30
devansh bawari db302a9d43 Recompiled 2020-11-03 12:20:42 +05:30
devansh bawari 74c06598d9 Merge remote-tracking branch 'upstream/master' into issue-3929 2020-11-03 12:20:07 +05:30
devansh bawari d94bf2417d Completed Recently Viewed Product Dependency 2020-11-03 12:17:29 +05:30
Glenn Hermans a0970f590d
Merge pull request #4153 from jaseelbavu/issue-4082
Added bulk category delete functionality
2020-11-02 17:16:33 +01:00
Jaseel P V 0de1f9e64b Added check for products in individual category delete | Fixed bug while selecting category for mass delete 2020-11-02 20:32:25 +05:30
Jitendra Singh e9591f6c0f
Merge pull request #4224 from jitendra-webkul/master
Removed commented code from paypal smart button controller
2020-11-02 17:36:33 +05:30
jitendra fdd6bca458 Removed commented code from paypal smart button controller 2020-11-02 17:36:04 +05:30
Jitendra Singh d6201b3c11
Merge pull request #4223 from jitendra-webkul/master
Paypal smart button issue fixed
2020-11-02 17:34:27 +05:30
jitendra 3cd5344448 Paypal smart button issue fixed 2020-11-02 17:33:57 +05:30
devansh bawari 233e87d7ef Some Work Done 2020-11-02 16:18:57 +05:30
Jitendra Singh 9de3a335b2
Merge pull request #4183 from devansh-webkul/issue-4181
Minimum Height Added #4181
2020-11-02 15:00:33 +05:30
Jitendra Singh 76f4db6adf
Merge pull request #4213 from asif-webkul/issue4127
fixed Issue  #4127
2020-11-02 14:20:51 +05:30
Jitendra Singh ac2ee68504
Merge pull request #4221 from devansh-webkul/issue-4220
Duplicated Images Removed #4220
2020-11-02 13:27:32 +05:30
Jitendra Singh 56159902d1
Merge pull request #4222 from devansh-webkul/dummy-1
Added regular price when sale price is added
2020-11-02 13:14:42 +05:30
devansh bawari f5d1eeb426 Removed From Velocity Assets Images 2020-11-02 13:02:36 +05:30
devansh bawari 8fbb1faea3 Just Final Step Finishing 2020-11-02 12:25:29 +05:30
Jitendra Singh b6dbdef04a
Merge pull request #4210 from rahulcs0082/development
Development
2020-11-02 12:24:56 +05:30
devansh bawari 549df39875 Merge branch 'master' into dummy-1
Merged With Master
2020-11-02 12:12:44 +05:30
devansh bawari 383edab8b5 Duplicated Images Removed 2020-11-02 11:59:21 +05:30
devansh bawari aa3ba2d24f Recompiled 2020-11-02 10:13:08 +05:30
devansh bawari b1cf108f11 Merge branch 'master' into issue-4181 2020-11-02 10:12:25 +05:30
devansh bawari fef875a3a8 Recompiled 2020-11-02 10:08:39 +05:30
devansh bawari 02080db646 Merged With Master 2020-11-02 10:07:49 +05:30
mohd asif 620c687683 Merge branch 'master' of https://github.com/bagisto/bagisto into issue4127 2020-11-01 11:39:49 +05:30
mohd asif 4f91ccf028 fixed issue #4127 2020-11-01 11:38:17 +05:30
devansh bawari 5aebd1b4e8 Merge branch 'master' into dummy-1
Merged With Master
2020-10-30 21:05:59 +05:30
devansh bawari fcac81c0d4 Recompiled 2020-10-30 21:01:12 +05:30
devansh bawari 6ff6b325d6 Merge branch 'master' into issue-4181 2020-10-30 21:00:38 +05:30
devansh bawari 9eff166437 Recompiled 2020-10-30 20:59:31 +05:30
devansh bawari 2daf78ac4e Merge branch 'master' into issue-4178 2020-10-30 20:58:59 +05:30
devansh bawari c6e2fe06dd Merge branch 'master' into issue-4119
Merged With Master
2020-10-30 20:54:25 +05:30
devansh bawari 3b6623c9c9 Recompiled 2020-10-30 20:37:56 +05:30
devansh bawari 2d4e9f0e97 Merge branch 'master' into issue-3929 2020-10-30 20:37:10 +05:30
devansh bawari 0ac032c908 Carousel Product Issue Fixed 2020-10-30 20:34:59 +05:30
Mohan Raj df383e4323 Merge branch 'master' of https://github.com/bagisto/bagisto into ISSUE_4111 2020-10-30 20:08:56 +05:30
Glenn Hermans bcfe391277
Merge pull request #4159 from praem90/ISSUE_4081
add validation for discount amt field in customer group price
2020-10-30 15:12:37 +01:00
devansh bawari a0b984a677 Removed Log 2020-10-30 19:41:10 +05:30
Glenn Hermans 42410fc2b7
Merge pull request #4208 from devansh-webkul/issue-4180
Some Minor Issue Fixed #4180
2020-10-30 15:09:20 +01:00
devansh bawari 865ae6c741 Featured Product Completed 2020-10-30 19:39:10 +05:30
Glenn Hermans 5aaa80e100
Merge pull request #4177 from prateek-webkul/master
issue #4079 fixed
2020-10-30 14:42:47 +01:00
devansh bawari 024799ad9f Merge branch 'master' into issue-3929 2020-10-30 18:38:41 +05:30
rahulshukla-home ce90a569f3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 18:22:39 +05:30
rahulshukla-home 30f9179439 removed unnecessary code in export controller 2020-10-30 18:21:39 +05:30
devansh bawari fa1932e333 Modal Issue Fixed 2020-10-30 17:36:31 +05:30
devansh bawari 43457b225e Merge remote-tracking branch 'dummy/patch-1' into dummy-1
Merged
2020-10-30 17:04:18 +05:30
devansh bawari 538f5b71fa Little Change And Recompiled 2020-10-30 16:44:56 +05:30
devansh bawari 6ee60ad355 Merge branch 'master' into issue-4178 2020-10-30 16:34:20 +05:30
Glenn Hermans 6be2c6e22d
Merge pull request #4202 from devansh-webkul/issue-4105
Fixed issue with total due in cash on delivery #4105
2020-10-30 12:00:01 +01:00
devansh bawari 4035e4f892 Some Changes 2020-10-30 16:29:34 +05:30
rahulshukla-home cd6471d5b9 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 15:55:14 +05:30
rahulshukla-home e700917341 Issue #4142 fixed 2020-10-30 15:45:01 +05:30
rahulshukla-home 8f67f6cee5 Issue #3142 fixed 2020-10-30 15:43:30 +05:30
Glenn Hermans 139572921e
Merge pull request #3997 from vishal-webkul/issue-3975
Issue #3975 Fixed
2020-10-30 10:36:27 +01:00
Glenn Hermans dd37cf00a9
Merge pull request #4099 from devansh-webkul/velocity_responsive_issue
Velocity Responsive Issue #4195
2020-10-30 10:25:18 +01:00
devansh bawari 331b385183 Overlapping Of Zoom Container Fixed 2020-10-30 10:31:52 +05:30
devansh bawari 3e9d9a396d Overlap Image Fixed 2020-10-29 19:48:47 +05:30
devansh bawari c981b8eb06 Sticky Header Adjusted 2020-10-29 19:02:30 +05:30
devansh bawari 661bd503e3 Fixed Search Bar Issue And Back And Forth Issue 2020-10-29 18:06:28 +05:30
devansh bawari ec7f9a5b33 Class Added 2020-10-29 16:10:47 +05:30
devansh bawari 4b70935f8f Recompiled 2020-10-29 15:38:57 +05:30
devansh bawari 5f6cba9b62 Merge remote-tracking branch 'deepak/fix-responsive-issues' into velocity_responsive_issue 2020-10-29 15:35:41 +05:30
devansh bawari 7bcb3adf23 Glitch Fixed 2020-10-29 13:58:42 +05:30
devansh bawari 1edf2f9169 Recompiled 2020-10-29 12:06:26 +05:30
devansh bawari 215c6349c7 Merge branch 'master' into velocity_responsive_issue 2020-10-29 12:05:29 +05:30
devansh bawari 906002c945 Case Added For Amount Due 2020-10-29 11:35:58 +05:30
gusaindeepak54 4bf5f5094d Recompiled 2020-10-29 10:51:14 +05:30
gusaindeepak54 9ea0191ba0 Merge branch 'master' into fix-responsive-issues 2020-10-29 10:49:35 +05:30
gusaindeepak54 c717adf206 conflicts 2020-10-29 10:29:10 +05:30
devansh bawari d09d6058e9 Padding Added 2020-10-28 20:09:10 +05:30
naresh-webkul 7d030469f1
Merge branch 'master' into 4136 2020-10-28 18:54:08 +05:30
Glenn Hermans ae0605a49c
Merge pull request #4199 from devansh-webkul/issue-4192
Config Cache Changes Added In Very Begining #4192
2020-10-28 14:18:46 +01:00
Jitendra Singh c2480ef1f0
Merge pull request #4185 from howdu/master
Fix error with missing locale and error with route:list
2020-10-28 18:34:50 +05:30
devansh bawari ce52c0aa2b Recompiled 2020-10-28 18:26:55 +05:30
devansh bawari 7b368761b2 Merge branch 'master' into issue-4181 2020-10-28 18:26:24 +05:30
Jitendra Singh c45dc84d7e
Merge pull request #4184 from devansh-webkul/issue-4180
Fixed cart icon is hidden in RTL #4180
2020-10-28 18:21:35 +05:30
Jitendra Singh b7e882998b
Merge pull request #4174 from AayushBhatt-webkul/master
#4134 fixed
2020-10-28 18:21:15 +05:30
unknown a0fad7f1c8 Custom Scripts 2020-10-28 18:07:04 +05:30
devansh bawari fe7d2d8a2b Recompiled 2020-10-28 17:59:33 +05:30
devansh bawari 14ca75b15f Merge branch 'master' into issue-4180 2020-10-28 17:58:17 +05:30
devansh bawari 85826f3458 Recompiled 2020-10-28 16:56:35 +05:30
devansh bawari 00474b9e5b Recompiled 2020-10-28 16:37:56 +05:30
devansh bawari c6c2c8804f Merge branch 'master' into issue-4150 2020-10-28 16:37:18 +05:30
Jitendra Singh a4aa459155
Merge pull request #4186 from devansh-webkul/issue-4115
Fixed icons hidden in wishlist or compare page for pt_BR locale #4115
2020-10-28 16:34:29 +05:30
devansh bawari d40239ae14 Font Size Reverted 2020-10-28 16:19:49 +05:30
naresh-webkul 665b365706
Merge branch 'master' into 4136 2020-10-28 15:57:05 +05:30
Jitendra Singh a248d7ced6
Merge pull request #4198 from naresh-webkul/4110
fixed issue #4110
2020-10-28 15:39:37 +05:30
Jitendra Singh 281466aaad
Merge pull request #4194 from praem90/ISSUE_4191
Disable booking dates on shop BookingProduct
2020-10-28 15:19:16 +05:30
devansh bawari fa6c59fc36 Recompiled 2020-10-28 15:07:03 +05:30
devansh bawari 5aa57fc164 Merge branch 'master' into velocity_responsive_issue 2020-10-28 15:06:28 +05:30
devansh bawari 03a91b25b7 Recompiled 2020-10-28 15:05:34 +05:30
devansh bawari bd5c1644c1 Merge branch 'master' into issue-4150 2020-10-28 15:04:35 +05:30
devansh bawari e864e845e3 Merge branch 'master' into issue-4119
Merged With Master
2020-10-28 15:03:33 +05:30
devansh bawari 1fd6a75c88 Merge branch 'master' into issue-4181
Merged With Master
2020-10-28 15:02:17 +05:30
devansh bawari 0bbec81ba6 Recompiled 2020-10-28 15:01:46 +05:30
devansh bawari 394ae59045 Merge branch 'master' into issue-4180 2020-10-28 15:00:50 +05:30
devansh bawari c7ab319b14 Merge branch 'master' into issue-4115
Merged With Master
2020-10-28 14:59:00 +05:30
devansh bawari 7c91efbc28 Merge branch 'master' into issue-4192
Merged With Master
2020-10-28 14:58:22 +05:30
Jitendra Singh 4b86a8533c
Merge pull request #4197 from naresh-webkul/4113
fixed issue #4113
2020-10-28 14:36:50 +05:30
naresh verma 4d8f78782f refixed issue #4110 2020-10-28 14:32:08 +05:30
naresh verma 85520a5cc3 added code to fixe issue #4136 2020-10-28 14:23:06 +05:30
devansh bawari d23cef33d0 Merge branch 'master' into issue-4192
Merged With Master
2020-10-28 14:16:42 +05:30
devansh bawari c9b23d8f3f Waiting For 2 Seconds Added 2020-10-28 14:16:22 +05:30
devansh bawari 66a22fba1a Merge branch 'master' into issue-4181 2020-10-28 14:13:40 +05:30
devansh bawari 19efd1975b Recompiled 2020-10-28 14:10:49 +05:30
devansh bawari cf68628235 Merge branch 'master' into issue-4115 2020-10-28 14:09:37 +05:30
Jitendra Singh 8bc9396035
Merge pull request #4196 from devansh-webkul/issue-4116
Tooltip Removed #4116
2020-10-28 13:59:58 +05:30
Jitendra Singh f651c413c1
Merge pull request #4188 from Mu9tafa-Online/patch-1
Updated some words (arabic)
2020-10-28 13:57:32 +05:30
naresh verma 8e8207f68a fixed issue #4136 2020-10-28 13:49:47 +05:30
devansh bawari a4e268095c Config Cache Changes Added In Very Begining 2020-10-28 13:10:07 +05:30
naresh verma 35e9343d1c refector code issue #4113 2020-10-28 12:45:28 +05:30
naresh verma f1df31cd42 fixed issue #4110 2020-10-28 12:30:02 +05:30
naresh verma 28f3f0ffe7 fixed issue #4113 2020-10-28 12:18:46 +05:30
devansh bawari 0539c01480 Tooltip Removed 2020-10-28 12:13:35 +05:30
gusaindeepak54 dd321515ef Fixed Respoonsive Issue 2020-10-28 10:58:40 +05:30