Commit Graph

Select branches

Hide Pull Requests

development

development_manual

main

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

#15

#16

#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

• dc15873c58 Merge pull request 'update info_tfgrid up to info_grid 12df' (#148) from development_update5 into development development mik-tf 2024-09-23 16:54:01 +0000
• cfa17fd00d update info_tfgrid up to info_grid 12df mik-tf 2024-09-23 12:52:46 -0400
• fc524b2b78 Merge pull request 'fixed parsing' (#147) from development_update4 into development mik-tf 2024-09-23 14:45:11 +0000
• 9993e0e13d fixed parsing mik-tf 2024-09-23 10:44:45 -0400
• 75fa508b0e Merge pull request 'fixed hero mdbook parsing' (#146) from development_update3 into development mik-tf 2024-09-23 14:42:37 +0000
• 93ceb68398 fixed hero mdbook parsing mik-tf 2024-09-23 10:41:47 -0400
• 1461fc8d33 Merge pull request 'fixed hero mdbook parsing' (#145) from development_update2 into development mik-tf 2024-09-23 14:38:52 +0000
• 32d064c080 fixed hero mdbook parsing mik-tf 2024-09-23 10:37:44 -0400
• 2f3e9e02c5 Merge pull request 'fixed typos' (#144) from development_update_manual into development mik-tf 2024-09-23 14:31:54 +0000
• b235306252 fixed typos mik-tf 2024-09-23 10:29:54 -0400
• e2368b20cd ... despiegk 2024-09-23 17:25:02 +0300
• 489a7eeee9 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development despiegk 2024-09-23 17:02:13 +0300
• 8c691b5488 ... despiegk 2024-09-23 17:02:10 +0300
• 3f7ddc572a Delete heroscript/tech/sshkey.md timur 2024-09-23 10:57:33 +0000
• c91950cde5 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development despiegk 2024-09-19 06:32:55 +0400
• ace7e68069 ... despiegk 2024-09-19 06:32:47 +0400
• cc81c96b38 ... kristof de spiegeleer 2024-09-19 06:06:43 +0400
• cb2fbb26bf ... kristof de spiegeleer 2024-09-18 07:40:11 +0300
• 244d0a4aa4 export for mdbook root 2024-09-09 10:04:34 +0200
• d84487b79d s kristof de spiegeleer 2024-09-09 07:19:25 +0200
• a961c63f16 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development kristof de spiegeleer 2024-09-01 06:10:24 +0200
• 6a35f7eb85 s kristof de spiegeleer 2024-09-01 06:10:23 +0200
• 1540effde3 Merge pull request 'fixed' (#142) from development_fix_quick into development mik-tf 2024-08-29 23:29:11 +0000
• ea27326ae4 fixed mik-tf 2024-08-29 19:28:46 -0400
• e16b01f7d4 Merge pull request 'finalized info_fgrid sync' (#141) from development_final_sync into development mik-tf 2024-08-29 23:23:44 +0000
• 0c33119601 finalized info_fgrid sync mik-tf 2024-08-29 19:22:26 -0400
• a75e59d42c Merge pull request 'updated sync with info_grid' (#140) from development_update_new into development mik-tf 2024-08-29 22:15:43 +0000
• 4b44fa1664 updated sync with info_grid mik-tf 2024-08-29 18:15:05 -0400
• ca9288af82 Merge pull request 'troubleshootinfg farming' (#139) from development_trouble into development mik-tf 2024-08-29 21:24:42 +0000
• 350531c668 troubleshootinfg farming mik-tf 2024-08-29 17:23:40 -0400
• 544dacad02 Merge pull request 'development_update' (#138) from development_update into development mik-tf 2024-08-29 20:46:21 +0000
• 7567164929 update mik-tf 2024-08-29 16:45:52 -0400
• b7e3f2b323 updated faq, tft mik-tf 2024-08-29 16:43:43 -0400
• ec47399867 Merge pull request 'development_update_from_0133' (#137) from development_update_from_0133 into development mik-tf 2024-08-29 20:14:58 +0000
• 516c036a46 updated 0133 mik-tf 2024-08-29 16:14:09 -0400
• 811493e9b0 updated 0133 mik-tf 2024-08-29 16:10:38 -0400
• 372ba64e4e Update collections/projectinca/stories/stories.md despiegk 2024-08-29 20:00:51 +0000
• 260fcfeb16 collection update root 2024-08-29 19:50:49 +0000
• 9b2cda9e8e update despiegk 2024-08-26 11:14:18 +0200
• 972d0e48a9 Merge pull request 'decentralization update project inca' (#136) from development_dec2 into development mik-tf 2024-08-20 15:49:55 +0000
• 2fe3773aac decentralization update project inca Mik-TF 2024-08-20 11:49:01 -0400
• 79bec3ec39 Merge pull request 'decentralization update project inca' (#135) from development_dec into development mik-tf 2024-08-20 15:45:40 +0000
• a8be8ff612 decentralization update project inca Mik-TF 2024-08-20 11:45:03 -0400
• b7f845a4cf Merge pull request 'updated liquidity' (#134) from development_liquidity into development mik-tf 2024-08-20 14:50:04 +0000
• ffbe65714a updated liquidity Mik-TF 2024-08-20 10:49:25 -0400
• 1f743cd15f Merge pull request 'updated intro and tokenomics for projectinca' (#133) from development_new into development mik-tf 2024-08-19 22:11:30 +0000
• 5de7e3180d updated intro and tokenomics for projectinca Mik-TF 2024-08-19 18:06:22 -0400
• b5d155d00b Merge pull request 'updated intro first part of project inca' (#132) from development_update_intro into development mik-tf 2024-08-19 20:31:15 +0000
• 2c1e878d9c updated intro first part of project inca Mik-TF 2024-08-19 16:29:07 -0400
• 17efd5f8e1 Merge pull request 'added info for first page projectinca' (#131) from development_update2 into development mik-tf 2024-08-19 19:38:39 +0000
• ec07a2d4d3 Merge branch 'development' into development_update2 merge dev Mik-TF 2024-08-19 15:37:21 -0400
• 3c0082a005 ... despiegk 2024-08-17 13:22:25 +0200
• 416d03381e added info for first page projectinca Mik-TF 2024-08-16 12:18:43 -0400
• d93f748bfb s kristof de spiegeleer 2024-08-16 14:04:37 +0200
• 564345e26b s kristof de spiegeleer 2024-08-16 01:40:17 +0200
• da14091106 s kristof de spiegeleer 2024-08-06 17:33:59 +0200
• 6e1f478ce5 :wq Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development root 2024-08-01 18:45:50 +0200
• 0f08c2ec63 ... root 2024-08-01 18:45:49 +0200
• c57b71cd76 Update collections/dy_intro/dunia_yetu/dunia_yetu.md timur 2024-08-01 15:17:04 +0000
• dc244fbe55 Update collections/dy_intro/dunia_yetu/dunia_yetu.md timur 2024-08-01 14:58:29 +0000
• 17f8ce0de0 Update collections/dy_intro/dunia_yetu/dunia_yetu.md timur-patch-1 timur 2024-08-01 14:57:26 +0000
• 393985d305 ... root 2024-07-29 10:27:54 +0200
• 86827c23db Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development despiegk 2024-07-29 10:05:56 +0200
• 23cb055f8c Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid despiegk 2024-07-28 10:35:17 +0200
• 11fcf9e804 s kristof de spiegeleer 2024-07-28 08:41:44 +0200
• b0a6115e80 Merge pull request 'development to main' (#129) from development into main main mik-tf 2024-07-15 17:49:56 +0000
• 77094a835b Merge pull request 'removed docs_inca, transferred to new repo' (#128) from development_remove_docs_inca into development mik-tf 2024-07-15 17:49:36 +0000
• c431559405 removed docs_inca, transferred to new repo Mik-TF 2024-07-15 13:48:41 -0400
• c9e75c21dc Merge pull request 'development to main' (#127) from development into main mik-tf 2024-07-14 01:37:30 +0000
• 4ed8102c8a Merge pull request 'finished files for tfgrid4specs' (#126) from development_gridspecs into development mik-tf 2024-07-14 01:37:11 +0000
• a461008dad finished files for tfgrid4specs Mik-TF 2024-07-13 21:36:42 -0400
• 9f827d4f58 Merge pull request 'development to main' (#125) from development into main mik-tf 2024-07-11 21:12:37 +0000
• ef67af4fac Merge pull request 'development_devs' (#124) from development_devs into development mik-tf 2024-07-11 21:12:21 +0000
• 91b6167939 simplified intro devs Mik-TF 2024-07-11 17:09:31 -0400
• c51eaf37bd updated devs Mik-TF 2024-07-11 17:05:06 -0400
• 06039ac195 Merge pull request 'development to main periodic update' (#122) from development into main mik-tf 2024-07-11 01:45:09 +0000
• e2c9ea50dc Merge pull request 'development_sysadmins' (#121) from development_sysadmins into development mik-tf 2024-07-11 01:44:21 +0000
• c251345ab8 adjusted summary for sysadmins simplified intro Mik-TF 2024-07-10 21:40:04 -0400
• eac66ad597 adjusted summary for sysadmins Mik-TF 2024-07-10 21:33:14 -0400
• 97c0de6552 adjusted summary for sysadmins Mik-TF 2024-07-10 21:30:25 -0400
• 4c874c20ac simplified sysadmins Mik-TF 2024-07-10 21:27:07 -0400
• 9a7d968268 Merge branch 'development' despiegk 2024-07-08 06:20:24 +0200
• 253724e273 tokens despiegk 2024-07-08 06:19:57 +0200
• ba5cc1b4a9 Merge branch 'development' despiegk 2024-07-07 10:37:35 +0200
• 97854b5b8f Merge pull request 'Update docs_projectinca/README.md' (#119) from development_quick_fix into development mik-tf 2024-07-03 18:57:42 +0000
• cea7cf6923 Update docs_projectinca/README.md mik-tf 2024-07-03 18:57:24 +0000
• 4dd76f9aa8 Merge pull request 'development_whitepaper_test' (#113) from development_whitepaper_test into development mik-tf 2024-06-26 21:48:46 +0000
• c26db1ec2a updated whitepaper Mik-TF 2024-06-26 17:47:30 -0400
• 7fc51584aa set whitepaper as test Mik-TF 2024-06-26 14:41:36 -0400
• c8dce7228e s kristof de spiegeleer 2024-06-25 10:11:58 +0400
• 20c57e433a s kristof de spiegeleer 2024-06-23 22:21:37 +0400
• d9781aaff2 s kristof de spiegeleer 2024-06-23 22:17:49 +0400
• 7d970ac415 Merge pull request 'development to main' (#110) from development into main mik-tf 2024-06-20 13:52:31 +0000
• 3c9092d5bb Merge pull request 'updated crisp for tf not inca' (#111) from development_crisp_threefold into development mik-tf 2024-06-20 13:52:17 +0000
• 1a606eb6c2 updated crisp for tf not inca Mik-TF 2024-06-20 09:51:35 -0400
• 83dc8528f0 Merge pull request 'added legal' (#109) from development_docs into development mik-tf 2024-06-19 18:49:58 +0000
• d966c7326b added legal Mik-TF 2024-06-19 14:46:23 -0400
• e4eaa9dfdd Merge pull request 'development to main periodic update' (#108) from development into main mik-tf 2024-06-19 17:27:32 +0000
• c57a25bbfd Merge pull request 'added crisp access' (#107) from development_crisp_icon into development mik-tf 2024-06-19 17:13:00 +0000
• eff9e7444a added crisp access Mik-TF 2024-06-19 13:12:16 -0400