Compare commits

...

546 Commits

Author SHA1 Message Date
52db50342a Merge pull request 'typo in overview tech' () from development_typo into development
Reviewed-on: 
2025-01-13 17:11:15 +00:00
mik-tf
47a8d32acb typo in overview tech 2025-01-13 12:10:58 -05:00
timurgordon
323b6df112 link fix 2024-12-09 05:38:55 +03:00
timurgordon
2a60caaa77 fixes to get hero working 2024-12-04 01:46:56 +03:00
a7cbdd198c Add heroscript/doctree.md 2024-12-03 21:46:52 +00:00
73d2cb52b9 Update heroscript/sysadmins/book_collections.md 2024-12-03 12:08:43 +00:00
2c96baf3db Update heroscript/tfgrid4specs/book_collections.md 2024-12-03 12:05:32 +00:00
f852c6c5a3 Update heroscript/tfgrid4/book_collections.md 2024-12-03 12:04:02 +00:00
376bb081ca Delete heroscript/tfgrid4/sshkey.md 2024-12-03 12:01:36 +00:00
6237ce65da Delete heroscript/tfgrid4/context.md 2024-12-03 12:01:31 +00:00
7b9926e4e0 Update heroscript/tfgrid3/book_collections.md 2024-12-03 12:01:05 +00:00
0366c8de4e Delete heroscript/tfgrid3/sshkey.md 2024-12-03 11:59:30 +00:00
9de2ca77dd Delete heroscript/tfgrid3/context.md 2024-12-03 11:59:26 +00:00
69f54eba15 Update heroscript/test/book_collections.md 2024-12-03 11:59:08 +00:00
8d661614d2 Delete heroscript/test/sshkey.md 2024-12-03 11:58:08 +00:00
7614ea0ec6 Delete heroscript/test/context.md 2024-12-03 11:58:05 +00:00
3d58652549 Delete heroscript/tech/context.md 2024-12-03 11:57:29 +00:00
ca75d6d395 Update heroscript/tech/book_collections.md 2024-12-03 11:57:19 +00:00
03dfa650b5 Update heroscript/manual/book_collections.md 2024-12-03 11:55:53 +00:00
a884951d48 Update heroscript/mbweni/book_collections.md 2024-12-03 11:55:33 +00:00
d55271a28b Delete heroscript/mbweni/context.md 2024-12-03 11:54:29 +00:00
d125cfd7e9 Delete heroscript/mbweni/sshkey.md 2024-12-03 11:54:25 +00:00
9a2a339fa1 Update heroscript/manual/book_collections.md 2024-12-03 11:54:12 +00:00
6e78c01b6d Delete heroscript/manual/context.md 2024-12-03 11:52:41 +00:00
b5c222373e Update heroscript/library/book_collections.md 2024-12-03 11:52:32 +00:00
f4130313ed Delete heroscript/library/context.md 2024-12-03 11:51:38 +00:00
f24b7bbdd3 Delete heroscript/library/sshkey.md 2024-12-03 11:51:34 +00:00
a37b58bae1 Update heroscript/legal/book_collections.md 2024-12-03 11:51:26 +00:00
0cdd405492 Delete heroscript/legal/context.md 2024-12-03 11:49:46 +00:00
d45e6b1764 Update heroscript/knowledge_base/book_collections.md 2024-12-03 11:49:28 +00:00
5e6619f3ef Delete heroscript/knowledge_base/sshkey.md 2024-12-03 11:47:15 +00:00
2bbe563a0a Delete heroscript/knowledge_base/context.md 2024-12-03 11:47:11 +00:00
28882d4946 Update heroscript/farmers/book_collections.md 2024-12-03 11:47:00 +00:00
7c0b980940 Update heroscript/earthhub/book_collections.md 2024-12-03 11:46:14 +00:00
a2bb5faaf0 Delete heroscript/earthhub/sshkey.md 2024-12-03 11:43:43 +00:00
53a22140c0 Delete heroscript/earthhub/context.md 2024-12-03 11:43:38 +00:00
cef9bdd346 Update heroscript/duniayetu/book_collections.md 2024-12-03 11:43:27 +00:00
aa3e5c856d Delete heroscript/duniayetu/sshkey.md 2024-12-03 11:40:53 +00:00
2acfd92b63 Delete heroscript/duniayetu/context.md 2024-12-03 11:40:48 +00:00
058f964a19 Update heroscript/devs/book_collections.md 2024-12-03 11:40:31 +00:00
d8a69a277b Delete heroscript/devs/sshkey.md 2024-12-03 11:27:45 +00:00
9833fbd68d Delete heroscript/devs/context.md 2024-12-03 11:27:39 +00:00
55354f3ac8 Update heroscript/farmers/book_collections.md 2024-12-03 11:10:19 +00:00
41ea5922fc Delete heroscript/farmers/context.md 2024-12-03 11:06:49 +00:00
8a29b6fe9a Delete heroscript/farmers/sshkey.md 2024-12-03 11:06:41 +00:00
644232921f ... 2024-11-28 11:16:02 +03:00
7fcb848464 Merge pull request 'updated readme' () from development_hero2 into development
Reviewed-on: 
2024-10-23 20:35:49 +00:00
mik-tf
bbc78a3bfc updated readme 2024-10-23 16:35:18 -04:00
465c71806a Merge pull request 'Update docs/mdbook_basics.md' () from mik-tf-patch-1 into development
Reviewed-on: 
2024-10-23 15:08:37 +00:00
f3964bd67c Update docs/mdbook_basics.md 2024-10-23 15:08:26 +00:00
07dab2ae37 Merge pull request 'added links to mdbook basics' () from dev_3 into development
Reviewed-on: 
2024-10-23 13:16:43 +00:00
mik-tf
834d524faa added links to mdbook basics 2024-10-23 09:16:15 -04:00
3a08902ea6 Merge pull request 'new content' () from dev_2 into development
Reviewed-on: 
2024-10-23 13:15:08 +00:00
mik-tf
b7a81dc0b8 new content 2024-10-23 09:14:48 -04:00
2a31b2120d Update heroscript/exporter/do.hero 2024-10-23 09:01:12 +00:00
c2b2304b46 Update heroscript/exporter/book_collections.md 2024-10-23 09:00:18 +00:00
0424b65ec9 Merge pull request 'finalize docs for hero docker' () from dev_docs into development
Reviewed-on: 
2024-10-23 04:06:12 +00:00
mik-tf
8e0c380c7d finalize docs for hero docker 2024-10-23 00:05:55 -04:00
f7d1e0d634 Merge pull request 'added info for docker hero' () from dev_docs into development
Reviewed-on: 
2024-10-23 04:03:29 +00:00
mik-tf
1b7dc1b23c added info for docker hero 2024-10-23 00:03:07 -04:00
4a8656ff94 Merge pull request 'new' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:58:34 +00:00
mik-tf
d8aa671119 new 2024-10-22 23:58:10 -04:00
db40adc03e Merge pull request 'new' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:53:25 +00:00
mik-tf
7dd53d1e32 new 2024-10-22 23:53:06 -04:00
7416aef04a Merge pull request 'dev_docs' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:51:36 +00:00
mik-tf
c6d20f36d7 added info for docker 2024-10-22 23:51:12 -04:00
mik-tf
800022e588 added info for docker 2024-10-22 23:48:52 -04:00
ddfa5a3594 Merge pull request 'fixed typo in tree' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:43:51 +00:00
mik-tf
e113964d14 fixed typo in tree 2024-10-22 23:43:10 -04:00
5b868741a9 Merge pull request 'updated readme' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:42:29 +00:00
mik-tf
ddd216464e updated readme 2024-10-22 23:42:06 -04:00
f7657be893 Merge pull request 'added basic mdbook docs' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:39:41 +00:00
mik-tf
ebaea4ad54 added basic mdbook docs 2024-10-22 23:39:15 -04:00
066169ad5f Merge pull request 'dev_docs' () from dev_docs into development
Reviewed-on: 
2024-10-23 03:36:34 +00:00
mik-tf
f7174a048a updated with advice 2024-10-22 23:35:59 -04:00
mik-tf
5a8f4886a0 updated docs for hero 2024-10-22 23:33:27 -04:00
76c820817c Delete heroscript/legal/sshkey.md 2024-10-16 15:42:27 +00:00
55b06dc4b8 ... 2024-10-14 09:27:55 +04:00
72b1828bbd s 2024-10-11 11:41:35 +04:00
10e28b29ae ... 2024-10-08 14:28:31 +00:00
0ce54b2025 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-10-08 10:35:08 +04:00
f140318a3b ... 2024-10-08 10:35:04 +04:00
timurgordon
8072194c03 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-10-04 08:02:39 +02:00
timurgordon
2d2ec6f9c7 fix includes syntax 2024-10-04 08:02:33 +02:00
f30e6e090b s 2024-10-03 17:29:42 +03:00
0e20c69b78 Update heroscript/sysadmins/sshkey.md 2024-10-01 15:15:37 +00:00
815b50047f Update collections/system_administrators/getstarted/sidebar.md 2024-10-01 15:04:10 +00:00
b22246a855 Delete heroscript/manual/sshkey.md 2024-10-01 14:59:07 +00:00
dc15873c58 Merge pull request 'update info_tfgrid up to info_grid 12df' () from development_update5 into development
Reviewed-on: 
2024-09-23 16:54:01 +00:00
mik-tf
cfa17fd00d update info_tfgrid up to info_grid 12df 2024-09-23 12:52:46 -04:00
fc524b2b78 Merge pull request 'fixed parsing' () from development_update4 into development
Reviewed-on: 
2024-09-23 14:45:11 +00:00
mik-tf
9993e0e13d fixed parsing 2024-09-23 10:44:45 -04:00
75fa508b0e Merge pull request 'fixed hero mdbook parsing' () from development_update3 into development
Reviewed-on: 
2024-09-23 14:42:37 +00:00
mik-tf
93ceb68398 fixed hero mdbook parsing 2024-09-23 10:41:47 -04:00
1461fc8d33 Merge pull request 'fixed hero mdbook parsing' () from development_update2 into development
Reviewed-on: 
2024-09-23 14:38:52 +00:00
mik-tf
32d064c080 fixed hero mdbook parsing 2024-09-23 10:37:44 -04:00
2f3e9e02c5 Merge pull request 'fixed typos' () from development_update_manual into development
Reviewed-on: 
2024-09-23 14:31:54 +00:00
mik-tf
b235306252 fixed typos 2024-09-23 10:29:54 -04:00
e2368b20cd ... 2024-09-23 17:25:02 +03:00
489a7eeee9 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-09-23 17:02:13 +03:00
8c691b5488 ... 2024-09-23 17:02:10 +03:00
3f7ddc572a Delete heroscript/tech/sshkey.md 2024-09-23 10:57:33 +00:00
c91950cde5 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
* 'development' of git.ourworld.tf:tfgrid/info_tfgrid:
  ...
  ...
  export for mdbook
  s
  s
  fixed
  finalized info_fgrid sync
  updated sync with info_grid
  troubleshootinfg farming
  update
  updated faq, tft
  updated 0133
  updated 0133
  Update collections/projectinca/stories/stories.md
  collection update
2024-09-19 06:32:55 +04:00
ace7e68069 ... 2024-09-19 06:32:47 +04:00
cc81c96b38 ... 2024-09-19 06:06:43 +04:00
cb2fbb26bf ... 2024-09-18 07:40:11 +03:00
244d0a4aa4 export for mdbook 2024-09-09 10:04:34 +02:00
d84487b79d s 2024-09-09 07:19:25 +02:00
a961c63f16 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-09-01 06:10:24 +02:00
6a35f7eb85 s 2024-09-01 06:10:23 +02:00
1540effde3 Merge pull request 'fixed' () from development_fix_quick into development
Reviewed-on: 
2024-08-29 23:29:11 +00:00
mik-tf
ea27326ae4 fixed 2024-08-29 19:28:46 -04:00
e16b01f7d4 Merge pull request 'finalized info_fgrid sync' () from development_final_sync into development
Reviewed-on: 
2024-08-29 23:23:44 +00:00
mik-tf
0c33119601 finalized info_fgrid sync 2024-08-29 19:22:26 -04:00
a75e59d42c Merge pull request 'updated sync with info_grid' () from development_update_new into development
Reviewed-on: 
2024-08-29 22:15:43 +00:00
mik-tf
4b44fa1664 updated sync with info_grid 2024-08-29 18:15:05 -04:00
ca9288af82 Merge pull request 'troubleshootinfg farming' () from development_trouble into development
Reviewed-on: 
2024-08-29 21:24:42 +00:00
mik-tf
350531c668 troubleshootinfg farming 2024-08-29 17:23:40 -04:00
544dacad02 Merge pull request 'development_update' () from development_update into development
Reviewed-on: 
2024-08-29 20:46:21 +00:00
mik-tf
7567164929 update 2024-08-29 16:45:52 -04:00
mik-tf
b7e3f2b323 updated faq, tft 2024-08-29 16:43:43 -04:00
ec47399867 Merge pull request 'development_update_from_0133' () from development_update_from_0133 into development
Reviewed-on: 
2024-08-29 20:14:58 +00:00
mik-tf
516c036a46 updated 0133 2024-08-29 16:14:09 -04:00
mik-tf
811493e9b0 updated 0133 2024-08-29 16:10:38 -04:00
372ba64e4e Update collections/projectinca/stories/stories.md 2024-08-29 20:00:51 +00:00
260fcfeb16 collection update 2024-08-29 19:50:49 +00:00
9b2cda9e8e update 2024-08-26 11:14:18 +02:00
972d0e48a9 Merge pull request 'decentralization update project inca' () from development_dec2 into development
Reviewed-on: 
2024-08-20 15:49:55 +00:00
Mik-TF
2fe3773aac decentralization update project inca 2024-08-20 11:49:01 -04:00
79bec3ec39 Merge pull request 'decentralization update project inca' () from development_dec into development
Reviewed-on: 
2024-08-20 15:45:40 +00:00
Mik-TF
a8be8ff612 decentralization update project inca 2024-08-20 11:45:03 -04:00
b7f845a4cf Merge pull request 'updated liquidity' () from development_liquidity into development
Reviewed-on: 
2024-08-20 14:50:04 +00:00
Mik-TF
ffbe65714a updated liquidity 2024-08-20 10:49:25 -04:00
1f743cd15f Merge pull request 'updated intro and tokenomics for projectinca' () from development_new into development
Reviewed-on: 
2024-08-19 22:11:30 +00:00
Mik-TF
5de7e3180d updated intro and tokenomics for projectinca 2024-08-19 18:06:22 -04:00
b5d155d00b Merge pull request 'updated intro first part of project inca' () from development_update_intro into development
Reviewed-on: 
2024-08-19 20:31:15 +00:00
Mik-TF
2c1e878d9c updated intro first part of project inca 2024-08-19 16:29:07 -04:00
17efd5f8e1 Merge pull request 'added info for first page projectinca' () from development_update2 into development
Reviewed-on: 
2024-08-19 19:38:39 +00:00
Mik-TF
ec07a2d4d3 Merge branch 'development' into development_update2
merge dev
2024-08-19 15:37:21 -04:00
3c0082a005 ... 2024-08-17 13:22:25 +02:00
Mik-TF
416d03381e added info for first page projectinca 2024-08-16 12:18:43 -04:00
d93f748bfb s 2024-08-16 14:04:37 +02:00
564345e26b s 2024-08-16 01:40:17 +02:00
da14091106 s 2024-08-06 17:33:59 +02:00
6e1f478ce5 :wq
Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
2024-08-01 18:45:50 +02:00
0f08c2ec63 ... 2024-08-01 18:45:49 +02:00
c57b71cd76 Update collections/dy_intro/dunia_yetu/dunia_yetu.md 2024-08-01 15:17:04 +00:00
dc244fbe55 Update collections/dy_intro/dunia_yetu/dunia_yetu.md 2024-08-01 14:58:29 +00:00
393985d305 ... 2024-07-29 10:27:54 +02:00
86827c23db Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
* 'development' of git.ourworld.tf:tfgrid/info_tfgrid:
  s
2024-07-29 10:05:56 +02:00
23cb055f8c Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-07-28 10:35:17 +02:00
11fcf9e804 s 2024-07-28 08:41:44 +02:00
b0a6115e80 Merge pull request 'development to main' () from development into main
Reviewed-on: 
2024-07-15 17:49:56 +00:00
77094a835b Merge pull request 'removed docs_inca, transferred to new repo' () from development_remove_docs_inca into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-07-14 01:37:30 +00:00
4ed8102c8a Merge pull request 'finished files for tfgrid4specs' () from development_gridspecs into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-07-11 21:12:37 +00:00
ef67af4fac Merge pull request 'development_devs' () from development_devs into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-07-11 01:45:09 +00:00
e2c9ea50dc Merge pull request 'development_sysadmins' () from development_sysadmins into development
Reviewed-on: 
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
9a7d968268 Merge branch 'development'
* development:
  tokens
2024-07-08 06:20:24 +02:00
253724e273 tokens 2024-07-08 06:19:57 +02:00
ba5cc1b4a9 Merge branch 'development'
* development:
  Update docs_projectinca/README.md
  updated whitepaper
  set whitepaper as test
  s
  s
  s
2024-07-07 10:37:35 +02:00
97854b5b8f Merge pull request 'Update docs_projectinca/README.md' () from development_quick_fix into development
Reviewed-on: 
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' () from development_whitepaper_test into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-06-20 13:52:31 +00:00
3c9092d5bb Merge pull request 'updated crisp for tf not inca' () from development_crisp_threefold into development
Reviewed-on: 
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' () from development_docs into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-06-19 17:27:32 +00:00
c57a25bbfd Merge pull request 'added crisp access' () from development_crisp_icon into development
Reviewed-on: 
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' () from development_crisp into development
Reviewed-on: 
2024-06-19 16:57:17 +00:00
aa4f501af1 Merge pull request 'updated link icon header' () from development_icon into development
Reviewed-on: 
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' () from development_details into development
Reviewed-on: 
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' () from development_docs_menu into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-06-14 16:52:01 +00:00
c89d0d0bb1 Merge pull request 'update to finalize first page' () from development_inca_update into development
Reviewed-on: 
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' () from development_docs_inca_basic into development
Reviewed-on: 
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' () from development_farmers_book into development
Reviewed-on: 
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' () from development_manual_update_june into development
Reviewed-on: 
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' () from development_legal_updates into development
Reviewed-on: 
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' () from development_status into development
Reviewed-on: 
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' () from development_fix_update into development
Reviewed-on: 
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' () from development_parsing into development
Reviewed-on: 
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' () from development_codeowners into development
Reviewed-on: 
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' () from development_readme into development
Reviewed-on: 
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' () from development_fix_tech into development
Reviewed-on: 
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' () from dev_mik into main
Reviewed-on: 
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' () from dev3 into main
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-14 22:34:58 +00:00
c156a954af Merge pull request 'dev2' () from dev2 into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-14 22:14:40 +00:00
a84f649c5d Merge pull request 'Manual book Revised completely' () from development_manual2 into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-14 19:17:12 +00:00
7d28a7a0c9 Merge pull request 'Info_grid manual update to current info_tfgrid manual' () from development_manual2 into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-14 18:05:22 +00:00
db7fde432c Merge pull request 'include fixed' () from development_manual2 into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-14 17:28:54 +00:00
1549ea1652 Merge pull request 'manual: fixing parsing' () from development_manual2 into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-14 14:20:21 +00:00
4b4e871c88 Merge pull request 'dy updated intro' () from development_dy_intro into development
Reviewed-on: 
2024-05-14 14:19:44 +00:00
90ba88c357 Merge pull request 'development to main with manual updates' () from development into main
Reviewed-on: 
2024-05-13 23:34:03 +00:00
412206d8fa Merge pull request 'development_manual to dev' () from development_manual into development
Reviewed-on: 
2024-05-13 23:33:13 +00:00
a11893fcf0 Merge pull request 'manual, set internal collections to filename.md template' () from development_manual2 into development_manual
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-13 17:18:23 +00:00
1ba1e05215 Merge pull request 'development_manual' () from development_manual into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-13 16:41:56 +00:00
1cd428febe Merge pull request 'legal, updated grid user' () from development_legal into development
Reviewed-on: 
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' () from development_legal into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-11 17:44:33 +00:00
c0469c0a48 Merge pull request 'development_dy' () from development_dy into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-10 23:38:27 +00:00
17abdf5835 Merge pull request 'Update README.md' () from development_readme into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-10 23:35:12 +00:00
8e18562132 Merge pull request 'development_mdbooks' () from development_mdbooks into development
Reviewed-on: 
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' () from development_mdbooks into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-10 13:24:59 +00:00
d69865804c Merge pull request 'development_kristof_merge' () from development_kristof_merge into development
Reviewed-on: 
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' () from main into development
Reviewed-on: 
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' () from development into main
Reviewed-on: 
2024-05-03 12:30:45 +00:00
f14ae40998 Merge pull request 'development_inca' () from development_inca into development
Reviewed-on: 
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
1742 changed files with 83697 additions and 9632 deletions
.gitignoreCODEOWNERSREADME.md
_archive
possibleecosystem
aiqom
artheon
aydo
beliive
businesstwin
cicolabs
crystalhome
crystallanguage
digitaltwin
ekofolio
endpandemics
envirate
flowgen
freeflow
freeflowcircles
generationblue
greenedge
herculesbrowser
hpe
jointidea
kleos
kutana
lecielfoundation
mazraa
metaverse
mitaa
moneyofgood
ootopia
presearch
regennetwork
seeds
shareitt
sikana
solidaridad
sourcecode
spinn
talamanca
tapr
taskio
thehumanizedinternet
treebuddy
ubuntu
uhuru
unifinity
unit
vedamasters
vlinder
zetako
technology

4
.gitignore vendored
View File

@ -30,4 +30,6 @@ yarn.lock
package-lock.json package-lock.json
dist dist
.temp .temp
filebrowser.db
.venv/
.mypy_cache/

1
CODEOWNERS Normal file
View File

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

View File

@ -6,7 +6,12 @@
- [Basic Hero mdBook Commands](#basic-hero-mdbook-commands) - [Basic Hero mdBook Commands](#basic-hero-mdbook-commands)
- [Install and Use Hero](#install-and-use-hero) - [Install and Use Hero](#install-and-use-hero)
- [Create a New mdBook](#create-a-new-mdbook) - [Create a New mdBook](#create-a-new-mdbook)
- [Use Hero with Docker](#use-hero-with-docker)
- [Basic Mdbook Info](#basic-mdbook-info)
- [Contribute](#contribute) - [Contribute](#contribute)
- [Branches and Forks](#branches-and-forks)
- [Overview](#overview-1)
- [Content Update Procedure](#content-update-procedure)
## Overview ## Overview
@ -36,23 +41,49 @@ Once Hero is set on your machine, you can run the following commands to preview
## Install and Use Hero ## Install and Use Hero
install hero as follows You can install Hero with the following command:
```bash ```bash
curl https://raw.githubusercontent.com/freeflowuniverse/crystallib/development/scripts/installer_hero.sh | bash /tmp/hero_install.sh 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 ## 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). To create a new mdbook, read the [mdbook creation guide](./docs/hero_create_mdbook.md).
## Use Hero with Docker
You can use Hero with Docker. Read the docs [here](./docs/hero_mdbook_docker.md).
## Basic Mdbook Info
To get started with Mdbook before learning Hero Mdbook, read [this documentation](./docs/mdbook_basics.md).
## Contribute ## Contribute
To contribute to this repository, make a pull request of your changes. 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 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 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

@ -1 +1 @@
!!!wiki.include:aiqom_intro !!wiki.include page:aiqom_intro

View File

@ -1,3 +1,3 @@
!!!wiki.include:artheon_intro !!wiki.include page:artheon_intro
!!!wiki.include:artheon_potential !!wiki.include page:artheon_potential
!!!wiki.include:artheon_ops !!wiki.include page:artheon_ops

View File

@ -12,7 +12,7 @@ Artheon is hosted on the ThreeFold_Grid, allowing the museum to share free globa
- [Artheon | Vasily Gnuchev (Founder)](https://www.consciousinternet.org/#/people/vasily_gnuchev) - [Artheon | Vasily Gnuchev (Founder)](https://www.consciousinternet.org/#/people/vasily_gnuchev)
- [Artheon | Telegram Group](https://t.me/artheon) - [Artheon | Telegram Group](https://t.me/artheon)
!!!youtube id:Ofk22N2Ew1k !!youtube id:Ofk22N2Ew1k
## Future ## Future

View File

@ -1 +1 @@
!!!wiki.include:aydo_intro !!wiki.include page:aydo_intro

View File

@ -8,7 +8,7 @@
## Business Model & Funding ## Business Model & Funding
!!!wiki.include:tsc:twin_valuation_intro !!wiki.include page:tsc:twin_valuation_intro
For business use cases other licenses can be asked for. For business use cases other licenses can be asked for.
@ -37,8 +37,8 @@ Funding is part of what we do for Digital_twin
``` ```
!!!wiki.include:tsc:twin_projects !!wiki.include page:tsc:twin_projects
!!wiki.def alias:aydo !!wiki.def alias:aydo
!!!alias aydo_acp !!alias aydo_acp

View File

@ -1 +1 @@
!!!wiki.include:beliive_intro !!wiki.include page:beliive_intro

View File

@ -1 +1 @@
!!!wiki.include:businesstwin_intro !!wiki.include page:businesstwin_intro

View File

@ -85,6 +85,6 @@ Its in the best interest for every business twin owner to convince other people
- aim is to have hundreds of thousands of companies registered like this - aim is to have hundreds of thousands of companies registered like this
- 100.000 companies -> 80 eur average = +- 100 million USD recurring revenu - 100.000 companies -> 80 eur average = +- 100 million USD recurring revenu
!!!alias business_twin !!alias business_twin
!!!wiki.include:tsc:twin_projects !!wiki.include page:tsc:twin_projects

View File

@ -1 +1 @@
!!!wiki.include:cicolabs_intro !!wiki.include page:cicolabs_intro

View File

@ -1,2 +1,2 @@
!!!wiki.include:crystalhome_intro !!wiki.include page:crystalhome_intro
!!!wiki.include:crystalhome_ops !!wiki.include page:crystalhome_ops

View File

@ -1 +1 @@
!!!wiki.include:crystallanguage_intro !!wiki.include page:crystallanguage_intro

View File

@ -10,7 +10,7 @@ The Digital Twin assures that only you own your data, and no one else. Access nu
Fore more info about the why and how see [Internet 4](threefold:internet4) Fore more info about the why and how see [Internet 4](threefold:internet4)
!!!wiki.include:tsc:twin_valuation_intro !!wiki.include page:tsc:twin_valuation_intro
## Experiences On Top Of Digital Twin ## Experiences On Top Of Digital Twin

View File

@ -1 +1 @@
!!!wiki.include:digitaltwin_intro !!wiki.include page:digitaltwin_intro

View File

@ -86,4 +86,4 @@ More information see [digital twin why](twin:why_digital_twin)
See [twin_architecture](twin:twin_architecture) See [twin_architecture](twin:twin_architecture)
!!!wiki.include:twin:twin_toc !!wiki.include page:twin:twin_toc

View File

@ -1 +1 @@
!!!wiki.include:ekofolio_intro !!wiki.include page:ekofolio_intro

View File

@ -39,4 +39,4 @@ Protect land
``` ```
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1 +1 @@
!!!wiki.include:endpandemics_intro !!wiki.include page:endpandemics_intro

View File

@ -6,7 +6,7 @@ see https://endpandemics.earth
A Global Action Campaign to Reduce the Risks of Pandemics by Protecting and Regenerating Nature. A Global Action Campaign to Reduce the Risks of Pandemics by Protecting and Regenerating Nature.
!!!youtube id:cpRT32lcHRM !!youtube id:cpRT32lcHRM
![](img/endpandemics1.png) ![](img/endpandemics1.png)
@ -50,4 +50,4 @@ A Global Action Campaign to Reduce the Risks of Pandemics by Protecting and Rege
``` ```
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1 +1 @@
!!!wiki.include:envirate_intro !!wiki.include page:envirate_intro

View File

@ -2,7 +2,7 @@
# Envirate # Envirate
!!!youtube id:cw6mzUDSWy8 !!youtube id:cw6mzUDSWy8
The rationale is simple: we are used to rating hotels, food, travel and so forth; why not do the same for the environment? The rationale is simple: we are used to rating hotels, food, travel and so forth; why not do the same for the environment?
@ -43,4 +43,4 @@ The quality of the data itself will be checked for consistency algorithmically a
``` ```
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1 +1 @@
!!!wiki.include:flowgen_intro !!wiki.include page:flowgen_intro

View File

@ -1 +1 @@
!!!wiki.include:freeflow:freeflow !!wiki.include page:freeflow:freeflow

View File

@ -1 +1 @@
!!!wiki.include:freeflowcircles_intro !!wiki.include page:freeflowcircles_intro

View File

@ -5,7 +5,7 @@
![](img/freeflow_hub_alternative.png) ![](img/freeflow_hub_alternative.png)
!!!wiki.include:twin:freeflow_circles_intro !!wiki.include page:twin:freeflow_circles_intro
## Structure ## Structure
@ -17,7 +17,7 @@
## Business Model & Funding ## Business Model & Funding
!!!wiki.include:tsc:twin_valuation_intro !!wiki.include page:tsc:twin_valuation_intro
Funding is part of what we do for Digital_twin Funding is part of what we do for Digital_twin
@ -47,6 +47,6 @@ Funding is part of what we do for Digital_twin
!!wiki.def alias:freeflow_hub,freeflow_social,freeflow_circles !!wiki.def alias:freeflow_hub,freeflow_social,freeflow_circles
!!!alias freeflow_hub,freeflow_circles !!alias freeflow_hub,freeflow_circles
!!!wiki.include:tsc:twin_projects !!wiki.include page:tsc:twin_projects

View File

@ -1 +1 @@
!!!wiki.include:generationblue_intro !!wiki.include page:generationblue_intro

View File

@ -1 +1 @@
!!!wiki.include:greenedge_intro !!wiki.include page:greenedge_intro

View File

@ -1 +1 @@
!!!wiki.include:herculesbrowser_intro !!wiki.include page:herculesbrowser_intro

View File

@ -3,13 +3,13 @@
# Hercules Browser # Hercules Browser
!!!wiki.include:twin:hercules_browser_intro !!wiki.include page:twin:hercules_browser_intro
## More Info ## More Info
> see: [Hercules Browser How Does It Work](twin:hercules_browser_tech) > see: [Hercules Browser How Does It Work](twin:hercules_browser_tech)
!!!wiki.include:twin:hercules_browser_benefits !!wiki.include page:twin:hercules_browser_benefits
## Structure ## Structure

View File

@ -1 +1 @@
!!!wiki.include:hpe_intro !!wiki.include page:hpe_intro

View File

@ -1 +1 @@
!!!wiki.include:hpe_intro !!wiki.include page:hpe_intro

View File

@ -1 +1 @@
!!!wiki.include:jointidea_intro !!wiki.include page:jointidea_intro

View File

@ -1 +1 @@
!!!wiki.include:kleos_intro !!wiki.include page:kleos_intro

View File

@ -1 +1 @@
!!!wiki.include:kutana_intro !!wiki.include page:kutana_intro

View File

@ -8,7 +8,7 @@
## Business Model & Funding ## Business Model & Funding
!!!wiki.include:tsc:twin_valuation_intro !!wiki.include page:tsc:twin_valuation_intro
Licenses for corporate & enterprise use cases can be asked for. Licenses for corporate & enterprise use cases can be asked for.
@ -37,4 +37,4 @@ Funding is part of what we do for Digital_twin
``` ```
!!!wiki.include:tsc:twin_projects !!wiki.include page:tsc:twin_projects

View File

@ -1 +1 @@
!!!wiki.include:lecielfoundation_intro !!wiki.include page:lecielfoundation_intro

View File

@ -1 +1 @@
!!!wiki.include:mazraa_intro !!wiki.include page:mazraa_intro

View File

@ -1 +1 @@
!!!wiki.include:metaverse_intro !!wiki.include page:metaverse_intro

View File

@ -1 +1 @@
!!!wiki.include:mitaa_intro !!wiki.include page:mitaa_intro

View File

@ -57,7 +57,7 @@ Promising projects with new tokens encounter many barriers and excessive costs t
## Business Model & Funding ## Business Model & Funding
!!!wiki.include:tsc:twin_valuation_intro !!wiki.include page:tsc:twin_valuation_intro
Funding is part of what we do for Digital_twin Funding is part of what we do for Digital_twin

View File

@ -1 +1 @@
!!!wiki.include:moneyofgood_intro !!wiki.include page:moneyofgood_intro

View File

@ -1 +1 @@
!!!wiki.include:ootopia_intro !!wiki.include page:ootopia_intro

View File

@ -1,3 +1,3 @@
!!!wiki.include:presearch_intro !!wiki.include page:presearch_intro
> Learn more on Presearch node deployment on TF Grid [HERE](presearch_jukebox). > Learn more on Presearch node deployment on TF Grid [HERE](presearch_jukebox).

View File

@ -1 +1 @@
!!!wiki.include:regennetwork_intro !!wiki.include page:regennetwork_intro

View File

@ -42,4 +42,4 @@ Regeneration is the growth of vitality, viability and evolutionary capacity of a
``` ```
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1 +1 @@
!!!wiki.include:seeds_intro !!wiki.include page:seeds_intro

View File

@ -1 +1 @@
!!!wiki.include:shareitt_intro !!wiki.include page:shareitt_intro

View File

@ -1 +1 @@
!!!wiki.include:sikana_intro !!wiki.include page:sikana_intro

View File

@ -1,2 +1,2 @@
!!!wiki.include:solidaridad_intro !!wiki.include page:solidaridad_intro
!!!wiki.include:solidaridad_roadmap !!wiki.include page:solidaridad_roadmap

View File

@ -1 +1 @@
!!!wiki.include:sourcecode_intro !!wiki.include page:sourcecode_intro

View File

@ -1 +1 @@
!!!wiki.include:spinn_intro !!wiki.include page:spinn_intro

View File

@ -1 +1 @@
!!!wiki.include:talamanca_intro !!wiki.include page:talamanca_intro

View File

@ -2,7 +2,7 @@
# Talamanca Landbank # Talamanca Landbank
!!!youtube id:ZXsJIfEXhrQ !!youtube id:ZXsJIfEXhrQ
![](img/talamanca2.png) ![](img/talamanca2.png)
@ -19,7 +19,7 @@ Meet [Jennifer](https://www.threefold.io/aci/people/jennifer_long/), the driving
- the land harvest carbon credits - the land harvest carbon credits
- the land sometimes can be used by conscious communities (free) who then have to bring added value to the land & protect as well - the land sometimes can be used by conscious communities (free) who then have to bring added value to the land & protect as well
- the land sometimes can be used to organic farming in form of "food forests" - the land sometimes can be used to organic farming in form of "food forests"
- The project is a non for profit initiative !!! - The project is a non for profit initiative !!
## Business model ## Business model
@ -76,4 +76,4 @@ Meet [Jennifer](https://www.threefold.io/aci/people/jennifer_long/), the driving
``` ```
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1 +1 @@
!!!wiki.include:tapr_intro !!wiki.include page:tapr_intro

View File

@ -4,7 +4,7 @@ Analyze your dreams.
<!-- <div style="padding:56.6% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/561708625?badge=0&amp;autopause=0&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen style="position:absolute;top:0;left:0;width:100%;height:100%;" title="tapr (1)"></iframe></div><script src="https://player.vimeo.com/api/player.js"></script> --> <!-- <div style="padding:56.6% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/561708625?badge=0&amp;autopause=0&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen style="position:absolute;top:0;left:0;width:100%;height:100%;" title="tapr (1)"></iframe></div><script src="https://player.vimeo.com/api/player.js"></script> -->
!!!vimeo id:561708625 !!vimeo id:561708625
## Status ## Status
@ -22,7 +22,7 @@ First commercial version Q1 2022
- 100k USD for project, will probably not be separate company - 100k USD for project, will probably not be separate company
- business model: added value on top of digital twin. - business model: added value on top of digital twin.
!!!wiki.include:tsc:twin_valuation_intro !!wiki.include page:tsc:twin_valuation_intro
```charty ```charty
@ -47,4 +47,4 @@ First commercial version Q1 2022
``` ```
!!!wiki.include:tsc:twin_projects !!wiki.include page:tsc:twin_projects

View File

@ -1 +1 @@
!!!wiki.include:taskio_intro !!wiki.include page:taskio_intro

View File

@ -8,7 +8,7 @@ Engage teams, gather data - Taskio gives you back time and lets you work smarter
> see https://task.io/ > see https://task.io/
!!!youtube id:Fbttlrh7_OA !!youtube id:Fbttlrh7_OA
## Wht does Task.IO do? ## Wht does Task.IO do?
@ -44,4 +44,4 @@ Engage teams, gather data - Taskio gives you back time and lets you work smarter
![](img/taskio_.jpg) ![](img/taskio_.jpg)
!!!wiki.include:tsc:impact_toc !!wiki.include page:tsc:impact_toc

View File

@ -1 +1 @@
!!!wiki.include:thehumanizedinternet_intro !!wiki.include page:thehumanizedinternet_intro

View File

@ -1 +1 @@
!!!wiki.include:treebuddy_intro !!wiki.include page:treebuddy_intro

View File

@ -10,7 +10,7 @@ The most effective way to fight global biodiversity loss and global warming is t
- Tree caring really counts for the long-term effects. Many trees die if not taken care of. - Tree caring really counts for the long-term effects. Many trees die if not taken care of.
!!!wiki.include:treebuddy_how !!wiki.include page:treebuddy_how
> more info see: https://www.treebuddy.earth/ > more info see: https://www.treebuddy.earth/
@ -41,6 +41,6 @@ The most effective way to fight global biodiversity loss and global warming is t
``` ```
!!!wiki.include:treebuddy_why !!wiki.include page:treebuddy_why
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1 +1 @@
!!!wiki.include:ubuntu_intro !!wiki.include page:ubuntu_intro

View File

@ -1 +1 @@
!!!wiki.include:uhuru_intro !!wiki.include page:uhuru_intro

View File

@ -1 +1 @@
!!!wiki.include:unifinity_intro !!wiki.include page:unifinity_intro

View File

@ -17,4 +17,4 @@
We are talking with Unifinity how to help each other, more info soon. We are talking with Unifinity how to help each other, more info soon.
!!!wiki.include:tsc:impact_toc !!wiki.include page:tsc:impact_toc

View File

@ -1 +1 @@
!!!wiki.include:unit_intro !!wiki.include page:unit_intro

View File

@ -1 +1 @@
!!!wiki.include:vedamasters_intro !!wiki.include page:vedamasters_intro

View File

@ -39,4 +39,4 @@ Was a massive undertaking to get us so far, but the platform is incredible.
- [the boats](https://veda-egypt.com/) - [the boats](https://veda-egypt.com/)
!!!wiki.include:tsc:impact_toc !!wiki.include page:tsc:impact_toc

View File

@ -1,3 +1,3 @@
!!!wiki.include:vlinder_intro !!wiki.include page:vlinder_intro
!!!wiki.include:vlinder_potential !!wiki.include page:vlinder_potential
!!!wiki.include:vlinder_ops !!wiki.include page:vlinder_ops

View File

@ -52,4 +52,4 @@ The trading process is totally transparent: Set the price you are ready to buy o
``` ```
!!!wiki.include:tsc:carbon_toc !!wiki.include page:tsc:carbon_toc

View File

@ -1,3 +1,3 @@
!!!wiki.include:zetako_intro !!wiki.include page:zetako_intro
!!!wiki.include:zetako_potential !!wiki.include page:zetako_potential
!!!wiki.include:zetako_ops !!wiki.include page:zetako_ops

View File

Before

(image error) Size: 290 KiB

After

(image error) Size: 290 KiB

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