Commit Graph

  • a11893fcf0 Merge pull request 'manual, set internal collections to filename.md template' (#66) from development_manual2 into development_manual mik-tf 2024-05-13 23:32:25 +0000
  • 1836179a75 manual, set internal collections to filename.md template Mik-TF 2024-05-13 19:28:23 -0400
  • 280652166f manual set urls for external collection Mik-TF 2024-05-13 19:10:10 -0400
  • a4efec1aa3 manual fixed URLs Mik-TF 2024-05-13 15:38:23 -0400
  • dae8755ad2 manual update links Mik-TF 2024-05-13 15:25:13 -0400
  • 35a1c614bd manual, cloud sys admins collections url Mik-TF 2024-05-13 15:07:32 -0400
  • b7508480f3 manual threefokd token Mik-TF 2024-05-13 14:43:12 -0400
  • 1023661baf manual farmers Mik-TF 2024-05-13 14:38:54 -0400
  • afc8c99ac6 Merge pull request 'development to main update with manual' (#65) from development into main mik-tf 2024-05-13 17:18:23 +0000
  • 1ba1e05215 Merge pull request 'development_manual' (#64) from development_manual into development mik-tf 2024-05-13 17:17:41 +0000
  • 3eab2d1cc9 manual put book_collections to main Mik-TF 2024-05-13 13:16:34 -0400
  • e49b1e8238 manual fix collections Mik-TF 2024-05-13 13:12:51 -0400
  • 4f6152a34d manual fixed collections and holochain Mik-TF 2024-05-13 13:09:26 -0400
  • 57bc8f088b manual test collections Mik-TF 2024-05-13 13:07:41 -0400
  • 86d33176c2 manual tech fixed partners links Mik-TF 2024-05-13 13:03:39 -0400
  • 33541e363f manual tech added toc Mik-TF 2024-05-13 12:59:49 -0400
  • b15b213541 manual update tech Mik-TF 2024-05-13 12:54:26 -0400
  • 22af330b98 manual set tech in higher order for summary Mik-TF 2024-05-13 12:49:18 -0400
  • 3d834370f1 manual set user instead of all3 Mik-TF 2024-05-13 12:44:17 -0400
  • 0db4c47719 Merge pull request 'development' (#62) from development into main mik-tf 2024-05-13 16:41:56 +0000
  • 1cd428febe Merge pull request 'legal, updated grid user' (#63) from development_legal into development mik-tf 2024-05-13 16:41:25 +0000
  • 593bfdb1fb legal, updated grid user Mik-TF 2024-05-13 12:38:28 -0400
  • 7c476e021e manual, updated legal and tech Mik-TF 2024-05-13 12:32:05 -0400
  • 82ad9a6bf5 manual, legal Mik-TF 2024-05-13 12:22:12 -0400
  • 9f4541cf20 Merge branch 'development' into development_manual set dev_manual up with dev Mik-TF 2024-05-13 12:20:59 -0400
  • 573e7fe322 Merge pull request 'development_legal' (#61) from development_legal into development mik-tf 2024-05-13 14:28:17 +0000
  • cd578be2fa legal tfgrid3 urls Mik-TF 2024-05-13 10:23:08 -0400
  • 27f0ad385b legal removed tfgrid def Mik-TF 2024-05-13 10:20:03 -0400
  • 3fb1175180 legal, finalizing review Mik-TF 2024-05-13 10:19:27 -0400
  • c81eb024c3 legal, test parsing Mik-TF 2024-05-13 10:09:24 -0400
  • ba1c877842 legal, test parsing Mik-TF 2024-05-13 10:04:07 -0400
  • d4a2c306d5 legal, test parsing Mik-TF 2024-05-13 10:03:08 -0400
  • 37c95161b7 legal, test parsing Mik-TF 2024-05-13 10:00:48 -0400
  • 348e900502 legal, set book_collections to test Mik-TF 2024-05-13 09:59:29 -0400
  • 572147f785 legal added tfgrid3 threefold_grid Mik-TF 2024-05-13 09:57:10 -0400
  • 5bd7aefd62 legal, fixed websites tnc headings Mik-TF 2024-05-13 09:52:06 -0400
  • 0d87dea9f6 legal, fixed websites tnc Mik-TF 2024-05-13 09:48:02 -0400
  • b3862816b6 legal, update websites tnc Mik-TF 2024-05-13 09:44:08 -0400
  • 0f0ad858ce dy updated intro Mik-TF 2024-05-11 15:03:42 -0400
  • 8fce6df522 Merge pull request 'development to main' (#59) from development into main mik-tf 2024-05-11 17:44:33 +0000
  • c0469c0a48 Merge pull request 'development_dy' (#58) from development_dy into development mik-tf 2024-05-11 17:43:40 +0000
  • 3bbe600c50 dy done Mik-TF 2024-05-11 13:42:12 -0400
  • d2d2b809b1 dy set urls and typos Mik-TF 2024-05-11 13:35:16 -0400
  • db534dcd2c dy reorganization set solutiosn with tech to avoid empty files Mik-TF 2024-05-11 13:29:28 -0400
  • 67c09a80da dy, problems update Mik-TF 2024-05-11 13:16:16 -0400
  • a2af5a8038 dy updated mdbook title for booktoml Mik-TF 2024-05-11 12:44:11 -0400
  • 0e52f7ce42 dy reorganized summary, added intro page from sam's blog Mik-TF 2024-05-11 12:42:21 -0400
  • 875f0db884 dy fixed farming section Mik-TF 2024-05-11 11:20:26 -0400
  • 38253c536c dy summary all fixed Mik-TF 2024-05-11 11:15:54 -0400
  • cb2ed3636e dy update summary Mik-TF 2024-05-11 11:09:55 -0400
  • c52ba83f80 dy, added _v4 for farming in summary Mik-TF 2024-05-11 11:05:14 -0400
  • 84f9a49219 Merge branch 'kristof' into development kristof de spiegeleer 2024-05-11 15:09:24 +0300
  • 05edf1b9e6 Merge pull request 'development to main update' (#57) from development into main mik-tf 2024-05-10 23:38:27 +0000
  • 17abdf5835 Merge pull request 'Update README.md' (#56) from development_readme into development mik-tf 2024-05-10 23:37:55 +0000
  • 451c220090 Update README.md mik-tf 2024-05-10 23:37:44 +0000
  • 4b6aba32ed Merge pull request 'development' (#55) from development into main mik-tf 2024-05-10 23:35:12 +0000
  • 8e18562132 Merge pull request 'development_mdbooks' (#54) from development_mdbooks into development mik-tf 2024-05-10 23:33:04 +0000
  • 01d785a509 links can be broken on first page, removed for the book Mik-TF 2024-05-10 19:31:48 -0400
  • a75a1f89bd fixed book_collections branch Mik-TF 2024-05-10 19:30:05 -0400
  • f7bf860fa7 Merge pull request 'fixed/revised mdbooks in repo' (#53) from development_mdbooks into development mik-tf 2024-05-10 23:26:14 +0000
  • 01bfbd4e77 earthhub fixed logo pictures Mik-TF 2024-05-10 19:23:21 -0400
  • 72d4dcb4b0 earthhub finalized revision Mik-TF 2024-05-10 19:18:41 -0400
  • 2bf60d88cb earthhub, intro, faq, roadmap Mik-TF 2024-05-10 18:57:37 -0400
  • b1040949bb earthhub, update summary Mik-TF 2024-05-10 18:34:23 -0400
  • 2f0a9dce4e mbweni ready for production Mik-TF 2024-05-10 11:39:48 -0400
  • 7dac019228 mbweni fix urls, add facilities info, was wrong with activities Mik-TF 2024-05-10 11:32:31 -0400
  • 4b8bdd68eb mbweni set urls Mik-TF 2024-05-10 11:23:05 -0400
  • 75a73e2bc9 mbweni set collection:filename.md for url Mik-TF 2024-05-10 11:22:04 -0400
  • e317a715d9 mbweni set collection:filename.md for url Mik-TF 2024-05-10 11:21:03 -0400
  • 98c9048416 mbweni, added image for intro page Mik-TF 2024-05-10 11:18:23 -0400
  • 470713a8ba mbweni, updated contact_info Mik-TF 2024-05-10 11:14:26 -0400
  • 570ec9d205 mbweni, set contact as file with include to facilitate when clib hero is fixed for mailto Mik-TF 2024-05-10 11:12:34 -0400
  • f5e8099862 set mbweni set emails Mik-TF 2024-05-10 11:05:48 -0400
  • 694c394c2d set mbweni remove emails Mik-TF 2024-05-10 11:01:28 -0400
  • 63c9d364d8 set mbweni test email url removed Mik-TF 2024-05-10 10:54:12 -0400
  • 11650d13d1 set mbweni to test on non main branch Mik-TF 2024-05-10 10:52:14 -0400
  • 593738cc52 mbweni update, sports in activities Mik-TF 2024-05-10 10:46:57 -0400
  • 4af97fd801 Merge pull request 'development to main merge' (#52) from development into main mik-tf 2024-05-10 13:24:59 +0000
  • d69865804c Merge pull request 'development_kristof_merge' (#51) from development_kristof_merge into development mik-tf 2024-05-10 13:24:04 +0000
  • a72febb4b7 pinca, set main for book_collection Mik-TF 2024-05-10 09:22:56 -0400
  • cf88ba6198 pmycel, added governance intro Mik-TF 2024-05-10 09:21:26 -0400
  • 3161118c28 pmycel, added info on layers Mik-TF 2024-05-10 09:19:38 -0400
  • 4051544346 pmycel, added info on layers Mik-TF 2024-05-10 09:18:23 -0400
  • d1a5f3277e update pmycel hero farming Mik-TF 2024-05-10 08:56:18 -0400
  • 079af46c82 update pmycel hero token and key Mik-TF 2024-05-10 08:47:03 -0400
  • e18964b149 update pmycel presentation Mik-TF 2024-05-10 08:38:12 -0400
  • 0e81a1a3b9 update pmycel Mik-TF 2024-05-10 08:34:36 -0400
  • 564f8558a1 update pmycel Mik-TF 2024-05-10 08:27:55 -0400
  • 7c8a1e61a7 pinca update Mik-TF 2024-05-10 08:21:40 -0400
  • e5d8be13b0 updated pinca Mik-TF 2024-05-10 08:13:09 -0400
  • 3aa8652dc8 moved blocks from engineering to marketplace Mik-TF 2024-05-10 07:58:03 -0400
  • 3332b2151e put voting process in separate page Mik-TF 2024-05-10 07:48:26 -0400
  • 119281c414 updated files grants, tokenomics Mik-TF 2024-05-10 07:44:40 -0400
  • 6a702ece89 updated funding Mik-TF 2024-05-10 07:38:16 -0400
  • 694ddded8d update tft.md Mik-TF 2024-05-10 07:35:58 -0400
  • 3ec1aac2aa update summary tft Mik-TF 2024-05-10 07:32:41 -0400
  • 77db527a94 update inca.md Mik-TF 2024-05-10 07:30:55 -0400
  • 633be3807b update summary Mik-TF 2024-05-10 07:25:42 -0400
  • 1359609419 set hero book to check new branch Mik-TF 2024-05-10 07:24:11 -0400
  • c67d5d9bee start kristof merge into dev Mik-TF 2024-05-10 07:20:39 -0400