Commit Graph

495 Commits

Author SHA1 Message Date
Mik-TF
a4efec1aa3 manual fixed URLs 2024-05-13 15:38:23 -04:00
Mik-TF
dae8755ad2 manual update links 2024-05-13 15:25:13 -04:00
Mik-TF
35a1c614bd manual, cloud sys admins collections url 2024-05-13 15:07:32 -04:00
Mik-TF
b7508480f3 manual threefokd token 2024-05-13 14:43:12 -04:00
Mik-TF
1023661baf manual farmers 2024-05-13 14:38:54 -04:00
Mik-TF
4f6152a34d manual fixed collections and holochain 2024-05-13 13:09:26 -04:00
Mik-TF
86d33176c2 manual tech fixed partners links 2024-05-13 13:03:39 -04:00
Mik-TF
33541e363f manual tech added toc 2024-05-13 12:59:49 -04:00
Mik-TF
b15b213541 manual update tech 2024-05-13 12:54:26 -04:00
Mik-TF
82ad9a6bf5 manual, legal 2024-05-13 12:22:12 -04:00
Mik-TF
9f4541cf20 Merge branch 'development' into development_manual
set dev_manual up with dev
2024-05-13 12:20:59 -04:00
Mik-TF
cd578be2fa legal tfgrid3 urls 2024-05-13 10:23:08 -04:00
Mik-TF
27f0ad385b legal removed tfgrid def 2024-05-13 10:20:03 -04:00
Mik-TF
3fb1175180 legal, finalizing review 2024-05-13 10:19:27 -04:00
Mik-TF
c81eb024c3 legal, test parsing 2024-05-13 10:09:24 -04:00
Mik-TF
ba1c877842 legal, test parsing 2024-05-13 10:04:07 -04:00
Mik-TF
d4a2c306d5 legal, test parsing 2024-05-13 10:03:08 -04:00
Mik-TF
37c95161b7 legal, test parsing 2024-05-13 10:00:48 -04:00
Mik-TF
348e900502 legal, set book_collections to test 2024-05-13 09:59:29 -04:00
Mik-TF
572147f785 legal added tfgrid3 threefold_grid 2024-05-13 09:57:10 -04:00
Mik-TF
5bd7aefd62 legal, fixed websites tnc headings 2024-05-13 09:52:06 -04:00
Mik-TF
0d87dea9f6 legal, fixed websites tnc 2024-05-13 09:48:02 -04:00
Mik-TF
b3862816b6 legal, update websites tnc 2024-05-13 09:44:08 -04:00
Mik-TF
0f0ad858ce dy updated intro 2024-05-11 15:03:42 -04:00
Mik-TF
3bbe600c50 dy done 2024-05-11 13:42:12 -04:00
Mik-TF
d2d2b809b1 dy set urls and typos 2024-05-11 13:35:16 -04:00
Mik-TF
db534dcd2c dy reorganization set solutiosn with tech to avoid empty files 2024-05-11 13:29:28 -04:00
Mik-TF
67c09a80da dy, problems update 2024-05-11 13:16:16 -04:00
Mik-TF
0e52f7ce42 dy reorganized summary, added intro page from sam's blog 2024-05-11 12:42:21 -04:00
Mik-TF
875f0db884 dy fixed farming section 2024-05-11 11:20:26 -04:00
Mik-TF
38253c536c dy summary all fixed 2024-05-11 11:15:54 -04:00
84f9a49219 Merge branch 'kristof' into development 2024-05-11 15:09:24 +03:00
Mik-TF
01d785a509 links can be broken on first page, removed for the book 2024-05-10 19:31:48 -04:00
Mik-TF
01bfbd4e77 earthhub fixed logo pictures 2024-05-10 19:23:21 -04:00
Mik-TF
72d4dcb4b0 earthhub finalized revision 2024-05-10 19:18:41 -04:00
Mik-TF
2bf60d88cb earthhub, intro, faq, roadmap 2024-05-10 18:57:37 -04:00
Mik-TF
2f0a9dce4e mbweni ready for production 2024-05-10 11:39:48 -04:00
Mik-TF
7dac019228 mbweni fix urls, add facilities info, was wrong with activities 2024-05-10 11:32:31 -04:00
Mik-TF
4b8bdd68eb mbweni set urls 2024-05-10 11:23:05 -04:00
Mik-TF
75a73e2bc9 mbweni set collection:filename.md for url 2024-05-10 11:22:04 -04:00
Mik-TF
e317a715d9 mbweni set collection:filename.md for url 2024-05-10 11:21:03 -04:00
Mik-TF
98c9048416 mbweni, added image for intro page 2024-05-10 11:18:23 -04:00
Mik-TF
470713a8ba mbweni, updated contact_info 2024-05-10 11:14:26 -04:00
Mik-TF
570ec9d205 mbweni, set contact as file with include to facilitate when clib hero is fixed for mailto 2024-05-10 11:12:34 -04:00
Mik-TF
f5e8099862 set mbweni set emails 2024-05-10 11:05:48 -04:00
Mik-TF
694c394c2d set mbweni remove emails 2024-05-10 11:01:28 -04:00
Mik-TF
63c9d364d8 set mbweni test email url removed 2024-05-10 10:54:12 -04:00
Mik-TF
593738cc52 mbweni update, sports in activities 2024-05-10 10:46:57 -04:00
Mik-TF
cf88ba6198 pmycel, added governance intro 2024-05-10 09:21:26 -04:00
Mik-TF
4051544346 pmycel, added info on layers 2024-05-10 09:18:23 -04:00
Mik-TF
d1a5f3277e update pmycel hero farming 2024-05-10 08:56:18 -04:00
Mik-TF
079af46c82 update pmycel hero token and key 2024-05-10 08:47:03 -04:00
Mik-TF
e18964b149 update pmycel presentation 2024-05-10 08:38:12 -04:00
Mik-TF
0e81a1a3b9 update pmycel 2024-05-10 08:34:36 -04:00
Mik-TF
564f8558a1 update pmycel 2024-05-10 08:27:55 -04:00
Mik-TF
7c8a1e61a7 pinca update 2024-05-10 08:21:40 -04:00
Mik-TF
e5d8be13b0 updated pinca 2024-05-10 08:13:09 -04:00
Mik-TF
3aa8652dc8 moved blocks from engineering to marketplace 2024-05-10 07:58:03 -04:00
Mik-TF
3332b2151e put voting process in separate page 2024-05-10 07:48:26 -04:00
Mik-TF
119281c414 updated files grants, tokenomics 2024-05-10 07:44:40 -04:00
Mik-TF
6a702ece89 updated funding 2024-05-10 07:38:16 -04:00
Mik-TF
694ddded8d update tft.md 2024-05-10 07:35:58 -04:00
Mik-TF
3ec1aac2aa update summary tft 2024-05-10 07:32:41 -04:00
Mik-TF
77db527a94 update inca.md 2024-05-10 07:30:55 -04:00
7a13e32b9d ... 2024-05-09 22:26:57 +03:00
948d6c0de2 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts:
#	books/projectinca/SUMMARY.md
#	collections/tech/primitives/network/mycelium.md
2024-05-09 17:11:35 +03:00
2eed0b65b7 ... 2024-05-09 17:09:00 +03:00
Mik-TF
b3f8ab18c2 legal update 2024-05-08 20:01:33 -04:00
Mik-TF
2b94ca20ad legal update 2024-05-08 19:58:14 -04:00
Mik-TF
f6f0e5a283 updated test final 2024-05-08 19:30:47 -04:00
Mik-TF
fc1d1eff0d updated test with .collection 2024-05-08 19:29:36 -04:00
Mik-TF
515d640188 updated test 2024-05-08 19:23:39 -04:00
Mik-TF
bf28bd296b tech update core capabilities 2024-05-08 16:12:17 -04:00
Mik-TF
4691fc499f tech update zos 2024-05-08 16:08:23 -04:00
Mik-TF
49b357d4e8 tech update architecture 2024-05-08 16:05:24 -04:00
Mik-TF
c29380aabd tech update network wall 2024-05-08 16:03:24 -04:00
Mik-TF
77f870df7f tech update qsss 2024-05-08 16:00:46 -04:00
Mik-TF
26eec9bfa9 tech update innovations 2024-05-08 15:58:00 -04:00
Mik-TF
b54c5a0eba tech update innovations 2024-05-08 15:56:39 -04:00
Mik-TF
ddf616eef3 tech update innovations 2024-05-08 15:55:04 -04:00
Mik-TF
d46a3af9d0 tech update re-invented 2024-05-08 15:53:41 -04:00
Mik-TF
26432d3009 tech update intro 2024-05-08 15:44:22 -04:00
Mik-TF
74038afb0d tfgrid4 update farming 2024-05-08 15:04:24 -04:00
Mik-TF
9e7d698aee tfgrid4 update home 2024-05-08 14:44:42 -04:00
Mik-TF
d72e6f53ca tfgrid4 update home 2024-05-08 14:43:40 -04:00
Mik-TF
8b72e33f4c tfgrid4 problems update 2024-05-08 14:18:21 -04:00
Mik-TF
b2514cd3be tfgrid4 values update 2024-05-08 14:16:08 -04:00
Mik-TF
a5a70cf562 tfgrid4 economy update 2024-05-08 14:11:07 -04:00
Mik-TF
fea38b4e5c tfgrid4 economy update 2024-05-08 14:08:37 -04:00
Mik-TF
6c1c84e997 tfgrid4 added economy as inca_fuel 2024-05-08 14:06:58 -04:00
Mik-TF
3a2c254bce tfgrid4 added back farming for v4 files 2024-05-08 14:02:36 -04:00
Mik-TF
02655c2b21 updated tfgrid4 home 2024-05-08 13:56:52 -04:00
Mik-TF
5b119f1577 updated tfgrid4 home 2024-05-08 13:50:29 -04:00
Mik-TF
dd526eda97 updated tfgrid4 home 2024-05-08 13:48:13 -04:00
Mik-TF
b4992efe45 updated tfgrid4 home 2024-05-08 13:46:40 -04:00
Mik-TF
cf4e012b8e updated tfgrid4 home 2024-05-08 13:22:51 -04:00
Mik-TF
e7e08e1b33 tfgrid4 updates 2024-05-08 12:14:12 -04:00
Mik-TF
86e53c5999 tfgrid4 updates 2024-05-08 12:13:24 -04:00
Mik-TF
ea2792d207 tfgrid4 updates 2024-05-08 12:08:16 -04:00
Mik-TF
2a2cb91a8c tfgrid3 updates 2024-05-08 12:03:31 -04:00
Mik-TF
9fa59f9cb0 tfgrid3 updates 2024-05-08 12:02:27 -04:00
Mik-TF
2491eb1740 tfgrid3 updates 2024-05-08 11:57:12 -04:00
Mik-TF
954e2f0548 tfgrid3 updates 2024-05-08 11:55:36 -04:00
Mik-TF
2d8aa5dd30 fixed typos in pinca 2024-05-08 11:45:40 -04:00
a4c685be53 Update collections/bestkeptsecret/lets_have_fun.md 2024-05-08 03:21:59 +00:00
aeef7969a3 Update collections/bestkeptsecret/lets_have_fun.md 2024-05-08 03:12:52 +00:00
Mik-TF
77c04ca667 farmers start 2024-05-06 11:17:48 -04:00
Mik-TF
4c46250d46 urls devs done 2024-05-06 10:43:43 -04:00
Mik-TF
aa82080a14 urls javascript 2024-05-06 10:37:26 -04:00
Mik-TF
088f111774 urls javascript 2024-05-06 10:34:37 -04:00
Mik-TF
88ce926fc8 zos 2024-05-06 10:27:02 -04:00
Mik-TF
776dff1417 node fix 2024-05-06 10:12:34 -04:00
Mik-TF
4299311439 flist fix 2024-05-06 10:11:17 -04:00
Mik-TF
3bceba1288 flist fix 2024-05-06 10:09:03 -04:00
Mik-TF
ac9e15a497 zos urls 2024-05-06 10:07:18 -04:00
Mik-TF
fd6436c426 urls go 2024-05-06 09:55:51 -04:00
Mik-TF
dca8ebb830 urls flist 2024-05-06 09:49:29 -04:00
Mik-TF
a83c0f154c fixed all dashboard URLs 2024-05-04 01:38:12 -04:00
Mik-TF
0de4351480 update dashboard 2024-05-04 01:33:55 -04:00
Mik-TF
8bfea0a912 update dashboard urls 2024-05-04 01:29:58 -04:00
Mik-TF
1af15a326d update urls with @@ 2024-05-04 01:17:38 -04:00
Mik-TF
1a5e76c82d added intro changes with @@ url 2024-05-04 01:11:32 -04:00
Mik-TF
62af4be6e8 added intro changes with @@ url 2024-05-04 00:59:51 -04:00
Mik-TF
4bdf494607 dev test 2024-05-03 21:59:32 -04:00
Mik-TF
d6b4e34fad dev test 2024-05-03 21:40:02 -04:00
Mik-TF
387e77b594 dev test 2024-05-03 21:32:45 -04:00
Mik-TF
7187a56835 dev test 2024-05-03 21:29:41 -04:00
Mik-TF
8482cbfc46 dev test 2024-05-03 20:15:51 -04:00
Mik-TF
f502036210 updated dev 2024-05-03 16:41:44 -04:00
Mik-TF
8a49627ca5 test dev 2024-05-03 16:38:53 -04:00
Mik-TF
24653bd1b9 test dev 2024-05-03 16:23:23 -04:00
Mik-TF
9f09eba353 test dev 2024-05-03 16:22:07 -04:00
Mik-TF
9a7a8a4366 test dev 2024-05-03 15:27:35 -04:00
Mik-TF
dd4fd9bd0c test dev 2024-05-03 15:17:42 -04:00
Mik-TF
b2f68c0cc9 test dev 2024-05-03 15:07:16 -04:00
2b1d0dc54c Update collections/projectinca/intro.md 2024-05-03 15:58:56 +00:00
Mik-TF
c1b32cc283 manual update intro.md 2024-05-03 11:51:01 -04:00
Mik-TF
c5c809703d updated manual with main branch 2024-05-03 09:23:11 -04:00
f14ae40998 Merge pull request 'development_inca' (#46) from development_inca into development
Reviewed-on: #46
2024-05-03 12:25:49 +00:00
a5ce285aba Small updates 2024-05-03 09:40:05 +03:00
Mik-TF
9a24b65ee7 updated internet human right 2024-05-02 14:46:23 -04:00
Mik-TF
f0a9e4f0a7 updated internet human right 2024-05-02 14:44:37 -04:00
Mik-TF
7be5e5046b updated vverse link 2024-05-02 14:29:13 -04:00
Mik-TF
c6b73e747f updated elestio link 2024-05-02 14:24:28 -04:00
Mik-TF
9f3f2e045e updated partners 2024-05-02 14:17:10 -04:00
Mik-TF
32f39cd7e9 updated marketplace grant 2024-05-02 14:06:16 -04:00
Mik-TF
83ecb2a5fe updated marketplace grant 2024-05-02 14:04:52 -04:00
Mik-TF
2bf81c45bc update summary 2024-05-02 13:51:33 -04:00
Mik-TF
0912eac193 update summary 2024-05-02 13:46:59 -04:00
Mik-TF
287927db75 test for zos 2024-05-02 13:26:24 -04:00