Commit Graph

453 Commits

Author SHA1 Message Date
Mik-TF
7be5e5046b updated vverse link 2024-05-02 14:29:13 -04:00
Mik-TF
c6b73e747f updated elestio link 2024-05-02 14:24:28 -04:00
Mik-TF
9f3f2e045e updated partners 2024-05-02 14:17:10 -04:00
Mik-TF
32f39cd7e9 updated marketplace grant 2024-05-02 14:06:16 -04:00
Mik-TF
83ecb2a5fe updated marketplace grant 2024-05-02 14:04:52 -04:00
Mik-TF
2bf81c45bc update summary 2024-05-02 13:51:33 -04:00
Mik-TF
0912eac193 update summary 2024-05-02 13:46:59 -04:00
Mik-TF
287927db75 test for zos 2024-05-02 13:26:24 -04:00
Mik-TF
a533738087 fixed zos double definition in md files 2024-05-02 13:12:39 -04:00
Mik-TF
647d7e204d fixed 2 errors 2024-05-02 12:53:30 -04:00
86f346bde7 tfgrid 2024-05-02 17:54:26 +02:00
6c1a90fc9c Merge branch 'development' into development_manual
* development:
  ...
  updated inca distribution info
  updated inca distribution info
  updated docker docs hero
  updated docker docks
  hero docker added pull step
2024-05-02 08:29:45 +02:00
a2de5dc39a Merge branch 'main' into development
* main:
  ...
2024-05-02 08:29:18 +02:00
28f366cb14 ... 2024-05-02 08:28:43 +02:00
Mik-TF
2af86d207f added parentheses for test 2024-05-01 21:39:24 -04:00
Mik-TF
2165ebdad8 updated urls 2024-04-30 14:43:39 -04:00
Mik-TF
c38e9fee6e updated urls 2024-04-30 14:29:32 -04:00
Mik-TF
db806d1be4 updated inca distribution info 2024-04-30 12:48:44 -04:00
Mik-TF
eee6081e2b updated inca distribution info 2024-04-30 12:38:12 -04:00
d5702acbe9 manual ready minus urls and some formatting from hero 2024-04-29 20:09:47 +00:00
d0eb8639d9 fixed qss links toc 2024-04-29 19:50:24 +00:00
dc29cd5a16 manual fixed includes 2024-04-29 19:16:31 +00:00
6d885ff90e manual includes 2024-04-29 18:55:47 +00:00
60b6c802ed restructured manual 2024-04-29 18:23:19 +00:00
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
3599f0ee79 edit 2024-04-04 12:20:55 +02:00
1f2c525a12 edit 2024-04-04 12:09:54 +02:00
393ae3a513 edit 2024-04-04 12:04:35 +02:00
9487eb94e8 edit 2024-04-04 11:50:52 +02:00
cd95ba6c9d edit 2024-04-04 11:49:46 +02:00
3cee144274 edit 2024-04-04 11:47:59 +02:00
38b59960a5 edit 2024-04-04 11:43:59 +02:00
300983792e edit 2024-04-04 11:39:37 +02:00
225bd32517 edit 2024-04-04 11:38:53 +02:00
e3c1848c21 edit 2024-04-04 11:37:29 +02:00
31a4aff34d edit 2024-04-04 11:35:16 +02:00
d807092768 edit 2024-04-04 11:32:26 +02:00
66dc9b7a74 edit 2024-04-04 11:30:14 +02:00
dd3a379110 edit 2024-04-04 11:28:13 +02:00
a5442b9f17 edits 2024-04-04 11:27:28 +02:00
cf7963a633 edits 2024-04-04 11:22:58 +02:00
6a94b5e45e edits 2024-04-04 11:17:44 +02:00
a1b8525362 edits 2024-04-04 11:02:55 +02:00
f9331344dc edits 2024-04-04 11:01:58 +02:00
4c48c0cb96 edits 2024-04-04 11:01:25 +02:00
b452db7d9b Revert "edit"
This reverts commit 52eeafa667.
2024-04-04 10:51:57 +02:00
4bf336df20 edits 2024-04-04 10:34:47 +02:00
586d9faa90 edits 2024-04-04 10:27:16 +02:00
6aa76be6e2 edit 2024-04-04 10:04:15 +02:00
b9a88c3c5a edits 2024-04-04 10:03:16 +02:00
e9c527f0e1 Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-04-04 09:57:07 +02:00
52eeafa667 edit 2024-04-04 09:56:41 +02:00
24777651dd test with tfchain.md in devs 2024-04-04 01:03:50 +00:00
cfaec4f635 simplified developers 2024-04-04 00:57:10 +00:00
5cbee48d14 fixed typo in html 2024-04-04 00:53:24 +00:00
b355e57023 added developers 2024-04-04 00:47:48 +00:00
848188accb tfmanual creation 2024-04-03 17:01:28 +00:00
da7d6735d7 added threefold token 2024-04-03 16:40:23 +00:00
964cd27fb0 added faq 2024-04-03 15:23:47 +00:00
8b2535c230 added dashboard 2024-04-03 15:15:08 +00:00
1c274ab986 simplified documentation 2024-04-03 15:04:35 +00:00
698f4dcdc2 added documentation with .collection 2024-04-03 15:01:17 +00:00
e87fc85500 added collection in intro 2024-04-03 14:46:37 +00:00
813149945b edits 2024-04-03 12:32:46 +02:00
9e03a2e642 edits 2024-04-03 12:31:52 +02:00
e25cbe6692 edits 2024-04-03 11:21:28 +02:00
79825ad6eb edits 2024-04-03 11:17:59 +02:00
bd939d97ae edits 2024-04-03 10:57:56 +02:00
9adaed95da edits 2024-04-03 10:53:45 +02:00
79a925bfc2 edits 2024-04-03 10:53:19 +02:00
b9f1d127b8 tfcoop 2024-04-03 10:20:50 +02:00
2a434e84cc added collection in new_mdbook 2024-04-02 18:18:08 +00:00
22219fc09e test see if works without .collection 2024-04-02 17:47:55 +00:00
70668fce32 test to remove summary in collections for new_mdbook 2024-04-02 17:42:02 +00:00
4e6dff9a9c added summary link 2024-04-02 17:30:10 +00:00
69c42bd93f added .collection 2024-04-02 17:28:28 +00:00
9d426f4b89 new mdbook 2024-04-02 17:11:12 +00:00
0670b3bde8 edits 2024-04-02 16:30:17 +02:00
c75d70cb94 edits 2024-04-02 16:26:05 +02:00
c8e489e8f9 edits 2024-04-02 16:22:06 +02:00
4f6ddca942 farming reward edits 2024-04-02 16:18:36 +02:00
962095e090 tokenomics edits 2024-04-02 16:12:45 +02:00
8982a87dc8 edits 2024-04-02 16:03:35 +02:00
sasha-astiadi
8b5a65ea96 edit typo 2024-03-27 19:18:18 +01:00
sasha-astiadi
b21535430c edit typo 2024-03-27 19:17:04 +01:00
sasha-astiadi
84c1703c54 add all files 2024-03-27 19:14:42 +01:00
sasha-astiadi
514b7646be Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-03-27 18:02:31 +01:00
sasha-astiadi
2f667f46c3 add intro 2024-03-27 18:02:30 +01:00
6549c61892 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-03-27 17:50:04 +01:00
sasha-astiadi
86c933b107 add missing files 2024-03-27 17:47:54 +01:00
sasha-astiadi
c83e36ffeb add wiki mbweni 2024-03-27 17:44:53 +01:00
938b6332cf i 2024-03-27 17:26:49 +01:00
sasha-astiadi
7d74bf3f26 add mbweni book 2024-03-27 16:20:21 +01:00
sasha-astiadi
99427e1fb9 add ff manifesto 2024-03-27 16:10:41 +01:00
957c81602a i 2024-03-26 15:09:21 +02:00
1c9c59aba7 i 2024-03-26 15:05:52 +02:00
409c04e439 added back long summry.md info_grid 2024-03-25 21:25:21 +00:00
8839082066 reorganized test hero 2024-03-25 20:25:18 +00:00
8f77b206c2 info_grid set collections 2024-03-25 13:30:54 +00:00
sasha-astiadi
fffa210854 add partners details 2024-03-22 18:01:45 +01:00
3d8c40d065 init 2024-03-22 09:55:31 +02:00
936f69227c init 2024-03-22 09:45:42 +02:00
8a13c60b22 init 2024-03-22 09:32:20 +02:00
40205412df Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-03-21 15:41:33 +02:00
de235936b7 init 2024-03-21 15:41:30 +02:00
64921dce2f Update collections/tfgrid3/promotion/chapters.md 2024-03-21 11:28:03 +00:00
783975db70 init 2024-03-21 12:16:22 +02:00
50a29b7edd init 2024-03-21 11:57:00 +02:00
b9b72beff2 init 2024-03-21 11:46:22 +02:00
a5878789b4 init 2024-03-21 11:36:08 +02:00
9fcc23499a init 2024-03-21 10:16:36 +02:00
0c4aa48623 init 2024-03-21 09:53:42 +02:00
3619f2f310 init 2024-03-20 13:42:25 +02:00
1a3d894f03 ... 2024-03-19 20:07:50 +02:00
4c46ecd693 .. 2024-03-19 08:28:25 +02:00
e12acb690e ... 2024-03-18 14:28:08 +02:00
f9674a74b9
... 2024-03-11 18:55:38 +03:00
0c957a170a
... 2024-03-10 17:05:09 +03:00
ab1fd48e6d
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts:
#	collections/def/3node.md
2024-03-10 16:37:42 +03:00
d4ed5126d6 ... 2024-03-10 13:50:14 +03:00
4a569faeea Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-03-07 16:12:58 +03:00
0967462500 ... 2024-03-07 16:12:51 +03:00
907de4d3d6
... 2024-03-01 04:48:25 +03:00
dcd88ab917
... 2024-02-29 06:22:31 +03:00
sasha-astiadi
239aeb73ac EDIT 2024-02-29 01:10:11 +03:00
sasha-astiadi
9e763343b6 EDIT : 2024-02-29 01:09:14 +03:00
e8b8794233 add missing files 2024-02-28 11:31:27 +01:00
7c3c7ef11d fix summary 2024-02-28 10:02:55 +01:00
6b7fdba1c5
... 2024-02-27 14:11:12 +03:00
59510c76cb
... 2024-02-27 07:23:38 +03:00
1671d307b4
... 2024-02-27 07:13:59 +03:00
69b183b4db
... 2024-02-27 07:11:11 +03:00
3d743fd2da
... 2024-02-23 16:07:35 +03:00
e100099146
... 2024-02-21 12:16:09 +03:00
881bc17ad3
dd 2024-02-20 14:03:57 +03:00
d2c37f5d8a
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-02-20 06:39:56 +03:00
e4aae447c7
test 2024-02-20 06:39:26 +03:00
sasha-astiadi
3eddb2bc6a test 2024-02-14 14:59:48 +03:00
sasha-astiadi
eb9aa2df90 add missing file 2024-02-13 14:32:02 +03:00
sasha-astiadi
9dee081178 move file to the right dir 2024-02-13 14:31:34 +03:00
sasha-astiadi
3439077dac add missing files / fix 2024-02-13 14:31:11 +03:00
a87aa29bd8
... 2024-02-05 12:25:58 +03:00
2524d8ab5b
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
* 'main' of git.ourworld.tf:tfgrid/info_tfgrid:
  ...
  ...
  Update collections/tech/key_innovations.md
  ...
  images
  ...
  ...
  ...
  ...
  ...
  readme
  init
  Initial commit
2024-02-05 12:11:35 +03:00
738931370b
... 2024-02-05 12:11:20 +03:00
013c6f2046
... 2024-02-05 05:52:56 +03:00
20c23548e8
Merge branch 'main' of git.ourworld.tf:threefold_coop/info_threefold_coop 2024-02-02 08:33:37 +03:00
579b7dfdcb
... 2024-02-02 08:33:34 +03:00
cde6b1d79a Update collections/tech/key_innovations.md
adjusted typo
2024-02-02 04:55:51 +00:00
b6ac3cd284
... 2024-02-02 07:46:06 +03:00
3badd59c13
images 2024-01-28 09:10:28 +03:00
5b25f47527
... 2024-01-27 08:38:38 +03:00