Commit Graph

847 Commits

Author SHA1 Message Date
17efd5f8e1 Merge pull request 'added info for first page projectinca' (#131) from development_update2 into development
Reviewed-on: #131
2024-08-19 19:38:39 +00:00
Mik-TF
ec07a2d4d3 Merge branch 'development' into development_update2
merge dev
2024-08-19 15:37:21 -04:00
3c0082a005 ... 2024-08-17 13:22:25 +02:00
Mik-TF
416d03381e added info for first page projectinca 2024-08-16 12:18:43 -04:00
d93f748bfb s 2024-08-16 14:04:37 +02:00
564345e26b s 2024-08-16 01:40:17 +02:00
da14091106 s 2024-08-06 17:33:59 +02:00
6e1f478ce5 :wq
Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
2024-08-01 18:45:50 +02:00
0f08c2ec63 ... 2024-08-01 18:45:49 +02:00
c57b71cd76 Update collections/dy_intro/dunia_yetu/dunia_yetu.md 2024-08-01 15:17:04 +00:00
dc244fbe55 Update collections/dy_intro/dunia_yetu/dunia_yetu.md 2024-08-01 14:58:29 +00:00
393985d305 ... 2024-07-29 10:27:54 +02:00
86827c23db Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
* 'development' of git.ourworld.tf:tfgrid/info_tfgrid:
  s
2024-07-29 10:05:56 +02:00
23cb055f8c Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-07-28 10:35:17 +02:00
11fcf9e804 s 2024-07-28 08:41:44 +02:00
b0a6115e80 Merge pull request 'development to main' (#129) from development into main
Reviewed-on: #129
2024-07-15 17:49:56 +00:00
77094a835b Merge pull request 'removed docs_inca, transferred to new repo' (#128) from development_remove_docs_inca into development
Reviewed-on: #128
2024-07-15 17:49:36 +00:00
Mik-TF
c431559405 removed docs_inca, transferred to new repo 2024-07-15 13:48:41 -04:00
c9e75c21dc Merge pull request 'development to main' (#127) from development into main
Reviewed-on: #127
2024-07-14 01:37:30 +00:00
4ed8102c8a Merge pull request 'finished files for tfgrid4specs' (#126) from development_gridspecs into development
Reviewed-on: #126
2024-07-14 01:37:11 +00:00
Mik-TF
a461008dad finished files for tfgrid4specs 2024-07-13 21:36:42 -04:00
9f827d4f58 Merge pull request 'development to main' (#125) from development into main
Reviewed-on: #125
2024-07-11 21:12:37 +00:00
ef67af4fac Merge pull request 'development_devs' (#124) from development_devs into development
Reviewed-on: #124
2024-07-11 21:12:21 +00:00
Mik-TF
91b6167939 simplified intro devs 2024-07-11 17:09:31 -04:00
Mik-TF
c51eaf37bd updated devs 2024-07-11 17:05:06 -04:00
06039ac195 Merge pull request 'development to main periodic update' (#122) from development into main
Reviewed-on: #122
2024-07-11 01:45:09 +00:00
e2c9ea50dc Merge pull request 'development_sysadmins' (#121) from development_sysadmins into development
Reviewed-on: #121
2024-07-11 01:44:21 +00:00
Mik-TF
c251345ab8 adjusted summary for sysadmins simplified intro 2024-07-10 21:40:04 -04:00
Mik-TF
eac66ad597 adjusted summary for sysadmins 2024-07-10 21:33:14 -04:00
Mik-TF
97c0de6552 adjusted summary for sysadmins 2024-07-10 21:30:25 -04:00
Mik-TF
4c874c20ac simplified sysadmins 2024-07-10 21:27:07 -04:00
9a7d968268 Merge branch 'development'
* development:
  tokens
2024-07-08 06:20:24 +02:00
253724e273 tokens 2024-07-08 06:19:57 +02:00
ba5cc1b4a9 Merge branch 'development'
* development:
  Update docs_projectinca/README.md
  updated whitepaper
  set whitepaper as test
  s
  s
  s
2024-07-07 10:37:35 +02:00
97854b5b8f Merge pull request 'Update docs_projectinca/README.md' (#119) from development_quick_fix into development
Reviewed-on: #119
2024-07-03 18:57:42 +00:00
cea7cf6923 Update docs_projectinca/README.md 2024-07-03 18:57:24 +00:00
4dd76f9aa8 Merge pull request 'development_whitepaper_test' (#113) from development_whitepaper_test into development
Reviewed-on: #113
2024-06-26 21:48:46 +00:00
Mik-TF
c26db1ec2a updated whitepaper 2024-06-26 17:47:30 -04:00
Mik-TF
7fc51584aa set whitepaper as test 2024-06-26 14:41:36 -04:00
c8dce7228e s 2024-06-25 10:11:58 +04:00
20c57e433a s 2024-06-23 22:21:37 +04:00
d9781aaff2 s 2024-06-23 22:17:49 +04:00
7d970ac415 Merge pull request 'development to main' (#110) from development into main
Reviewed-on: #110
2024-06-20 13:52:31 +00:00
3c9092d5bb Merge pull request 'updated crisp for tf not inca' (#111) from development_crisp_threefold into development
Reviewed-on: #111
2024-06-20 13:52:17 +00:00
Mik-TF
1a606eb6c2 updated crisp for tf not inca 2024-06-20 09:51:35 -04:00
83dc8528f0 Merge pull request 'added legal' (#109) from development_docs into development
Reviewed-on: #109
2024-06-19 18:49:58 +00:00
Mik-TF
d966c7326b added legal 2024-06-19 14:46:23 -04:00
e4eaa9dfdd Merge pull request 'development to main periodic update' (#108) from development into main
Reviewed-on: #108
2024-06-19 17:27:32 +00:00
c57a25bbfd Merge pull request 'added crisp access' (#107) from development_crisp_icon into development
Reviewed-on: #107
2024-06-19 17:13:00 +00:00
Mik-TF
eff9e7444a added crisp access 2024-06-19 13:12:16 -04:00