merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,491 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

7491 Commits

Author SHA1 Message Date
jitendra c61872cbe6 Fixed failed newsletter test 2021-01-05 11:26:16 +05:30
jitendra 65d37fe6de Resolve conflicts 2021-01-04 21:43:35 +05:30
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +05:30
Jitendra Singh 31a5256ae1
Merge pull request #4419 from Caine85/patch-1 
Fixing wrong locale in Admin notifications
 2021-01-04 12:55:22 +05:30
Caine85 dec3757605
Fixing wrong locale in Admin notifications 
Starting from Laravel 5.2, as stated in documentation (https://laravel.com/docs/5.2/upgrade#upgrade-5.2.0): 

Caching And Env
If you are using the config:cache command during deployment, you must make sure that you are only calling the env function from within your configuration files, and not from anywhere else in your application.
If you are calling env from within your application, it is strongly recommended you add proper configuration values to your configuration files and call env from that location instead, allowing you to convert your env calls to config calls.
 2021-01-03 12:40:35 +01:00
Glenn Hermans c401313f4d
Merge pull request #4416 from devansh-webkul/issue-4192 
Fixed database connection which is failing at first time when setup using bagisto:install #4192
 2020-12-31 19:27:13 +01:00
devansh bawari 3fe1b76354 Merge branch 'master' into issue-4192 2020-12-31 17:30:23 +05:30
Glenn Hermans fbe8758520
Merge pull request #4410 from devansh-webkul/issue-4408 
Fixed silder image not work #4408
 2020-12-31 10:01:35 +01:00
devansh bawari a654fac21b Runtime Handled 2020-12-31 11:46:04 +05:30
Glenn Hermans 124a547756
Merge pull request #4409 from devansh-webkul/web-vital-v1 
Bootstrap 3 version removed completely from velocity theme
 2020-12-30 12:36:51 +01:00
devansh bawari 1e55a5c6b2 Query Fixed 2020-12-30 16:35:41 +05:30
devansh bawari c8d44007a3 Merge remote-tracking branch 'upstream/master' into web-vital-v1 2020-12-30 15:47:59 +05:30
Glenn Hermans 8151803342
Merge pull request #4412 from devansh-webkul/master 
Test Case Fix
 2020-12-30 10:00:30 +01:00
devansh bawari 926c17554b Fixed Some Layouts 2020-12-30 13:31:24 +05:30
Jitendra Singh dfe8374f63
Merge pull request #4411 from rahulshukla-webkul/development 
added removed condtion for multiselect serach
 2020-12-30 13:06:51 +05:30
devansh bawari 7863fcfbfb Merge remote-tracking branch 'upstream/master' into web-vital-v1 2020-12-30 10:13:29 +05:30
devansh bawari 507403c4cc Some Comments Updated 2020-12-30 09:56:06 +05:30
devansh bawari a0143da28d Some Changes Done For Test Case 2020-12-30 09:53:08 +05:30
Glenn Hermans 7ea7eadfb6
Merge pull request #4363 from shubhwebkul/master 
core's function is used to fetch current channel code
 2020-12-30 03:20:25 +01:00
rahul shukla 73fc888ab5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-12-29 20:44:41 +05:30
rahul shukla 53ea1f2abf added removed condtion for multiselect serach 2020-12-29 20:39:17 +05:30
rahul shukla fec96337c0 added removed condtion for multiselect serach 2020-12-29 20:35:37 +05:30
devansh bawari b6f1fed10d Translation Added 2020-12-29 19:53:54 +05:30
devansh bawari 995f1d3149 Merge branch 'master' into web-vital-v1 2020-12-29 17:29:49 +05:30
Jitendra Singh 4f92ca602f
Merge pull request #4397 from rahulshukla-webkul/development 
Issue #4386 fixed.
 2020-12-29 16:44:38 +05:30
rahul shukla e723eb0872 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-12-29 15:53:57 +05:30
rahul shukla 759ca310f4 Issue #4369 fixed 2020-12-29 15:53:39 +05:30
devansh bawari f61bd28407 Merge remote-tracking branch 'upstream/master' into web-vital-v1 2020-12-29 13:38:26 +05:30
devansh bawari 79ce93952c Compilation Done! 😎 2020-12-29 13:07:43 +05:30
devansh bawari 614b78d3a2 Bootstrap 4 Conversion Completed 2020-12-29 13:05:09 +05:30
devansh bawari 05d73164e9 Compiled All My CSS Work For Today 2020-12-28 19:29:20 +05:30
devansh bawari 884891c039 95 Percent Bootstrap 4 Has Been Set 2020-12-28 19:28:49 +05:30
Glenn Hermans c3ef6ed9d3
Merge pull request #4406 from devansh-webkul/issue-4401 
Fixed composer install --no-dev which gives error #4401
 2020-12-28 10:30:13 +01:00
devansh bawari c36e694beb Composer Updated 2020-12-28 11:44:27 +05:30
Glenn Hermans 3793d0f2cd
Merge pull request #4400 from scchethu/master 
Added composer test-win
 2020-12-25 03:20:02 +01:00
chethan sc f6bcb72362
Added composer test-win 
composer test-win enable PHP unit test in windows platform.
 2020-12-25 07:17:07 +05:30
devansh bawari 4dd4beda28 Merge branch 'master' into web-vital-v1 2020-12-24 19:54:35 +05:30
devansh bawari ab83d5df28 Bootstrap 3 Removal In Progress 2020-12-24 19:34:08 +05:30
Glenn Hermans aa7be4ed35
Merge pull request #4396 from devansh-webkul/exception-on-channel 
Fixed channel exception #4380
 2020-12-24 13:55:12 +01:00
Glenn Hermans ae9838b3ba
Merge pull request #4395 from devansh-webkul/issue-4394 
Fixed maintenance mode status which is not working in channel section #4394
 2020-12-24 13:54:56 +01:00
rahul shukla 4d1ca8b66e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-12-24 17:36:23 +05:30
rahul shukla d09dcbf786 Issue #4386 fixed 2020-12-24 17:36:08 +05:30
devansh bawari da5b8a4ca7 Filter Added For All 2020-12-24 17:29:10 +05:30
devansh bawari ca2de63b48 Alias Filter Added 2020-12-24 16:50:40 +05:30
devansh bawari 4737f95410 Some Minor Fix 2020-12-24 16:09:10 +05:30
Glenn Hermans 3c49cd9fff
Merge pull request #4391 from rahulshukla-webkul/development 
#3638 fixed
 2020-12-23 14:47:20 +01:00
rahul shukla 22ba6c9534 Issue #4392 2020-12-23 18:21:31 +05:30
Glenn Hermans 7907f16243
Merge pull request #4387 from howdu/fix-recently-viewed 
Recently view typo and use view priceHTML
 2020-12-23 12:27:19 +01:00
rahul shukla 00997bfbff #3638 fixed 2020-12-23 15:40:27 +05:30
Jitendra Singh 82d457f328
Merge pull request #4377 from howdu/fix-limit-per-page 
Fix limit per page for datagrid
 2020-12-23 15:36:49 +05:30