Commit Graph

119 Commits

Author SHA1 Message Date
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
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
Mik-TF
5cdf546bdd updated images 2024-06-06 15:05:08 -04:00
Mik-TF
d13afcbfd7 updated nodes 2024-06-06 14:49:29 -04:00
Mik-TF
5c77ba0a47 organized with pinca concept 2024-06-06 14:45:59 -04:00
4d748b8cdf Merge pull request 'added welcome to' (#30) from development_landingpage into development
Reviewed-on: tfgrid/www_projectinca#30
2024-06-06 15:54:49 +00:00
Mik-TF
756791c218 added welcome to 2024-06-06 11:49:52 -04:00
19c2ab15d9 Merge pull request 'fix header / hero' (#29) from development_sasha into development
Reviewed-on: tfgrid/www_projectinca#29
2024-06-06 15:22:34 +00:00
Mik-TF
6dbd7d5e43 fixed conflicts 2024-06-06 11:21:28 -04:00
8e96772322 Merge pull request 'updated smaller compute currency title' (#26) from dev_3 into development
Reviewed-on: tfgrid/www_projectinca#26
2024-06-06 14:53:43 +00:00
sasha-astiadi
5df807b8bd fix header / hero 2024-06-06 17:32:16 +03:00
Mik-TF
92ee1486be updated smaller compute currency title 2024-06-06 10:23:15 -04:00
d89997781f Merge pull request 'updated title' (#25) from dev_typo into development
Reviewed-on: tfgrid/www_projectinca#25
2024-06-06 13:54:35 +00:00
Mik-TF
7dc7eaa975 updated title 2024-06-06 09:53:55 -04:00
92298bd9c6 Merge pull request 'updated footer' (#24) from development_footer into development
Reviewed-on: tfgrid/www_projectinca#24
2024-06-06 13:51:06 +00:00
Mik-TF
a75323ba03 updated footer 2024-06-06 09:50:23 -04:00
9575e000d8 Merge pull request 'updated landing page and overall site' (#23) from development_2 into development
Reviewed-on: tfgrid/www_projectinca#23
2024-06-06 13:01:43 +00:00
Mik-TF
e8e828ce86 updated landing page and overall site 2024-06-06 09:01:15 -04:00
3842f96b17 Merge pull request 'updated landing page and tech' (#22) from development_update2 into development
Reviewed-on: tfgrid/www_projectinca#22
2024-06-06 12:23:41 +00:00
Mik-TF
8b4d65f814 updated landing page and tech 2024-06-06 08:22:13 -04:00
b8e4db678d udpates 2024-06-06 13:27:53 +03:00
ba461e8ba2 Merge pull request 'development to main' (#21) from development into main
Reviewed-on: tfgrid/www_projectinca#21
2024-06-06 02:21:00 +00:00
c1c861e86e Merge pull request 'done with pictures first draft, with icons' (#20) from development_new2 into development
Reviewed-on: tfgrid/www_projectinca#20
2024-06-06 02:20:36 +00:00
Mik-TF
03627e3182 done with pictures first draft, with icons 2024-06-05 22:19:08 -04:00
2cadbe6607 Merge pull request 'development to main' (#19) from development into main
Reviewed-on: tfgrid/www_projectinca#19
2024-06-06 01:18:57 +00:00
a1e0267772 Merge pull request 'updated landing page, about' (#18) from development_new into development
Reviewed-on: tfgrid/www_projectinca#18
2024-06-06 01:18:36 +00:00
Mik-TF
4b12341a1f updated landing page, about 2024-06-05 21:17:34 -04:00
0bb403ffe2 Merge pull request 'development to main' (#17) from development into main
Reviewed-on: tfgrid/www_projectinca#17
2024-06-05 20:31:57 +00:00
5af1d92942 Merge pull request 'development_update' (#16) from development_update into development
Reviewed-on: tfgrid/www_projectinca#16
2024-06-05 20:31:24 +00:00
Mik-TF
c86258cd3f updated landing page 2024-06-05 16:30:53 -04:00
Mik-TF
dcaa5492a3 updated landing page, contact, features to tech 2024-06-05 16:18:51 -04:00
b8dfb94276 Merge pull request 'development to main periodic update' (#15) from development into main
Reviewed-on: tfgrid/www_projectinca#15
2024-06-05 17:24:37 +00:00
d308bc4737 Merge pull request 'development_update' (#14) from development_update into development
Reviewed-on: tfgrid/www_projectinca#14
2024-06-05 17:23:35 +00:00
Mik-TF
31e861514e fixed features 2024-06-05 13:23:13 -04:00
Mik-TF
0143a491a9 updated index 2024-06-05 13:13:39 -04:00
bc2b0300d1 Merge pull request 'development to main periodic update' (#13) from development into main
Reviewed-on: tfgrid/www_projectinca#13
2024-06-05 17:12:23 +00:00
5273f1c524 Merge pull request 'updated landing page' (#12) from development_new into development
Reviewed-on: tfgrid/www_projectinca#12
2024-06-05 14:57:50 +00:00
Mik-TF
3ce3cc1e0a updated landing page 2024-06-05 10:55:19 -04:00
9979f435b0 Merge pull request 'development to main' (#9) from development into main
Reviewed-on: tfgrid/www_projectinca#9
2024-06-05 00:21:25 +00:00
8bfd1a31da Merge pull request 'development_update' (#8) from development_update into development
Reviewed-on: tfgrid/www_projectinca#8
2024-06-05 00:21:02 +00:00
Mik-TF
498d744986 updated features 2024-06-04 20:19:55 -04:00