Commit Graph

684 Commits

Author SHA1 Message Date
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
17abdf5835 Merge pull request 'Update README.md' (#56) from development_readme into development
Reviewed-on: #56
2024-05-10 23:37:55 +00:00
451c220090 Update README.md
added info for readme docker
2024-05-10 23:37:44 +00:00
4b6aba32ed Merge pull request 'development' (#55) from development into main
Reviewed-on: #55
2024-05-10 23:35:12 +00:00
8e18562132 Merge pull request 'development_mdbooks' (#54) from development_mdbooks into development
Reviewed-on: #54
2024-05-10 23:33:04 +00:00
Mik-TF
01d785a509 links can be broken on first page, removed for the book 2024-05-10 19:31:48 -04:00
Mik-TF
a75a1f89bd fixed book_collections branch 2024-05-10 19:30:05 -04:00
f7bf860fa7 Merge pull request 'fixed/revised mdbooks in repo' (#53) from development_mdbooks into development
Reviewed-on: #53
2024-05-10 23:26:14 +00:00
Mik-TF
01bfbd4e77 earthhub fixed logo pictures 2024-05-10 19:23:21 -04:00
Mik-TF
72d4dcb4b0 earthhub finalized revision 2024-05-10 19:18:41 -04:00
Mik-TF
2bf60d88cb earthhub, intro, faq, roadmap 2024-05-10 18:57:37 -04:00
Mik-TF
b1040949bb earthhub, update summary 2024-05-10 18:34:23 -04:00
Mik-TF
2f0a9dce4e mbweni ready for production 2024-05-10 11:39:48 -04:00
Mik-TF
7dac019228 mbweni fix urls, add facilities info, was wrong with activities 2024-05-10 11:32:31 -04:00
Mik-TF
4b8bdd68eb mbweni set urls 2024-05-10 11:23:05 -04:00
Mik-TF
75a73e2bc9 mbweni set collection:filename.md for url 2024-05-10 11:22:04 -04:00
Mik-TF
e317a715d9 mbweni set collection:filename.md for url 2024-05-10 11:21:03 -04:00