Commit Graph

279 Commits

Author SHA1 Message Date
7bd1e7a0d8 updated smaller collections for manual dashboard 2024-04-29 18:01:34 +00:00
30df64fcc8 updated smaller collections for manual about 2024-04-29 17:55:17 +00:00
b1e98c2051 updated smaller collections for manual 2024-04-29 17:49:02 +00:00
4806cb355b updated dashboard 2024-04-29 17:32:13 +00:00
02e107df25 updated intro collection 2024-04-29 17:12:56 +00:00
4a14ee4df1 Merge pull request 'development_projectinca' (#43) from development_projectinca into development
Reviewed-on: #43
2024-04-29 13:41:56 +00:00
Mik-TF
e5dc4e2e1a projectinca, marketplace_grant 2024-04-26 21:47:59 -04:00
Mik-TF
333df99afd typo in hero.md 2024-04-26 21:45:45 -04:00
Mik-TF
ef48ccd918 pinca, proj_info 2024-04-26 14:03:38 -04:00
Mik-TF
f82ddc1e60 pinca, proj_info 2024-04-26 13:59:19 -04:00
Mik-TF
24f85d4630 pinca, hero 2024-04-26 13:58:28 -04:00
Mik-TF
258871c5b4 pinca, storagebox 2024-04-26 13:56:08 -04:00
Mik-TF
c2e2028990 pinca, cloudbox 2024-04-26 13:54:30 -04:00
Mik-TF
cbb4210f59 pinca, aibox 2024-04-26 13:52:37 -04:00
Mik-TF
f164abb691 pinca, tfgrid4 2024-04-26 13:50:48 -04:00
Mik-TF
ff1da8448c pinca, marketplace 2024-04-26 13:49:42 -04:00
Mik-TF
62d87725f0 pinca, marketplace 2024-04-26 13:49:04 -04:00
Mik-TF
bb520ff07d pinca, 3.13-14 2024-04-26 13:45:28 -04:00
Mik-TF
aca6190879 pinca, 3.14 2024-04-26 13:44:32 -04:00
Mik-TF
749deec5a6 pinca, grants 2024-04-26 13:38:28 -04:00
Mik-TF
0e127109a1 pinca, teams 2024-04-26 13:34:53 -04:00
Mik-TF
72735301d1 pinca, remuneration 2024-04-26 13:24:12 -04:00
Mik-TF
322b286c6a pinca, collab 2024-04-26 13:21:24 -04:00
Mik-TF
763bd221b8 pinca, tft 2024-04-26 13:17:16 -04:00
Mik-TF
1f1429bacf pinca, liquidity 2024-04-26 13:11:35 -04:00
Mik-TF
065b522e48 pinca, p2pp 2024-04-26 13:08:40 -04:00
Mik-TF
3d3c0a7e41 pinca, funding.md 2024-04-26 13:06:13 -04:00
Mik-TF
6e7cd5d93d pinca, theplan_c and inca updates 2024-04-26 12:53:37 -04:00
a060e879bc projectinca intro update 2024-04-25 22:05:24 +00:00
Mik-TF
77bd4bca47 stated tft for grants 2024-04-25 14:19:14 -04:00
3e7a64289e Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-25 20:16:19 +02:00
20c1897b75 s 2024-04-25 20:16:12 +02:00
fb48d517c6 fix typo's 2024-04-25 14:17:30 +00:00
022701a480 change typo's 2024-04-25 14:06:06 +00:00
9f4bbaa625 ... 2024-04-25 12:14:09 +02:00
5e633c1df3 cloudboxes and ... 2024-04-25 11:22:51 +02:00
8b6ff82538 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts:
#	books/hero/SUMMARY.md
#	books/hero/sync_production.sh
#	books/projectinca/sync_production.sh
2024-04-24 13:45:03 +02:00
2b977a4fea s 2024-04-24 13:43:10 +02:00
7a2bb56a3b lots of fixes and add ons 2024-04-23 14:20:22 +02:00
b6889eec02 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-21 12:19:25 +02:00
8266cf4d0e ... 2024-04-21 12:19:20 +02:00
7bf22411d2 manual token_overview removed test lines 2024-04-17 17:21:44 +00:00
3d1abb5be4 manual scripts wallets 2024-04-17 17:20:17 +00:00
7dc9ed014f manual added scripts data 2024-04-16 19:52:15 +00:00
f0bcef7880 readme 2024-04-16 07:26:11 -03:00
7b58aa625e Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-16 04:46:33 -03:00
6caab6f95d manual added knowledge_base 2024-04-15 22:10:30 +00:00
b63f091e63 manual transfer done for documentation, still hero issues for parsing 2024-04-15 21:57:46 +00:00
99c05100c3 manual developers added content before proxy 2024-04-15 21:12:29 +00:00
ebee66d3cd manual developer section update 2024-04-15 20:58:40 +00:00
2c0f849383 manual added whole devs 2024-04-15 18:35:56 +00:00
3cd741971c manual added documentation in collection manual 2024-04-15 18:30:53 +00:00
c19931fd32 manual removed files 2024-04-15 17:49:09 +00:00
a567404ef3 new book manual 2024-04-15 17:42:25 +00:00
b46a6df7e0 tfmanual, renamed intro dir 2024-04-15 17:20:41 +00:00
d02b61bcd0 tfmanual, added intro with updated dir and file names 2024-04-15 17:13:21 +00:00
56c6431ead finished faq tfmanual 2024-04-15 16:58:07 +00:00
903d7d07fe updated tfmanual book_collections 2024-04-15 16:10:02 +00:00
dd7a3dc865 Update collections/tfgrid3/governance/gep_comm_brainstorm.md 2024-04-11 14:40:02 +00:00
f99ce06d89 Update collections/tfgrid3/governance/gep_comm_brainstorm.md 2024-04-11 13:33:39 +00:00
4afa2cf8e7 Update collections/tfgrid3/governance/gep_comm_brainstorm.md 2024-04-11 13:31:08 +00:00
b3eb91762f 3bot to 3Bot 2024-04-11 13:25:02 +00:00
3b7fb633e3 image edit 2024-04-11 15:21:13 +02:00
9c342d1c3b QSSS for NFT pictures updated 2024-04-11 15:13:19 +02:00
7ce269b419 changed digital twin to 3bot 2024-04-11 12:53:24 +00:00
41932e2203 Fix to governance file 2024-04-11 14:41:42 +02:00
686efecce1 Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-04-11 14:40:36 +02:00
706d5aae54 Chapters, Messaging, Promotion ... 2024-04-11 14:40:33 +02:00
fe981f6d95 updated brainstorm gep with 2 new inputs from tf members 2024-04-11 12:06:56 +00:00
12b02cc6d4 intro file table of contents fix 2024-04-11 13:39:48 +02:00
5ba19d6cc0 spelling edit 2024-04-11 13:35:34 +02:00
2557d92691 intro table of contents edit 2024-04-11 13:33:09 +02:00
883a52313e ecosystem file edits 2024-04-11 13:31:29 +02:00
c5e7b759a9 remove ecosystem from who are we file 2024-04-11 13:10:02 +02:00
b2ff6058c5 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-11 06:44:38 +02:00
03849955cb production 2024-04-11 06:44:33 +02:00
274f6a3c5c added gep brainstorm 2024-04-10 23:45:16 +00:00
52eff1e6fc updated intro and ecosystem 2024-04-10 23:13:08 +00:00
793341573b merge main_commsteam to main with fixed conflicts 2024-04-10 18:54:49 +00:00
f86e6a77c2 edits 2024-04-10 12:01:58 +02:00
a3d705ce41 edits 2024-04-10 12:01:09 +02:00
88ec04a494 new plan A 2024-04-09 23:03:11 +02:00
09966964f9 Update collections/solana/intro.md 2024-04-09 12:58:12 +00:00
ff8218425d initial cleanup hero + start of new prompt for actor 2024-04-09 14:54:14 +02:00
981fb085e0 edit 2024-04-05 15:50:51 +02:00
b2bca23456 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-04-05 07:43:20 +02:00
87b59a1da7 i 2024-04-05 07:43:18 +02:00
d9349cb736 Update collections/tech/qsss/s3_interface.md
added minio guide
2024-04-04 17:59:05 +00:00
50f7335833 updated farming 3.14 with new gep info and planning ahead 2024-04-04 13:49:47 +00:00
fdca1d32ba Delete collections/tfgrid3/governance/gep2.md
duplicate
2024-04-04 12:52:27 +00:00
d5753766d0 edit 2024-04-04 14:10:37 +02:00
73597cc2aa edit 2024-04-04 14:08:08 +02:00
da9648caf9 edit 2024-04-04 14:02:26 +02:00
4a75a928dd edit 2024-04-04 13:53:18 +02:00
bcd04c0da9 Merge branch 'main_commsteam' of https://git.ourworld.tf/tfgrid/info_tfgrid into main_commsteam 2024-04-04 12:43:19 +02:00
dcfb3c78a9 edit 2024-04-04 12:37:02 +02:00
31672087ba edit 2024-04-04 12:36:17 +02:00
e99e60574c edit 2024-04-04 12:35:51 +02:00
606884068b Merge branch 'main_commsteam' of https://git.ourworld.tf/tfgrid/info_tfgrid into main_commsteam 2024-04-04 12:29:10 +02:00
fbe0e88c6e Sam edits 2024-04-04 12:29:06 +02:00