Commit Graph

158 Commits

Author SHA1 Message Date
d43c9656e1 s 2024-06-09 11:40:52 +03:00
d24ab842f7 Merge pull request 'development to main' (#49) from development into main
Reviewed-on: tfgrid/www_projectinca#49
2024-06-08 17:31:20 +00:00
05e105f57e Merge pull request 'updated footer with build, get inca nodes, threefold.io in A Project by ...' (#47) from development_update_footer into development
Reviewed-on: tfgrid/www_projectinca#47
2024-06-08 15:12:51 +00:00
Mik-TF
4cc60ffc47 simplified footer with inca build and get nodes 2024-06-08 11:11:59 -04:00
81a61aeb97 Merge pull request 'fixed typos' (#48) from development_farming_update into development
Reviewed-on: tfgrid/www_projectinca#48
2024-06-08 15:05:10 +00:00
Mik-TF
215336b692 updated infos 2024-06-08 11:04:34 -04:00
Mik-TF
3a205aba13 fixed typos 2024-06-08 10:51:00 -04:00
f3865e3ca4 s 2024-06-08 17:37:47 +03:00
Mik-TF
2a0a7c531a updated footer with threefold.io link 2024-06-08 10:19:26 -04:00
56ddc88bba Merge branch 'development' of git.ourworld.tf:tfgrid/www_projectinca into development 2024-06-08 17:11:21 +03:00
126f3d42fe s 2024-06-08 17:11:17 +03:00
7af5e09f2a Merge pull request 'development to main periodic update' (#46) from development into main
Reviewed-on: tfgrid/www_projectinca#46
2024-06-08 14:02:20 +00:00
9f1473f354 Merge pull request 'fixes details' (#45) from development_fixes into development
Reviewed-on: tfgrid/www_projectinca#45
2024-06-08 14:01:47 +00:00
Mik-TF
cb91a0b5f0 fixes details 2024-06-08 09:59:40 -04:00
7ebd3c85c7 Merge pull request 'development to main update' (#39) from development into main
Reviewed-on: tfgrid/www_projectinca#39
2024-06-07 17:32:47 +00:00
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
47f14b9f31 Merge pull request 'development to main periodic update' (#34) from development into main
Reviewed-on: tfgrid/www_projectinca#34
2024-06-07 11:58:17 +00:00
sasha-astiadi
fd3c6df21f edit responsiveness 2024-06-07 11:42:08 +03:00
sasha-astiadi
d1aa6087c8 Merge branch 'development' of https://git.ourworld.tf/tfgrid/www_projectinca into development 2024-06-07 11:41:17 +03:00
sasha-astiadi
500538c107 Edit name 2024-06-07 11:41:13 +03:00
e28c2576fb s 2024-06-07 11:28:45 +03:00
107c49e3fb Merge branch 'development' of git.ourworld.tf:tfgrid/www_projectinca into development 2024-06-07 10:03:21 +03:00
95443e3798 kds 2024-06-07 10:03:16 +03:00
df9d3ee088 Merge pull request 'development to main' (#33) from development into main
Reviewed-on: tfgrid/www_projectinca#33
2024-06-06 20:21:32 +00:00
93df9b767b Merge pull request 'development_revised' (#32) from development_revised into development
Reviewed-on: tfgrid/www_projectinca#32
2024-06-06 20:19:02 +00:00
Mik-TF
462224f91a fixed conflicts 2024-06-06 16:18:49 -04:00
Mik-TF
73f02feb53 added kristof ideas in revised 2024-06-06 15:50:01 -04:00
Mik-TF
ca0910a983 added kristof ideas in revised 2024-06-06 15:47:48 -04:00
Mik-TF
1b66e67a61 put kristof updates in revised branch 2024-06-06 15:38:29 -04:00
Mik-TF
e93ee5e109 simplified tech 2024-06-06 15:26:35 -04:00
Mik-TF
557a13d4fd nodes removed unnecessary lines 2024-06-06 15:11:31 -04:00
Mik-TF
55b2ed279e inca instead of pinca 2024-06-06 15:07:00 -04:00