Commit Graph

700 Commits

Author SHA1 Message Date
Mik-TF
a4efec1aa3 manual fixed URLs 2024-05-13 15:38:23 -04:00
Mik-TF
dae8755ad2 manual update links 2024-05-13 15:25:13 -04:00
Mik-TF
35a1c614bd manual, cloud sys admins collections url 2024-05-13 15:07:32 -04:00
Mik-TF
b7508480f3 manual threefokd token 2024-05-13 14:43:12 -04:00
Mik-TF
1023661baf manual farmers 2024-05-13 14:38:54 -04:00
afc8c99ac6 Merge pull request 'development to main update with manual' (#65) from development into main
Reviewed-on: #65
2024-05-13 17:18:23 +00: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
3eab2d1cc9 manual put book_collections to main 2024-05-13 13:16:34 -04: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
57bc8f088b manual test collections 2024-05-13 13:07:41 -04:00
Mik-TF
86d33176c2 manual tech fixed partners links 2024-05-13 13:03:39 -04:00
Mik-TF
33541e363f manual tech added toc 2024-05-13 12:59:49 -04:00
Mik-TF
b15b213541 manual update tech 2024-05-13 12:54:26 -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
0db4c47719 Merge pull request 'development' (#62) from development into main
Reviewed-on: #62
2024-05-13 16:41:56 +00:00
1cd428febe Merge pull request 'legal, updated grid user' (#63) from development_legal into development
Reviewed-on: #63
2024-05-13 16:41:25 +00: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
573e7fe322 Merge pull request 'development_legal' (#61) from development_legal into development
Reviewed-on: #61
2024-05-13 14:28:17 +00:00
Mik-TF
cd578be2fa legal tfgrid3 urls 2024-05-13 10:23:08 -04:00
Mik-TF
27f0ad385b legal removed tfgrid def 2024-05-13 10:20:03 -04:00
Mik-TF
3fb1175180 legal, finalizing review 2024-05-13 10:19:27 -04:00
Mik-TF
c81eb024c3 legal, test parsing 2024-05-13 10:09:24 -04:00
Mik-TF
ba1c877842 legal, test parsing 2024-05-13 10:04:07 -04:00
Mik-TF
d4a2c306d5 legal, test parsing 2024-05-13 10:03:08 -04:00
Mik-TF
37c95161b7 legal, test parsing 2024-05-13 10:00:48 -04:00
Mik-TF
348e900502 legal, set book_collections to test 2024-05-13 09:59:29 -04:00
Mik-TF
572147f785 legal added tfgrid3 threefold_grid 2024-05-13 09:57:10 -04:00
Mik-TF
5bd7aefd62 legal, fixed websites tnc headings 2024-05-13 09:52:06 -04:00
Mik-TF
0d87dea9f6 legal, fixed websites tnc 2024-05-13 09:48:02 -04:00
Mik-TF
b3862816b6 legal, update websites tnc 2024-05-13 09:44:08 -04:00
Mik-TF
0f0ad858ce dy updated intro 2024-05-11 15:03:42 -04:00
8fce6df522 Merge pull request 'development to main' (#59) from development into main
Reviewed-on: #59
2024-05-11 17:44:33 +00:00
c0469c0a48 Merge pull request 'development_dy' (#58) from development_dy into development
Reviewed-on: #58
2024-05-11 17:43:40 +00:00
Mik-TF
3bbe600c50 dy done 2024-05-11 13:42:12 -04:00
Mik-TF
d2d2b809b1 dy set urls and typos 2024-05-11 13:35:16 -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
a2af5a8038 dy updated mdbook title for booktoml 2024-05-11 12:44:11 -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
84f9a49219 Merge branch 'kristof' into development 2024-05-11 15:09:24 +03:00
05edf1b9e6 Merge pull request 'development to main update' (#57) from development into main
Reviewed-on: #57
2024-05-10 23:38:27 +00:00