Commits · bf6d6c592063c31bed850b5c77fbc4b592c355dc · Manzar Hussain / dic-global-dev

24 Dec, 2020 15 commits
- products on home page · bf6d6c59
  Manzar Hussain committed Dec 24, 2020
  
  bf6d6c59 Browse Files
- resolve conflict · 5c5676f2
  Manzar Hussain committed Dec 24, 2020
  
  5c5676f2 Browse Files
- front page · db386de1
  Manzar Hussain committed Dec 24, 2020
  
  db386de1 Browse Files
- Merge branch 'develop' into 'feature-theme' · 620a7070
```
# Conflicts:
#   themes/custom/envigo/templates/layout/page--front.html.twig
```
  Manzar Hussain committed Dec 24, 2020
  620a7070 Browse Files
- front page design fix · 09860e31
  Manzar Hussain committed Dec 24, 2020
  
  09860e31 Browse Files
- Merge branch 'feature-theme' into 'develop' · 351b47a9
```
front page fix

See merge request manzarH/dic-global-dev!30
```
  Manzar Hussain committed Dec 24, 2020
  351b47a9 Browse Files
- Merge branch 'develop' into 'feature-theme' · 56f58abc
```
# Conflicts:
#   themes/custom/envigo/templates/layout/page--front.html.twig
```
  Manzar Hussain committed Dec 24, 2020
  56f58abc Browse Files
- front page fix · 3a854f3c
  Manzar Hussain committed Dec 24, 2020
  
  3a854f3c Browse Files
- Merge branch 'feature-theme' into 'develop' · 71169c56
```
front page

See merge request manzarH/dic-global-dev!29
```
  Manzar Hussain committed Dec 24, 2020
  71169c56 Browse Files
- Merge branch 'develop' into 'feature-theme' · d5443fe7
```
# Conflicts:
#   themes/custom/envigo/templates/layout/page--front.html.twig
```
  Manzar Hussain committed Dec 24, 2020
  d5443fe7 Browse Files
- front page · 5e8e6bc4
  Manzar Hussain committed Dec 24, 2020
  
  5e8e6bc4 Browse Files
- Merge branch 'feature-theme' into 'develop' · 142d0a53
```
rename photos to photo.css from library

See merge request manzarH/dic-global-dev!28
```
  Manzar Hussain committed Dec 24, 2020
  142d0a53 Browse Files
- rename photos to photo.css from library · e3c79358
  Manzar Hussain committed Dec 24, 2020
  
  e3c79358 Browse Files
- Merge branch 'feature-theme' into 'develop' · da210361
```
photos design update

See merge request manzarH/dic-global-dev!27
```
  Manzar Hussain committed Dec 24, 2020
  da210361 Browse Files
- photos design update · c129d7f5
  Manzar Hussain committed Dec 24, 2020
  
  c129d7f5 Browse Files
23 Dec, 2020 23 commits
- Merge branch 'feature-theme' into 'develop' · 612727c3
```
add leadership page

See merge request manzarH/dic-global-dev!26
```
  Manzar Hussain committed Dec 23, 2020
  612727c3 Browse Files
- add leadership page · f6e2ffd9
  Manzar Hussain committed Dec 23, 2020
  
  f6e2ffd9 Browse Files
- Merge branch 'revert-79e320d1' into 'develop' · a5db5f6d
```
Revert "Merge branch 'feature-theme' into 'develop'"

See merge request manzarH/dic-global-dev!24
```
  Manzar Hussain committed Dec 23, 2020
  a5db5f6d Browse Files
- Revert "Merge branch 'feature-theme' into 'develop'" · f56fd936
```
This reverts merge request !23
```
  Manzar Hussain committed Dec 23, 2020
  f56fd936 Browse Files
- Merge branch 'feature-theme' into 'develop' · 79e320d1
```
design fix

See merge request manzarH/dic-global-dev!23
```
  Manzar Hussain committed Dec 23, 2020
  79e320d1 Browse Files
- design fix · bc849dab
  Manzar Hussain committed Dec 23, 2020
  
  bc849dab Browse Files
- Merge branch 'feature-theme' into 'develop' · aa126afe
```
add front and css update

See merge request manzarH/dic-global-dev!22
```
  Manzar Hussain committed Dec 23, 2020
  aa126afe Browse Files
- add front and css update · bc9145d8
  Manzar Hussain committed Dec 23, 2020
  
  bc9145d8 Browse Files
- Merge branch 'feature-theme' into 'develop' · 789643c3
```
Feature theme

See merge request manzarH/dic-global-dev!21
```
  Manzar Hussain committed Dec 23, 2020
  789643c3 Browse Files
- news content · af2a8c71
  Manzar Hussain committed Dec 23, 2020
  
  af2a8c71 Browse Files
- news listing · 5b94da71
  Manzar Hussain committed Dec 23, 2020
  
  5b94da71 Browse Files
- Merge branch 'feature-theme' into 'develop' · f7f4f672
```
Feature theme

See merge request manzarH/dic-global-dev!20
```
  Ajay Barthwal committed Dec 23, 2020
  f7f4f672 Browse Files
- fix image issue · 9c7dad46
  Manzar Hussain committed Dec 23, 2020
  
  9c7dad46 Browse Files
- home page products · b69682ab
  Manzar Hussain committed Dec 23, 2020
  
  b69682ab Browse Files
- new images · f066e484
  Manzar Hussain committed Dec 23, 2020
  
  f066e484 Browse Files
- Merge branch 'feature-theme' into 'develop' · ef28cc99
```
add css

See merge request manzarH/dic-global-dev!19
```
  Ajay Barthwal committed Dec 23, 2020
  ef28cc99 Browse Files
- add css · 699089ee
  Manzar Hussain committed Dec 23, 2020
  
  699089ee Browse Files
- Merge branch 'feature-theme' into 'develop' · 9f7dd65b
```
testimonial for products

See merge request manzarH/dic-global-dev!18
```
  Ajay Barthwal committed Dec 23, 2020
  9f7dd65b Browse Files
- testimonial for products · 8a0c526d
  Manzar Hussain committed Dec 23, 2020
  
  8a0c526d Browse Files
- Merge branch 'feature-theme' into 'develop' · 1f5be5a6
```
modified updated

See merge request manzarH/dic-global-dev!17
```
  Ajay Barthwal committed Dec 23, 2020
  1f5be5a6 Browse Files
- modified updated · c48950e1
  Manzar Hussain committed Dec 23, 2020
  
  c48950e1 Browse Files
- Merge branch 'feature-theme' into 'develop' · 48bfe8f1
```
Feature theme

See merge request manzarH/dic-global-dev!16
```
  Ajay Barthwal committed Dec 23, 2020
  48bfe8f1 Browse Files
- add new block for product · 1aaddab0
  Manzar Hussain committed Dec 23, 2020
  
  1aaddab0 Browse Files
22 Dec, 2020 2 commits
- add slick js and slick css · 223d1dc8
  Manzar Hussain committed Dec 22, 2020
  
  223d1dc8 Browse Files
- Merge branch 'feature-theme' into 'develop' · 6bb312b9
```
remove slick css and js from frontend

See merge request manzarH/dic-global-dev!15
```
  Ajay Barthwal committed Dec 22, 2020
  6bb312b9 Browse Files