636 Commits

Author SHA1 Message Date
a682a032d1 edit script 2024-12-03 13:30:42 +01:00
443cf63373 edit script 2024-12-03 13:30:37 +01:00
2c74b435c0 edit script 2024-12-03 13:30:30 +01:00
84fe131696 edit script 2024-12-03 13:30:25 +01:00
cebcd79b49 edit script 2024-12-03 13:30:21 +01:00
bcd4705125 edit script 2024-12-03 13:30:16 +01:00
1bda073eef edit script 2024-12-03 13:30:12 +01:00
23135f5589 edit mbweni book 2024-12-03 13:30:03 +01:00
ddcab07f69 manual edit 2024-12-03 13:29:52 +01:00
be1430033e edit lib book 2024-12-03 13:29:43 +01:00
fc1f60c9b2 edit legal book 2024-12-03 13:29:36 +01:00
e4988e8075 edit kds book 2024-12-03 13:29:27 +01:00
9dd617f560 edit knowledge base book 2024-12-03 13:29:18 +01:00
bcf3b8f588 edit farmers 2024-12-03 13:03:08 +01:00
e9f7de3f4a edit earthhub 2024-12-03 13:00:31 +01:00
b63426d57c edit dunia yetu book 2024-12-03 12:58:19 +01:00
timurgordon
d32a75c971 remove sshkey heroscripts and add production field 2024-10-21 13:45:34 +02:00
timurgordon
332704a08b Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-10-21 13:40:56 +02:00
b44e062c61 Merge pull request 'Delete heroscript/manual/sshkey.md' (#149) from timur-patch-2 into main
Reviewed-on: #149
2024-10-01 15:07:29 +00:00
fef60feb31 Delete heroscript/manual/sshkey.md 2024-10-01 15:07:19 +00:00
timurgordon
db681d74f3 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-09-17 13:09:18 +03:00
b0a6115e80 Merge pull request 'development to main' (#129) from development into main
Reviewed-on: #129
2024-07-15 17:49:56 +00:00
77094a835b Merge pull request 'removed docs_inca, transferred to new repo' (#128) from development_remove_docs_inca into development
Reviewed-on: #128
2024-07-15 17:49:36 +00:00
Mik-TF
c431559405 removed docs_inca, transferred to new repo 2024-07-15 13:48:41 -04:00
c9e75c21dc Merge pull request 'development to main' (#127) from development into main
Reviewed-on: #127
2024-07-14 01:37:30 +00:00
4ed8102c8a Merge pull request 'finished files for tfgrid4specs' (#126) from development_gridspecs into development
Reviewed-on: #126
2024-07-14 01:37:11 +00:00
Mik-TF
a461008dad finished files for tfgrid4specs 2024-07-13 21:36:42 -04:00
9f827d4f58 Merge pull request 'development to main' (#125) from development into main
Reviewed-on: #125
2024-07-11 21:12:37 +00:00
ef67af4fac Merge pull request 'development_devs' (#124) from development_devs into development
Reviewed-on: #124
2024-07-11 21:12:21 +00:00
Mik-TF
91b6167939 simplified intro devs 2024-07-11 17:09:31 -04:00
Mik-TF
c51eaf37bd updated devs 2024-07-11 17:05:06 -04:00
06039ac195 Merge pull request 'development to main periodic update' (#122) from development into main
Reviewed-on: #122
2024-07-11 01:45:09 +00:00
e2c9ea50dc Merge pull request 'development_sysadmins' (#121) from development_sysadmins into development
Reviewed-on: #121
2024-07-11 01:44:21 +00:00
Mik-TF
c251345ab8 adjusted summary for sysadmins simplified intro 2024-07-10 21:40:04 -04:00
Mik-TF
eac66ad597 adjusted summary for sysadmins 2024-07-10 21:33:14 -04:00
Mik-TF
97c0de6552 adjusted summary for sysadmins 2024-07-10 21:30:25 -04:00
Mik-TF
4c874c20ac simplified sysadmins 2024-07-10 21:27:07 -04:00
timurgordon
665a1489c9 fix link 2024-07-09 09:33:52 +03:00
253724e273 tokens 2024-07-08 06:19:57 +02:00
97854b5b8f Merge pull request 'Update docs_projectinca/README.md' (#119) from development_quick_fix into development
Reviewed-on: #119
2024-07-03 18:57:42 +00:00
cea7cf6923 Update docs_projectinca/README.md 2024-07-03 18:57:24 +00:00
4dd76f9aa8 Merge pull request 'development_whitepaper_test' (#113) from development_whitepaper_test into development
Reviewed-on: #113
2024-06-26 21:48:46 +00:00
Mik-TF
c26db1ec2a updated whitepaper 2024-06-26 17:47:30 -04:00
Mik-TF
7fc51584aa set whitepaper as test 2024-06-26 14:41:36 -04:00
c8dce7228e s 2024-06-25 10:11:58 +04:00
20c57e433a s 2024-06-23 22:21:37 +04:00
d9781aaff2 s 2024-06-23 22:17:49 +04:00
7d970ac415 Merge pull request 'development to main' (#110) from development into main
Reviewed-on: #110
2024-06-20 13:52:31 +00:00
3c9092d5bb Merge pull request 'updated crisp for tf not inca' (#111) from development_crisp_threefold into development
Reviewed-on: #111
2024-06-20 13:52:17 +00:00
Mik-TF
1a606eb6c2 updated crisp for tf not inca 2024-06-20 09:51:35 -04:00
83dc8528f0 Merge pull request 'added legal' (#109) from development_docs into development
Reviewed-on: #109
2024-06-19 18:49:58 +00:00
Mik-TF
d966c7326b added legal 2024-06-19 14:46:23 -04:00
e4eaa9dfdd Merge pull request 'development to main periodic update' (#108) from development into main
Reviewed-on: #108
2024-06-19 17:27:32 +00:00
c57a25bbfd Merge pull request 'added crisp access' (#107) from development_crisp_icon into development
Reviewed-on: #107
2024-06-19 17:13:00 +00:00
Mik-TF
eff9e7444a added crisp access 2024-06-19 13:12:16 -04:00
582bb36195 Merge pull request 'added crisp' (#106) from development_crisp into development
Reviewed-on: #106
2024-06-19 16:57:17 +00:00
aa4f501af1 Merge pull request 'updated link icon header' (#105) from development_icon into development
Reviewed-on: #105
2024-06-19 16:56:57 +00:00
Mik-TF
79a0be3de9 added crisp 2024-06-19 12:56:16 -04:00
Mik-TF
0b18e5a133 updated link icon header 2024-06-19 10:45:30 -04:00
16764dc4ba Merge pull request 'details' (#104) from development_details into development
Reviewed-on: #104
2024-06-17 21:46:31 +00:00
Mik-TF
8edb12c7f4 details 2024-06-17 17:46:07 -04:00
c2c1c405b3 Merge pull request 'development_docs_menu' (#103) from development_docs_menu into development
Reviewed-on: #103
2024-06-17 21:42:20 +00:00
Mik-TF
f4fdac3af4 removed pictures 2024-06-17 17:42:07 -04:00
Mik-TF
0ac9e5596c update docs inca 2024-06-17 17:41:11 -04:00
Mik-TF
15c2b0d9ef added guides to docs inca 2024-06-17 17:36:32 -04:00
Mik-TF
0c625ea869 new content for inca docs 2024-06-17 15:51:51 -04:00
ca63ac2ebe s 2024-06-17 05:50:22 +03:00
60134e79b9 Merge pull request 'development to main periodic update' (#102) from development into main
Reviewed-on: #102
2024-06-14 16:52:01 +00:00
c89d0d0bb1 Merge pull request 'update to finalize first page' (#101) from development_inca_update into development
Reviewed-on: #101
2024-06-14 16:51:18 +00:00
Mik-TF
2daa796d74 update to finalize first page 2024-06-14 12:47:45 -04:00
b37e1967c9 Merge pull request 'development_docs_inca_basic' (#100) from development_docs_inca_basic into development
Reviewed-on: #100
2024-06-14 16:32:30 +00:00
Mik-TF
86e382feaa landing page almost done, needs icons 2024-06-14 12:30:44 -04:00
Mik-TF
f23fda2a5f Merge branch 'development' into development_docs_inca_basic 2024-06-14 10:55:49 -04:00
287cd7670e Merge pull request 'development_farmers_book' (#99) from development_farmers_book into development
Reviewed-on: #99
2024-06-14 01:38:19 +00:00
Mik-TF
b17f78525d update books 2024-06-13 21:35:41 -04:00
Mik-TF
4ed76b5cd6 update books 2024-06-13 21:32:43 -04:00
Mik-TF
2c48ecd3e2 update books 2024-06-13 21:30:24 -04:00
Mik-TF
8762755484 update books toc 2024-06-13 21:25:11 -04:00
Mik-TF
4bbbac248c update books 2024-06-13 21:21:13 -04:00
Mik-TF
9b7b9f50c4 farmers update toc 2024-06-13 21:19:18 -04:00
Mik-TF
c45cd20aad kbase book 2024-06-13 21:09:27 -04:00
Mik-TF
61561aa9ce kbase book 2024-06-13 21:04:00 -04:00
Mik-TF
f53c92c0e9 sysadmins hero mdbook 2024-06-13 20:55:48 -04:00
Mik-TF
24910b4eda farmers and devs hero 2024-06-13 19:39:11 -04:00
Mik-TF
1495be7fec farmers and devs hero 2024-06-13 19:33:21 -04:00
Mik-TF
9bc2482ef3 farmers hero 2024-06-13 19:25:53 -04:00
Mik-TF
e9a56ccd0a farmers hero 2024-06-13 19:25:40 -04:00
Mik-TF
00fc54a44a new farmers book set heroscript 2024-06-13 19:12:12 -04:00
Mik-TF
c2bc10c585 new farmers book 2024-06-13 19:07:01 -04:00
30342d0360 Merge pull request 'development_manual_update_june' (#98) from development_manual_update_june into development
Reviewed-on: #98
2024-06-13 23:02:16 +00:00
Mik-TF
1637a7bbdf update to hero mdbook 2024-06-13 18:53:25 -04:00
Mik-TF
e9265f13b2 update to hero mdbook 2024-06-13 18:42:17 -04:00
Mik-TF
1d07f178db adaptation to hero 2024-06-13 17:09:57 -04:00
Mik-TF
3231204426 adaptation to hero 2024-06-13 16:58:27 -04:00
Mik-TF
0e9272fd56 adaptation to hero 2024-06-13 16:23:06 -04:00
Mik-TF
9432a3e845 adaptation to hero 2024-06-13 15:50:44 -04:00
Mik-TF
6e79c5277b adaptation to hero 2024-06-13 15:37:11 -04:00
Mik-TF
608bce3200 adaptation to hero 2024-06-13 15:14:48 -04:00
Mik-TF
ff1e6ffc6e adaptation to hero 2024-06-13 14:28:37 -04:00
Mik-TF
4e7fee80ce update 1 2024-06-13 14:12:22 -04:00
eaabadc364 Merge pull request 'updated legal' (#94) from development_legal_updates into development
Reviewed-on: #94
2024-06-12 13:01:13 +00:00
Mik-TF
8f7949ed09 updated legal 2024-06-12 08:58:07 -04:00
Mik-TF
335be9d32e added docs inca basic 2024-06-11 00:46:31 -04:00
529f44f382 Merge pull request 'removed status part' (#89) from development_status into development
Reviewed-on: #89
2024-05-28 19:01:59 +00:00
Mik-TF
ffcd88a841 removed status part 2024-05-28 15:00:53 -04:00
12585d5eb5 Merge pull request 'simplified network wall' (#88) from development_fix_update into development
Reviewed-on: #88
2024-05-28 18:59:50 +00:00
Mik-TF
1e906cac8c simplified network wall 2024-05-28 14:59:08 -04:00
c123766c8c Merge pull request 'added parsing info' (#87) from development_parsing into development
Reviewed-on: #87
2024-05-27 13:05:09 +00:00
Mik-TF
c57909ea84 added parsing info 2024-05-27 09:04:04 -04:00
00f1b87efa s 2024-05-23 11:09:37 +03:00
2d41a9a8a2 Merge pull request 'added codeowners' (#86) from development_codeowners into development
Reviewed-on: #86
2024-05-16 18:28:09 +00:00
Mik-TF
7c3475d70e added codeowners 2024-05-16 14:24:55 -04:00
13f9edae27 Merge pull request 'readme update contribute' (#85) from development_readme into development
Reviewed-on: #85
2024-05-16 17:48:45 +00:00
Mik-TF
44ead262b0 readme update contribute 2024-05-16 13:47:24 -04:00
f5723135a0 Merge pull request 'development_fix_tech' (#84) from development_fix_tech into development
Reviewed-on: #84
2024-05-16 17:38:41 +00:00
Mik-TF
3b61487b83 tech updated mycelium 2024-05-16 13:38:01 -04:00
Mik-TF
a496ffef57 refixed stuff that should be fixed 2024-05-16 13:37:54 -04:00
59c8c0361c Merge pull request 'Fix tech' (#82) from dev_mik into main
Reviewed-on: #82
2024-05-16 17:21:23 +00:00
Mik-TF
3e0d1cb1e4 refixed stuff that should be fixed 2024-05-16 13:20:00 -04:00
Mik-TF
cf2065cc07 tech updated mycelium 2024-05-16 13:19:52 -04:00
60cc1252fa Merge branch 'main' into development 2024-05-16 06:33:37 +03:00
72ad85278a development branch 2024-05-16 06:30:16 +03:00
Mik-TF
b0a955399f tech update summary 2024-05-14 18:49:56 -04:00
d0f9de08f4 Merge pull request 'tech fix' (#80) from dev3 into main
Reviewed-on: #80
2024-05-14 22:43:05 +00:00
Mik-TF
dabdf8f2ef tech fix 2024-05-14 18:42:23 -04:00
430db4bc8d Merge pull request 'development' (#79) from development into main
Reviewed-on: #79
2024-05-14 22:34:58 +00:00
c156a954af Merge pull request 'dev2' (#78) from dev2 into development
Reviewed-on: #78
2024-05-14 22:34:27 +00:00
Mik-TF
a7acc2cb54 fixed sys admin manual 2024-05-14 18:33:28 -04:00
a8f2f89bea Merge pull request 'development to main periodic update' (#77) from development into main
Reviewed-on: #77
2024-05-14 22:14:40 +00:00
a84f649c5d Merge pull request 'Manual book Revised completely' (#76) from development_manual2 into development
Reviewed-on: #76
2024-05-14 22:14:06 +00:00
Mik-TF
c12197e021 manual update PRs 2024-05-14 18:12:06 -04:00
Mik-TF
173b3de2bc manual update PRs 2024-05-14 18:08:20 -04:00
Mik-TF
b723cf3c70 manual update PRs 2024-05-14 18:05:21 -04:00
Mik-TF
6af3393b83 manual update links collections 2024-05-14 17:57:07 -04:00
Mik-TF
db14287779 manual resimplified links 2024-05-14 17:53:07 -04:00
Mik-TF
599acfde7c manual, update new pr 2024-05-14 17:42:30 -04:00
Mik-TF
be1ef3ba76 manual, update new pr 2024-05-14 17:26:19 -04:00
Mik-TF
0074cd808f manual, update new pr 2024-05-14 17:21:22 -04:00
Mik-TF
4228ae6e1a manual, update new pr 2024-05-14 17:06:21 -04:00
Mik-TF
cf82a6f7b9 manual, update new pr 2024-05-14 16:48:37 -04:00
Mik-TF
6be34813c1 manual, update new pr 2024-05-14 16:33:15 -04:00
Mik-TF
042ead40bd manual, update new pr 2024-05-14 16:28:40 -04:00
Mik-TF
aad4e79eef manual, update new pr 2024-05-14 16:24:07 -04:00
Mik-TF
71bd49d905 manual, update new pr 2024-05-14 16:21:27 -04:00
6dbedef137 Merge pull request 'dev to main periodic update' (#75) from development into main
Reviewed-on: #75
2024-05-14 19:17:12 +00:00
7d28a7a0c9 Merge pull request 'Info_grid manual update to current info_tfgrid manual' (#74) from development_manual2 into development
Reviewed-on: #74
2024-05-14 19:16:18 +00:00
Mik-TF
6b20cce94f manual update mycelium 2024-05-14 15:12:18 -04:00
Mik-TF
df45b0e38a manual update summary 2024-05-14 15:07:39 -04:00
Mik-TF
10104caada start integrate new pr from info_grid, starting from 62826fe798 2024-05-14 15:03:55 -04:00
07ba5261fe Merge pull request 'development to main update' (#73) from development into main
Reviewed-on: #73
2024-05-14 18:05:22 +00:00
db7fde432c Merge pull request 'include fixed' (#72) from development_manual2 into development
Reviewed-on: #72
2024-05-14 18:05:03 +00:00
Mik-TF
119a84e5f8 manual cloud update table 2024-05-14 14:02:17 -04:00
Mik-TF
fa0a583ec1 manual cloud update table 2024-05-14 14:01:18 -04:00
Mik-TF
01707211fa manual update links 2024-05-14 13:59:05 -04:00
Mik-TF
da783febb2 manual cloud update 2024-05-14 13:54:25 -04:00
Mik-TF
0447c68059 manual cloud update 2024-05-14 13:53:57 -04:00
Mik-TF
d8ff2ee544 manual cloud update 2024-05-14 13:53:24 -04:00
Mik-TF
81591faa06 manual cloud update 2024-05-14 13:52:41 -04:00
Mik-TF
27423c06dd manual temp fix for include, static number 2024-05-14 13:48:33 -04:00
27c37c1e4c Merge pull request 'dev to main periodic update' (#71) from development into main
Reviewed-on: #71
2024-05-14 17:28:54 +00:00
1549ea1652 Merge pull request 'manual: fixing parsing' (#70) from development_manual2 into development
Reviewed-on: #70
2024-05-14 17:27:44 +00:00
Mik-TF
2569fe5975 manual, all parsing OK 2024-05-14 13:24:02 -04:00
Mik-TF
e2f71ca641 manual, collaboration 2024-05-14 13:22:04 -04:00
Mik-TF
de162fe6b4 manual, faq 2024-05-14 13:17:52 -04:00
Mik-TF
3540d7d64d manual, sysadmins, ipfs 2024-05-14 13:04:07 -04:00
Mik-TF
8f74e1e9bf manual, sysadmins, computer basics 2024-05-14 13:02:02 -04:00
Mik-TF
c54a6ab037 manual, sysadmins, cli 2024-05-14 13:00:03 -04:00
Mik-TF
d513279297 manual, sysadmins, pulumi 2024-05-14 12:57:47 -04:00
Mik-TF
9d539a31f1 manual, sysadmins, terra nc 2024-05-14 12:55:11 -04:00
Mik-TF
982bd66987 manual, sysadmins, terra 2024-05-14 12:47:52 -04:00
Mik-TF
bd835ef00b manual, sysadmins, gui 2024-05-14 12:43:45 -04:00
Mik-TF
f0683c7c46 manual, sysadmins, gui 2024-05-14 12:42:19 -04:00
Mik-TF
3b2e0f0241 manual, sysadmins, gui 2024-05-14 12:37:07 -04:00
Mik-TF
2ac97d936c manual, sysadmins, wg 2024-05-14 12:35:37 -04:00
Mik-TF
ef8576b061 manual, sysadmins, ssh 2024-05-14 12:33:54 -04:00
Mik-TF
d69189f9cc manual, farmers, minting receipts 2024-05-14 12:29:56 -04:00
Mik-TF
f6c654db48 manual, farmers, minting receipts 2024-05-14 12:28:35 -04:00
Mik-TF
422c2e1c73 manual, farmers, gpu 2024-05-14 12:24:06 -04:00
Mik-TF
b8323a0815 manual, farmers, bootstrap img 2024-05-14 12:22:08 -04:00
Mik-TF
4488495647 manual, devs, grid deployment 2024-05-14 12:19:23 -04:00
Mik-TF
1fe25a93fb manual, devs, grid deployment 2024-05-14 12:16:59 -04:00
Mik-TF
075e8453ea manual, devs, set internals toc 2024-05-14 12:11:12 -04:00
Mik-TF
bc773126e0 manual, devs, set internals toc 2024-05-14 12:09:00 -04:00
Mik-TF
678ca4b842 manual, parsing devs flist nc 2024-05-14 12:00:27 -04:00
Mik-TF
fb521d5446 manual, parsing devs flist nc 2024-05-14 11:57:07 -04:00
Mik-TF
38f65801ad manual, parsing devs flist 2024-05-14 11:54:28 -04:00
Mik-TF
ca99c4cda4 manual, parsing devs tfrobot 2024-05-14 11:33:41 -04:00
Mik-TF
80fbabab10 manual, parsing devs tfcmd 2024-05-14 11:30:30 -04:00
Mik-TF
422308e095 manual, parsing devs tfcmd 2024-05-14 11:28:36 -04:00
Mik-TF
2a6d648401 manual, parsing devs tfcmd 2024-05-14 11:27:10 -04:00
Mik-TF
13586b10f0 manual, parsing devs go 2024-05-14 11:20:17 -04:00
Mik-TF
567c558129 manual, parsing devs 2024-05-14 11:17:07 -04:00
Mik-TF
4757a8f291 manual, parsing devs 2024-05-14 11:15:27 -04:00
Mik-TF
8ac3e56679 manual, parsing devs 2024-05-14 11:13:17 -04:00
Mik-TF
6c76ffbfe5 manual, test parsing hero mdbook vs mdbook 2024-05-14 10:49:26 -04:00
ce6f710360 Merge pull request 'development to main update' (#69) from development into main
Reviewed-on: #69
2024-05-14 14:20:21 +00:00
4b4e871c88 Merge pull request 'dy updated intro' (#60) from development_dy_intro into development
Reviewed-on: #60
2024-05-14 14:19:44 +00:00
90ba88c357 Merge pull request 'development to main with manual updates' (#68) from development into main
Reviewed-on: #68
2024-05-13 23:34:03 +00:00
412206d8fa Merge pull request 'development_manual to dev' (#67) from development_manual into development
Reviewed-on: #67
2024-05-13 23:33:13 +00:00
a11893fcf0 Merge pull request 'manual, set internal collections to filename.md template' (#66) from development_manual2 into development_manual
Reviewed-on: #66
2024-05-13 23:32:25 +00:00
Mik-TF
1836179a75 manual, set internal collections to filename.md template 2024-05-13 19:28:23 -04:00
Mik-TF
280652166f manual set urls for external collection 2024-05-13 19:10:10 -04:00
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
afc8c99ac6 Merge pull request 'development to main update with manual' (#65) from development into main
Reviewed-on: #65
2024-05-13 17:18:23 +00:00
1ba1e05215 Merge pull request 'development_manual' (#64) from development_manual into development
Reviewed-on: #64
2024-05-13 17:17:41 +00:00
Mik-TF
3eab2d1cc9 manual put book_collections to main 2024-05-13 13:16:34 -04:00
Mik-TF
e49b1e8238 manual fix collections 2024-05-13 13:12:51 -04:00
Mik-TF
4f6152a34d manual fixed collections and holochain 2024-05-13 13:09:26 -04:00
Mik-TF
57bc8f088b manual test collections 2024-05-13 13:07:41 -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
22af330b98 manual set tech in higher order for summary 2024-05-13 12:49:18 -04:00
Mik-TF
3d834370f1 manual set user instead of all3 2024-05-13 12:44:17 -04:00
0db4c47719 Merge pull request 'development' (#62) from development into main
Reviewed-on: #62
2024-05-13 16:41:56 +00:00
1cd428febe Merge pull request 'legal, updated grid user' (#63) from development_legal into development
Reviewed-on: #63
2024-05-13 16:41:25 +00:00
Mik-TF
593bfdb1fb legal, updated grid user 2024-05-13 12:38:28 -04:00
Mik-TF
7c476e021e manual, updated legal and tech 2024-05-13 12:32:05 -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
573e7fe322 Merge pull request 'development_legal' (#61) from development_legal into development
Reviewed-on: #61
2024-05-13 14:28:17 +00: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
8fce6df522 Merge pull request 'development to main' (#59) from development into main
Reviewed-on: #59
2024-05-11 17:44:33 +00:00
c0469c0a48 Merge pull request 'development_dy' (#58) from development_dy into development
Reviewed-on: #58
2024-05-11 17:43:40 +00: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
a2af5a8038 dy updated mdbook title for booktoml 2024-05-11 12:44:11 -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
Mik-TF
cb2ed3636e dy update summary 2024-05-11 11:09:55 -04:00
Mik-TF
c52ba83f80 dy, added _v4 for farming in summary 2024-05-11 11:05:14 -04:00
84f9a49219 Merge branch 'kristof' into development 2024-05-11 15:09:24 +03:00
05edf1b9e6 Merge pull request 'development to main update' (#57) from development into main
Reviewed-on: #57
2024-05-10 23:38:27 +00:00
17abdf5835 Merge pull request 'Update README.md' (#56) from development_readme into development
Reviewed-on: #56
2024-05-10 23:37:55 +00:00
451c220090 Update README.md
added info for readme docker
2024-05-10 23:37:44 +00:00
4b6aba32ed Merge pull request 'development' (#55) from development into main
Reviewed-on: #55
2024-05-10 23:35:12 +00:00
8e18562132 Merge pull request 'development_mdbooks' (#54) from development_mdbooks into development
Reviewed-on: #54
2024-05-10 23:33:04 +00: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
a75a1f89bd fixed book_collections branch 2024-05-10 19:30:05 -04:00
f7bf860fa7 Merge pull request 'fixed/revised mdbooks in repo' (#53) from development_mdbooks into development
Reviewed-on: #53
2024-05-10 23:26:14 +00: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
b1040949bb earthhub, update summary 2024-05-10 18:34:23 -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
11650d13d1 set mbweni to test on non main branch 2024-05-10 10:52:14 -04:00
Mik-TF
593738cc52 mbweni update, sports in activities 2024-05-10 10:46:57 -04:00
4af97fd801 Merge pull request 'development to main merge' (#52) from development into main
Reviewed-on: #52
2024-05-10 13:24:59 +00:00
d69865804c Merge pull request 'development_kristof_merge' (#51) from development_kristof_merge into development
Reviewed-on: #51
2024-05-10 13:24:04 +00:00
Mik-TF
a72febb4b7 pinca, set main for book_collection 2024-05-10 09:22:56 -04:00
Mik-TF
cf88ba6198 pmycel, added governance intro 2024-05-10 09:21:26 -04:00
Mik-TF
3161118c28 pmycel, added info on layers 2024-05-10 09:19:38 -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
Mik-TF
633be3807b update summary 2024-05-10 07:25:42 -04:00
Mik-TF
1359609419 set hero book to check new branch 2024-05-10 07:24:11 -04:00
Mik-TF
c67d5d9bee start kristof merge into dev 2024-05-10 07:20:39 -04:00
b932fe9e8b Merge pull request 'main into dev' (#50) from main into development
Reviewed-on: #50
2024-05-10 10:46:12 +00: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
ba303b6e3e legal update 2024-05-08 20:07:47 -04: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
4e41476b12 removed manual legal in legal 2024-05-08 19:57:06 -04:00
Mik-TF
675d67d9fe set manual legal as legal, since work is already done 2024-05-08 19:37:54 -04:00
Mik-TF
1b7b23d38c removed new_mdbook, only useful for testers to buidl with the docs 2024-05-08 19:33:15 -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
ff6b4e0f10 updated test 2024-05-08 19:28:12 -04:00
Mik-TF
8dfcb96d91 updated test 2024-05-08 19:25:15 -04:00
Mik-TF
515d640188 updated test 2024-05-08 19:23:39 -04:00
Mik-TF
cd381257dc updated test summ 2024-05-08 19:18:03 -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
5d8478bcea tech update sumamry 2024-05-08 16:01:25 -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
a26e9d592b tech update summary 2024-05-08 15:35:41 -04:00
Mik-TF
f8025b3994 updated summaries to introduction not intro 2024-05-08 15:34:00 -04:00
Mik-TF
ea2e27a9c2 tech update title 2024-05-08 15:31:00 -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
abcbef52e7 tfgrid4 tech update 2024-05-08 14:12:55 -04:00
Mik-TF
a5a70cf562 tfgrid4 economy update 2024-05-08 14:11:07 -04:00
Mik-TF
eb0ab69c58 tfgrid4 economy update 2024-05-08 14:10:20 -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
8db00c0242 updated tfgrid4 summary 2024-05-08 13:03:34 -04:00
Mik-TF
bb60ef0c5f tfgrid4 updates 2024-05-08 12:21:08 -04:00
Mik-TF
f2e9e4e9ec tfgrid4 updates 2024-05-08 12:17:46 -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
87255142b8 tfgrid4 updates 2024-05-08 12:12:28 -04:00
Mik-TF
e5e46ba405 tfgrid4 updates 2024-05-08 12:10:47 -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
Mik-TF
8e2abf891a updated book_collections to work on dev_manual 2024-05-03 12:34:59 -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
2ebbbee4ff removed unused books 2024-05-03 11:47:20 -04:00
Mik-TF
c5c809703d updated manual with main branch 2024-05-03 09:23:11 -04:00
743f8b40d7 Merge pull request 'development to main' (#47) from development into main
Reviewed-on: #47
2024-05-03 12:30:45 +00: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
7cbeff016d updated collection to add p2p 2024-05-02 14:40:25 -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
4208526822 update summary 2024-05-02 13:49:38 -04:00
Mik-TF
0912eac193 update summary 2024-05-02 13:46:59 -04:00
Mik-TF
512c2df4ab update summary 2024-05-02 13:45:42 -04:00
Mik-TF
a191390012 removed duplicate in summary 2024-05-02 13:41:49 -04:00
Mik-TF
f3a2b2214a summary update empty file 2024-05-02 13:37:04 -04:00
Mik-TF
287927db75 test for zos 2024-05-02 13:26:24 -04:00
Mik-TF
a533738087 fixed zos double definition in md files 2024-05-02 13:12:39 -04:00
Mik-TF
647d7e204d fixed 2 errors 2024-05-02 12:53:30 -04:00
86f346bde7 tfgrid 2024-05-02 17:54:26 +02:00
92b5e8ec3d ... 2024-05-02 13:40:33 +02:00
6c1a90fc9c Merge branch 'development' into development_manual
* development:
  ...
  updated inca distribution info
  updated inca distribution info
  updated docker docs hero
  updated docker docks
  hero docker added pull step
2024-05-02 08:29:45 +02:00
a2de5dc39a Merge branch 'main' into development
* main:
  ...
2024-05-02 08:29:18 +02:00
28f366cb14 ... 2024-05-02 08:28:43 +02:00
Mik-TF
2af86d207f added parentheses for test 2024-05-01 21:39:24 -04:00
Mik-TF
aa528de052 test with summary 2024-05-01 21:11:14 -04:00
scott
37a4e1340b Use int and bool forms 2024-04-30 22:04:50 +00:00
Mik-TF
2165ebdad8 updated urls 2024-04-30 14:43:39 -04:00
Mik-TF
c38e9fee6e updated urls 2024-04-30 14:29:32 -04:00
Mik-TF
db806d1be4 updated inca distribution info 2024-04-30 12:48:44 -04:00
Mik-TF
eee6081e2b updated inca distribution info 2024-04-30 12:38:12 -04:00
Mik-TF
be62f26cf9 put books_collection args to string 2024-04-29 21:42:52 -04:00
Mik-TF
abbabc3b94 updated book_collections with bool 2024-04-29 21:21:20 -04:00
Mik-TF
7a4660b8d3 test booktoml 2024-04-29 20:56:30 -04:00
Mik-TF
54876636a9 updated docker docs hero 2024-04-29 20:29:19 -04:00
Mik-TF
f5db05da35 updated docker docks 2024-04-29 20:23:06 -04:00
Mik-TF
a25ecdcc68 hero docker added pull step 2024-04-29 20:04:47 -04:00
d5702acbe9 manual ready minus urls and some formatting from hero 2024-04-29 20:09:47 +00:00
d0eb8639d9 fixed qss links toc 2024-04-29 19:50:24 +00:00
dc29cd5a16 manual fixed includes 2024-04-29 19:16:31 +00:00
6d885ff90e manual includes 2024-04-29 18:55:47 +00:00
dcc9e902e6 restructured manual toc 2024-04-29 18:29:02 +00:00
60b6c802ed restructured manual 2024-04-29 18:23:19 +00:00
7bd1e7a0d8 updated smaller collections for manual dashboard 2024-04-29 18:01:34 +00:00
30df64fcc8 updated smaller collections for manual about 2024-04-29 17:55:17 +00:00
b1e98c2051 updated smaller collections for manual 2024-04-29 17:49:02 +00:00
4806cb355b updated dashboard 2024-04-29 17:32:13 +00:00
02e107df25 updated intro collection 2024-04-29 17:12:56 +00:00
46912722d1 Merge pull request 'development' (#44) from development into main
Reviewed-on: #44
2024-04-29 13:44:02 +00:00
4a14ee4df1 Merge pull request 'development_projectinca' (#43) from development_projectinca into development
Reviewed-on: #43
2024-04-29 13:41:56 +00:00
a94b8b0953 Merge pull request 'development' (#42) from development into main
Reviewed-on: #42
2024-04-29 13:35:13 +00:00
f8335c9ffb updated docker docs 2024-04-29 13:30:06 +00:00
e2b2be252e updated docker hero docs 2024-04-29 13:28:14 +00:00
8b28536286 Merge pull request 'development' (#41) from development into main
Reviewed-on: #41
2024-04-27 14:09:18 +00:00
Mik-TF
3fc87e05a7 added docker hero mdbook steps 2024-04-27 09:49:13 -04:00
Mik-TF
e5dc4e2e1a projectinca, marketplace_grant 2024-04-26 21:47:59 -04:00
Mik-TF
333df99afd typo in hero.md 2024-04-26 21:45:45 -04:00
Mik-TF
eb603e1688 Merge branch 'main' into development 2024-04-26 19:12:49 -04:00
214d8d9b2d revert 5c87340c67
revert updated create mdbook
2024-04-26 23:07:51 +00:00
b844c50634 Update docs/hero_mdbook_fullvm.md 2024-04-26 23:06:41 +00:00
5c87340c67 updated create mdbook 2024-04-26 22:17:31 +00:00
2e682b0c60 Update docs/hero_mdbook_fullvm.md 2024-04-26 22:11:07 +00:00
281f446ef5 updated hero install curl 2024-04-26 22:08:12 +00:00
Mik-TF
ef48ccd918 pinca, proj_info 2024-04-26 14:03:38 -04:00
Mik-TF
f82ddc1e60 pinca, proj_info 2024-04-26 13:59:19 -04:00
Mik-TF
24f85d4630 pinca, hero 2024-04-26 13:58:28 -04:00
Mik-TF
258871c5b4 pinca, storagebox 2024-04-26 13:56:08 -04:00
Mik-TF
c2e2028990 pinca, cloudbox 2024-04-26 13:54:30 -04:00
Mik-TF
cbb4210f59 pinca, aibox 2024-04-26 13:52:37 -04:00
Mik-TF
f164abb691 pinca, tfgrid4 2024-04-26 13:50:48 -04:00
Mik-TF
ff1da8448c pinca, marketplace 2024-04-26 13:49:42 -04:00
Mik-TF
62d87725f0 pinca, marketplace 2024-04-26 13:49:04 -04:00
Mik-TF
bb520ff07d pinca, 3.13-14 2024-04-26 13:45:28 -04:00
Mik-TF
aca6190879 pinca, 3.14 2024-04-26 13:44:32 -04:00
Mik-TF
749deec5a6 pinca, grants 2024-04-26 13:38:28 -04:00
Mik-TF
0e127109a1 pinca, teams 2024-04-26 13:34:53 -04:00
Mik-TF
72735301d1 pinca, remuneration 2024-04-26 13:24:12 -04:00
Mik-TF
322b286c6a pinca, collab 2024-04-26 13:21:24 -04:00
Mik-TF
763bd221b8 pinca, tft 2024-04-26 13:17:16 -04:00
Mik-TF
1f1429bacf pinca, liquidity 2024-04-26 13:11:35 -04:00
Mik-TF
065b522e48 pinca, p2pp 2024-04-26 13:08:40 -04:00
Mik-TF
3d3c0a7e41 pinca, funding.md 2024-04-26 13:06:13 -04:00
Mik-TF
6e7cd5d93d pinca, theplan_c and inca updates 2024-04-26 12:53:37 -04:00
a060e879bc projectinca intro update 2024-04-25 22:05:24 +00:00
Mik-TF
77bd4bca47 stated tft for grants 2024-04-25 14:19:14 -04:00
3e7a64289e Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-25 20:16:19 +02:00
20c1897b75 s 2024-04-25 20:16:12 +02:00
fb48d517c6 fix typo's 2024-04-25 14:17:30 +00:00
022701a480 change typo's 2024-04-25 14:06:06 +00:00
9f4bbaa625 ... 2024-04-25 12:14:09 +02:00
5e633c1df3 cloudboxes and ... 2024-04-25 11:22:51 +02:00
8b6ff82538 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts:
#	books/hero/SUMMARY.md
#	books/hero/sync_production.sh
#	books/projectinca/sync_production.sh
2024-04-24 13:45:03 +02:00
2b977a4fea s 2024-04-24 13:43:10 +02:00
7a2bb56a3b lots of fixes and add ons 2024-04-23 14:20:22 +02:00
b6889eec02 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-21 12:19:25 +02:00
8266cf4d0e ... 2024-04-21 12:19:20 +02:00
7bf22411d2 manual token_overview removed test lines 2024-04-17 17:21:44 +00:00
1ae78c8b19 Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-04-17 17:20:52 +00:00
3d1abb5be4 manual scripts wallets 2024-04-17 17:20:17 +00:00
ea34074571 hero docs added info on building updated book 2024-04-17 15:24:28 +00:00
30ed739b05 hero docs, added include and parentheses info 2024-04-17 15:19:11 +00:00
7dc9ed014f manual added scripts data 2024-04-16 19:52:15 +00:00
f0bcef7880 readme 2024-04-16 07:26:11 -03:00
7b58aa625e Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-16 04:46:33 -03:00
6caab6f95d manual added knowledge_base 2024-04-15 22:10:30 +00:00
b63f091e63 manual transfer done for documentation, still hero issues for parsing 2024-04-15 21:57:46 +00:00
99c05100c3 manual developers added content before proxy 2024-04-15 21:12:29 +00:00
037937df0c Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-04-15 20:59:02 +00:00
ebee66d3cd manual developer section update 2024-04-15 20:58:40 +00:00
940e52cdee hero docs simplified steps 2024-04-15 19:07:52 +00:00
2c0f849383 manual added whole devs 2024-04-15 18:35:56 +00:00
3cd741971c manual added documentation in collection manual 2024-04-15 18:30:53 +00:00
710a522789 manual updated summary.md 2024-04-15 18:29:07 +00:00
c19931fd32 manual removed files 2024-04-15 17:49:09 +00:00
a567404ef3 new book manual 2024-04-15 17:42:25 +00:00
b46a6df7e0 tfmanual, renamed intro dir 2024-04-15 17:20:41 +00:00
d02b61bcd0 tfmanual, added intro with updated dir and file names 2024-04-15 17:13:21 +00:00
68c4448d79 tfmanual removed parenthesis in summary.md 2024-04-15 17:02:57 +00:00
56c6431ead finished faq tfmanual 2024-04-15 16:58:07 +00:00
903d7d07fe updated tfmanual book_collections 2024-04-15 16:10:02 +00:00
dd7a3dc865 Update collections/tfgrid3/governance/gep_comm_brainstorm.md 2024-04-11 14:40:02 +00:00
f99ce06d89 Update collections/tfgrid3/governance/gep_comm_brainstorm.md 2024-04-11 13:33:39 +00:00
4afa2cf8e7 Update collections/tfgrid3/governance/gep_comm_brainstorm.md 2024-04-11 13:31:08 +00:00
b3eb91762f 3bot to 3Bot 2024-04-11 13:25:02 +00:00
3b7fb633e3 image edit 2024-04-11 15:21:13 +02:00
9c342d1c3b QSSS for NFT pictures updated 2024-04-11 15:13:19 +02:00
7ce269b419 changed digital twin to 3bot 2024-04-11 12:53:24 +00:00
41932e2203 Fix to governance file 2024-04-11 14:41:42 +02:00
686efecce1 Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-04-11 14:40:36 +02:00
706d5aae54 Chapters, Messaging, Promotion ... 2024-04-11 14:40:33 +02:00
fe981f6d95 updated brainstorm gep with 2 new inputs from tf members 2024-04-11 12:06:56 +00:00
12b02cc6d4 intro file table of contents fix 2024-04-11 13:39:48 +02:00
5ba19d6cc0 spelling edit 2024-04-11 13:35:34 +02:00
2557d92691 intro table of contents edit 2024-04-11 13:33:09 +02:00
883a52313e ecosystem file edits 2024-04-11 13:31:29 +02:00
c5e7b759a9 remove ecosystem from who are we file 2024-04-11 13:10:02 +02:00
52c4541d3c summary change (reordering) 2024-04-11 13:09:43 +02:00
b2ff6058c5 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-11 06:44:38 +02:00
03849955cb production 2024-04-11 06:44:33 +02:00
274f6a3c5c added gep brainstorm 2024-04-10 23:45:16 +00:00
52eff1e6fc updated intro and ecosystem 2024-04-10 23:13:08 +00:00
6aa891acbd Update README.md 2024-04-10 20:20:52 +00:00
793341573b merge main_commsteam to main with fixed conflicts 2024-04-10 18:54:49 +00:00
f86e6a77c2 edits 2024-04-10 12:01:58 +02:00
a3d705ce41 edits 2024-04-10 12:01:09 +02:00
88ec04a494 new plan A 2024-04-09 23:03:11 +02:00
09966964f9 Update collections/solana/intro.md 2024-04-09 12:58:12 +00:00
ff8218425d initial cleanup hero + start of new prompt for actor 2024-04-09 14:54:14 +02:00
981fb085e0 edit 2024-04-05 15:50:51 +02:00
b2bca23456 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-05 07:43:20 +02:00
87b59a1da7 i 2024-04-05 07:43:18 +02:00
d9349cb736 Update collections/tech/qsss/s3_interface.md
added minio guide
2024-04-04 17:59:05 +00:00
50f7335833 updated farming 3.14 with new gep info and planning ahead 2024-04-04 13:49:47 +00:00
fdca1d32ba Delete collections/tfgrid3/governance/gep2.md
duplicate
2024-04-04 12:52:27 +00:00
d5753766d0 edit 2024-04-04 14:10:37 +02:00
73597cc2aa edit 2024-04-04 14:08:08 +02:00
da9648caf9 edit 2024-04-04 14:02:26 +02:00
4a75a928dd edit 2024-04-04 13:53:18 +02:00
bcd04c0da9 Merge branch 'main_commsteam' of https://git.ourworld.tf/tfgrid/info_tfgrid into main_commsteam 2024-04-04 12:43:19 +02:00
dcfb3c78a9 edit 2024-04-04 12:37:02 +02:00
31672087ba edit 2024-04-04 12:36:17 +02:00
e99e60574c edit 2024-04-04 12:35:51 +02:00
606884068b Merge branch 'main_commsteam' of https://git.ourworld.tf/tfgrid/info_tfgrid into main_commsteam 2024-04-04 12:29:10 +02:00
fbe0e88c6e Sam edits 2024-04-04 12:29:06 +02:00
3599f0ee79 edit 2024-04-04 12:20:55 +02:00
1f2c525a12 edit 2024-04-04 12:09:54 +02:00
393ae3a513 edit 2024-04-04 12:04:35 +02:00
9487eb94e8 edit 2024-04-04 11:50:52 +02:00
cd95ba6c9d edit 2024-04-04 11:49:46 +02:00
3cee144274 edit 2024-04-04 11:47:59 +02:00
38b59960a5 edit 2024-04-04 11:43:59 +02:00
300983792e edit 2024-04-04 11:39:37 +02:00
225bd32517 edit 2024-04-04 11:38:53 +02:00
e3c1848c21 edit 2024-04-04 11:37:29 +02:00
31a4aff34d edit 2024-04-04 11:35:16 +02:00
d807092768 edit 2024-04-04 11:32:26 +02:00
66dc9b7a74 edit 2024-04-04 11:30:14 +02:00
dd3a379110 edit 2024-04-04 11:28:13 +02:00
a5442b9f17 edits 2024-04-04 11:27:28 +02:00
cf7963a633 edits 2024-04-04 11:22:58 +02:00
6a94b5e45e edits 2024-04-04 11:17:44 +02:00
a1b8525362 edits 2024-04-04 11:02:55 +02:00
f9331344dc edits 2024-04-04 11:01:58 +02:00
4c48c0cb96 edits 2024-04-04 11:01:25 +02:00
b452db7d9b Revert "edit"
This reverts commit 52eeafa667.
2024-04-04 10:51:57 +02:00
4bf336df20 edits 2024-04-04 10:34:47 +02:00
586d9faa90 edits 2024-04-04 10:27:16 +02:00
6aa76be6e2 edit 2024-04-04 10:04:15 +02:00
b9a88c3c5a edits 2024-04-04 10:03:16 +02:00
e9c527f0e1 Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-04-04 09:57:07 +02:00
52eeafa667 edit 2024-04-04 09:56:41 +02:00
24777651dd test with tfchain.md in devs 2024-04-04 01:03:50 +00:00
cfaec4f635 simplified developers 2024-04-04 00:57:10 +00:00
5cbee48d14 fixed typo in html 2024-04-04 00:53:24 +00:00
b355e57023 added developers 2024-04-04 00:47:48 +00:00
848188accb tfmanual creation 2024-04-03 17:01:28 +00:00
cf65cd27e1 info_grid, summary whole 2024-04-03 16:48:35 +00:00
da7d6735d7 added threefold token 2024-04-03 16:40:23 +00:00
964cd27fb0 added faq 2024-04-03 15:23:47 +00:00
8b2535c230 added dashboard 2024-04-03 15:15:08 +00:00
1c274ab986 simplified documentation 2024-04-03 15:04:35 +00:00
698f4dcdc2 added documentation with .collection 2024-04-03 15:01:17 +00:00
e87fc85500 added collection in intro 2024-04-03 14:46:37 +00:00
a33d014a39 test simplify info_grid 2024-04-03 14:44:09 +00:00
14a9ca5943 Update docs/hero_create_mdbook.md
added info on sync_production.sh
2024-04-03 13:05:21 +00:00
813149945b edits 2024-04-03 12:32:46 +02:00
9e03a2e642 edits 2024-04-03 12:31:52 +02:00
e25cbe6692 edits 2024-04-03 11:21:28 +02:00
79825ad6eb edits 2024-04-03 11:17:59 +02:00
bd939d97ae edits 2024-04-03 10:57:56 +02:00
9adaed95da edits 2024-04-03 10:53:45 +02:00
79a925bfc2 edits 2024-04-03 10:53:19 +02:00
b9f1d127b8 tfcoop 2024-04-03 10:20:50 +02:00
13e3050e34 Update docs/hero_create_mdbook.md 2024-04-02 21:07:45 +00:00
405d6c050c Update docs/hero_create_mdbook.md
put absolute link
2024-04-02 21:07:22 +00:00
3a02594f3b Update README.md
set absolute links
2024-04-02 21:00:42 +00:00
30142a9375 Update README.md 2024-04-02 20:51:33 +00:00
841aace374 Update README.md
typo in link
2024-04-02 20:48:52 +00:00
625204a5ee Update README.md
add more info and links to docs
2024-04-02 20:46:28 +00:00
4be600da12 added mdbook hero guide how to create 2024-04-02 19:32:13 +00:00
e64f922e75 updated full vm guide hero 2024-04-02 19:31:42 +00:00
2a434e84cc added collection in new_mdbook 2024-04-02 18:18:08 +00:00
22219fc09e test see if works without .collection 2024-04-02 17:47:55 +00:00
70668fce32 test to remove summary in collections for new_mdbook 2024-04-02 17:42:02 +00:00
a737630635 removed summary title in new_mdbook 2024-04-02 17:39:20 +00:00
4e6dff9a9c added summary link 2024-04-02 17:30:10 +00:00
69c42bd93f added .collection 2024-04-02 17:28:28 +00:00
9d426f4b89 new mdbook 2024-04-02 17:11:12 +00:00
0670b3bde8 edits 2024-04-02 16:30:17 +02:00
c75d70cb94 edits 2024-04-02 16:26:05 +02:00
c8e489e8f9 edits 2024-04-02 16:22:06 +02:00
4f6ddca942 farming reward edits 2024-04-02 16:18:36 +02:00
962095e090 tokenomics edits 2024-04-02 16:12:45 +02:00
8982a87dc8 edits 2024-04-02 16:03:35 +02:00
cb563f89bc added info to display book on browser 2024-03-29 17:58:09 +00:00
2a24288f09 added steps to hero docs mdbook 2024-03-27 19:08:46 +00:00
sasha-astiadi
8b5a65ea96 edit typo 2024-03-27 19:18:18 +01:00
sasha-astiadi
b21535430c edit typo 2024-03-27 19:17:04 +01:00
sasha-astiadi
84c1703c54 add all files 2024-03-27 19:14:42 +01:00
sasha-astiadi
514b7646be Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-03-27 18:02:31 +01:00
sasha-astiadi
2f667f46c3 add intro 2024-03-27 18:02:30 +01:00
2784 changed files with 15936 additions and 7041 deletions

1
CODEOWNERS Normal file
View File

@@ -0,0 +1 @@
* @despiegk @mik-tf @gosam @scott

View File

@@ -1,19 +1,88 @@
# INFO for TFGrid
<h1> TFGrid Docs</h1>
> todo: kristof some content does not belong here, move to other repo
<h2>Table of Contents</h2>
## To preview new changes on local browser
- [Overview](#overview)
- [Basic Hero mdBook Commands](#basic-hero-mdbook-commands)
- [Install and Use Hero](#install-and-use-hero)
- [Create a New mdBook](#create-a-new-mdbook)
- [Use Hero with Docker](#use-hero-with-docker)
- [Contribute](#contribute)
- [Branches and Forks](#branches-and-forks)
- [Overview](#overview-1)
- [Content Update Procedure](#content-update-procedure)
1. Pull new changes from local
## Overview
(please make sure commit / save your local changes first )
This repository contains TFGrid docs in the form of mdbooks generated with the [Hero](https://github.com/freeflowuniverse/crystallib/tree/development/cli/hero) tool.
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/nameofyourbook -gp
To see the whole list of books, check the [heroscript directory](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript).
2. Build the book locally
## Basic Hero mdBook Commands
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/nameofyourbook
Once Hero is set on your machine, you can run the following commands to preview mdbooks on your local browser:
3. Preview on web browser
- Pull new changes
```
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/nameofyourbook -gp
```
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/nameofyourbook -o
- Build the book
```
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/nameofyourbook
```
- Preview on a web browser
```
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/nameofyourbook -o
```
> Note: You can use -p instead of -u and set a path to your heroscript directory, as explained in the [docs](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/docs).
## Install and Use Hero
install hero as follows
```bash
curl https://raw.githubusercontent.com/freeflowuniverse/crystallib/development/scripts/installer_hero.sh | bash /tmp/hero_install.sh
```
you can also do it on a VM (experts only)
To install and use Hero on a full VM running on the grid, read the [full VM guide](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/docs/hero_mdbook_fullvm.md).
## Create a New mdBook
To create a new mdbook, read the [mdbook creation guide](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/docs/hero_create_mdbook.md).
## Use Hero with Docker
You can use Hero with Docker. Read the docs [here](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/docs/hero_mdbook_docker.md).
## Contribute
To optimize updates to this repository, we propose a uniform way to collaborate.
### Branches and Forks
To contribute to this repository, make a pull request of your changes. There are two main methods.
1. Fork the repository and make a pull requests with your changes
2. If you have access, create a new branch in this repo and make a pull request with your changes
### Overview
- The production-ready content is published on the **main** branch
- The staging content is published on the **development** branch
- Any changes to development must go through a pull request (PR) and its associated review from a different branch with the prefix `development_`.
- The name of the branch should indicate the work being done, e.g. working on the readme, `development_readme_work`
- Once staging is done on development, the code owners will merge development branch to main branch.
- The mdbooks will be updated online.
### Content Update Procedure
- Create new branch out of development (e.g. `development_work`)
- Make changes to the files
- Make a PR to merge to development
- Get reviewed and adjust accordingly
- PR is approved and the content is merged to development
- Code owners will merge development to main to update the books online

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 247 KiB

After

Width:  |  Height:  |  Size: 247 KiB

View File

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 222 KiB

View File

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 170 KiB

View File

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 101 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

View File

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 137 KiB

View File

@@ -0,0 +1 @@
tft.png

View File

Before

Width:  |  Height:  |  Size: 290 KiB

After

Width:  |  Height:  |  Size: 290 KiB

View File

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 229 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 KiB

View File

Before

Width:  |  Height:  |  Size: 290 KiB

After

Width:  |  Height:  |  Size: 290 KiB

View File

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 241 KiB

View File

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

View File

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

View File

Before

Width:  |  Height:  |  Size: 177 KiB

After

Width:  |  Height:  |  Size: 177 KiB

View File

Before

Width:  |  Height:  |  Size: 349 KiB

After

Width:  |  Height:  |  Size: 349 KiB

View File

Before

Width:  |  Height:  |  Size: 333 KiB

After

Width:  |  Height:  |  Size: 333 KiB

View File

Before

Width:  |  Height:  |  Size: 202 KiB

After

Width:  |  Height:  |  Size: 202 KiB

View File

Before

Width:  |  Height:  |  Size: 267 KiB

After

Width:  |  Height:  |  Size: 267 KiB

View File

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 188 KiB

View File

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 122 KiB

View File

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 175 KiB

View File

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

View File

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

View File

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Some files were not shown because too many files have changed in this diff Show More