Commit Graph

698 Commits

Author SHA1 Message Date
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