Commit Graph

Select branches

Hide Pull Requests

development

development_changes

development_manual

main

main_sasha

mariobassem-update-exporter-do.hero

timur-patch-1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#113

#119

#120

#121

#122

#124

#125

#126

#127

#128

#129

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#17

#18

#19

#36

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#82

#84

#85

#86

#87

#88

#89

#9

#94

#98

#99

Mono Color

• 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
• b932fe9e8b Merge pull request 'main into dev' (#50) from main into development mik-tf 2024-05-10 10:46:12 +0000
• 7a13e32b9d ... kristof de spiegeleer 2024-05-09 22:26:57 +0300
• 948d6c0de2 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid kristof de spiegeleer 2024-05-09 17:11:35 +0300
• 2eed0b65b7 ... kristof de spiegeleer 2024-05-09 17:09:00 +0300
• ba303b6e3e legal update Mik-TF 2024-05-08 20:07:47 -0400
• b3f8ab18c2 legal update Mik-TF 2024-05-08 20:01:33 -0400
• 2b94ca20ad legal update Mik-TF 2024-05-08 19:58:14 -0400
• 4e41476b12 removed manual legal in legal Mik-TF 2024-05-08 19:57:06 -0400
• 675d67d9fe set manual legal as legal, since work is already done Mik-TF 2024-05-08 19:37:54 -0400
• 1b7b23d38c removed new_mdbook, only useful for testers to buidl with the docs Mik-TF 2024-05-08 19:33:15 -0400
• f6f0e5a283 updated test final Mik-TF 2024-05-08 19:30:47 -0400
• fc1d1eff0d updated test with .collection Mik-TF 2024-05-08 19:29:36 -0400
• ff6b4e0f10 updated test Mik-TF 2024-05-08 19:28:12 -0400
• 8dfcb96d91 updated test Mik-TF 2024-05-08 19:25:15 -0400
• 515d640188 updated test Mik-TF 2024-05-08 19:23:39 -0400
• cd381257dc updated test summ Mik-TF 2024-05-08 19:18:03 -0400
• bf28bd296b tech update core capabilities Mik-TF 2024-05-08 16:12:17 -0400
• 4691fc499f tech update zos Mik-TF 2024-05-08 16:08:23 -0400
• 49b357d4e8 tech update architecture Mik-TF 2024-05-08 16:05:24 -0400
• c29380aabd tech update network wall Mik-TF 2024-05-08 16:03:24 -0400
• 5d8478bcea tech update sumamry Mik-TF 2024-05-08 16:01:25 -0400
• 77f870df7f tech update qsss Mik-TF 2024-05-08 16:00:46 -0400
• 26eec9bfa9 tech update innovations Mik-TF 2024-05-08 15:58:00 -0400
• b54c5a0eba tech update innovations Mik-TF 2024-05-08 15:56:39 -0400
• ddf616eef3 tech update innovations Mik-TF 2024-05-08 15:55:04 -0400
• d46a3af9d0 tech update re-invented Mik-TF 2024-05-08 15:53:41 -0400
• 26432d3009 tech update intro Mik-TF 2024-05-08 15:44:22 -0400
• a26e9d592b tech update summary Mik-TF 2024-05-08 15:35:41 -0400
• f8025b3994 updated summaries to introduction not intro Mik-TF 2024-05-08 15:34:00 -0400
• ea2e27a9c2 tech update title Mik-TF 2024-05-08 15:31:00 -0400
• 74038afb0d tfgrid4 update farming Mik-TF 2024-05-08 15:04:24 -0400
• 9e7d698aee tfgrid4 update home Mik-TF 2024-05-08 14:44:42 -0400
• d72e6f53ca tfgrid4 update home Mik-TF 2024-05-08 14:43:40 -0400
• 8b72e33f4c tfgrid4 problems update Mik-TF 2024-05-08 14:18:21 -0400
• b2514cd3be tfgrid4 values update Mik-TF 2024-05-08 14:16:08 -0400
• abcbef52e7 tfgrid4 tech update Mik-TF 2024-05-08 14:12:55 -0400
• a5a70cf562 tfgrid4 economy update Mik-TF 2024-05-08 14:11:07 -0400