development to main update #39

Merged
mik-tf merged 19 commits from development into main 2024-06-07 17:32:48 +00:00

19 Commits

Author SHA1 Message Date
ce630106d0 Merge pull request 'added team picture with more members' (#44) from dev_team into development
Reviewed-on: tfgrid/www_projectinca#44
2024-06-07 17:32:18 +00:00
Mik-TF
4000379b50 added team picture with more members 2024-06-07 13:30:08 -04:00
c30d00633d Merge pull request 'development_background' (#42) from development_background into development
Reviewed-on: tfgrid/www_projectinca#42
2024-06-07 17:15:08 +00:00
Mik-TF
f2f8fc0d9d removed pic not needed 2024-06-07 13:14:42 -04:00
Mik-TF
b531e1be33 added ai image for temp display 2024-06-07 13:14:02 -04:00
52019a62bc Merge pull request 'new pics tech' (#41) from dev_pics into development
Reviewed-on: tfgrid/www_projectinca#41
2024-06-07 16:08:00 +00:00
Mik-TF
0f6af03947 new pics tech 2024-06-07 12:07:10 -04:00
6c4807de97 Merge pull request 'brought back pics for tech, temp pics' (#40) from development_tech_pics into development
Reviewed-on: tfgrid/www_projectinca#40
2024-06-07 15:40:37 +00:00
Mik-TF
4fe1f841ab brought back pics for tech, temp pics 2024-06-07 11:38:47 -04:00
sasha-astiadi
bf0ba8634f add img 2024-06-07 17:05:14 +03:00
cddb9e6893 Merge pull request 'simplified landing' (#38) from development_simplified_landing into development
Reviewed-on: tfgrid/www_projectinca#38
2024-06-07 13:15:22 +00:00
Mik-TF
5a0d6025a7 simplified landing 2024-06-07 09:14:05 -04:00
e2e94ee411 Merge pull request 'development_landingpage2' (#37) from development_landingpage2 into development
Reviewed-on: tfgrid/www_projectinca#37
2024-06-07 12:52:16 +00:00
Mik-TF
636ae05cd6 fixed learn more landing page 2024-06-07 08:52:00 -04:00
Mik-TF
24fbe22392 updated landingpage 2024-06-07 08:50:10 -04:00
635920fbc6 Merge pull request 'updated faq' (#36) from development_faq into development
Reviewed-on: tfgrid/www_projectinca#36
2024-06-07 12:36:19 +00:00
Mik-TF
f69570c8eb updated faq 2024-06-07 08:35:44 -04:00
2a9b7a29d8 Merge pull request 'new footer' (#35) from development_footer2 into development
Reviewed-on: tfgrid/www_projectinca#35
2024-06-07 12:18:50 +00:00
Mik-TF
54ba775c38 new footer 2024-06-07 08:18:05 -04:00