Commit Graph

168 Commits

Author SHA1 Message Date
Mik-TF
7a7a863734 test 2024-05-18 11:41:57 -04:00
Mik-TF
d606c9dcc6 test 2024-05-18 11:40:25 -04:00
Mik-TF
2feef00328 test 2024-05-18 10:08:53 -04:00
60cc1252fa Merge branch 'main' into development 2024-05-16 06:33:37 +03:00
72ad85278a development branch 2024-05-16 06:30:16 +03:00
Mik-TF
b0a955399f tech update summary 2024-05-14 18:49:56 -04:00
Mik-TF
b723cf3c70 manual update PRs 2024-05-14 18:05:21 -04:00
Mik-TF
599acfde7c manual, update new pr 2024-05-14 17:42:30 -04:00
Mik-TF
4228ae6e1a manual, update new pr 2024-05-14 17:06:21 -04:00
Mik-TF
cf82a6f7b9 manual, update new pr 2024-05-14 16:48:37 -04:00
Mik-TF
6be34813c1 manual, update new pr 2024-05-14 16:33:15 -04:00
Mik-TF
71bd49d905 manual, update new pr 2024-05-14 16:21:27 -04:00
Mik-TF
10104caada start integrate new pr from info_grid, starting from 62826fe798 2024-05-14 15:03:55 -04:00
Mik-TF
01707211fa manual update links 2024-05-14 13:59:05 -04:00
Mik-TF
27423c06dd manual temp fix for include, static number 2024-05-14 13:48:33 -04:00
Mik-TF
1836179a75 manual, set internal collections to filename.md template 2024-05-13 19:28:23 -04:00
1ba1e05215 Merge pull request 'development_manual' (#64) from development_manual into development
Reviewed-on: #64
2024-05-13 17:17:41 +00:00
Mik-TF
e49b1e8238 manual fix collections 2024-05-13 13:12:51 -04:00
Mik-TF
4f6152a34d manual fixed collections and holochain 2024-05-13 13:09:26 -04:00
Mik-TF
33541e363f manual tech added toc 2024-05-13 12:59:49 -04:00
Mik-TF
22af330b98 manual set tech in higher order for summary 2024-05-13 12:49:18 -04:00
Mik-TF
3d834370f1 manual set user instead of all3 2024-05-13 12:44:17 -04:00
Mik-TF
593bfdb1fb legal, updated grid user 2024-05-13 12:38:28 -04:00
Mik-TF
7c476e021e manual, updated legal and tech 2024-05-13 12:32:05 -04:00
Mik-TF
82ad9a6bf5 manual, legal 2024-05-13 12:22:12 -04:00
Mik-TF
9f4541cf20 Merge branch 'development' into development_manual
set dev_manual up with dev
2024-05-13 12:20:59 -04:00
Mik-TF
db534dcd2c dy reorganization set solutiosn with tech to avoid empty files 2024-05-11 13:29:28 -04:00
Mik-TF
67c09a80da dy, problems update 2024-05-11 13:16:16 -04:00
Mik-TF
0e52f7ce42 dy reorganized summary, added intro page from sam's blog 2024-05-11 12:42:21 -04:00
Mik-TF
875f0db884 dy fixed farming section 2024-05-11 11:20:26 -04:00
Mik-TF
38253c536c dy summary all fixed 2024-05-11 11:15:54 -04:00
Mik-TF
cb2ed3636e dy update summary 2024-05-11 11:09:55 -04:00
Mik-TF
c52ba83f80 dy, added _v4 for farming in summary 2024-05-11 11:05:14 -04:00
Mik-TF
b1040949bb earthhub, update summary 2024-05-10 18:34:23 -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
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
0e81a1a3b9 update pmycel 2024-05-10 08:34:36 -04:00
Mik-TF
7c8a1e61a7 pinca update 2024-05-10 08:21:40 -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
3ec1aac2aa update summary tft 2024-05-10 07:32:41 -04:00
Mik-TF
633be3807b update summary 2024-05-10 07:25:42 -04:00
Mik-TF
c67d5d9bee start kristof merge into dev 2024-05-10 07:20:39 -04: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
Mik-TF
b3f8ab18c2 legal update 2024-05-08 20:01:33 -04:00
Mik-TF
4e41476b12 removed manual legal in legal 2024-05-08 19:57:06 -04:00
Mik-TF
675d67d9fe set manual legal as legal, since work is already done 2024-05-08 19:37:54 -04:00