grassrootseconomics/cic-docs
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
389 Commits 12 Branches 0 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
willruddick aa517a011f Merge branch 'willruddick-master-patch-44374' into 'master' 
license

See merge request grassrootseconomics/cic-docs!113
 2021-10-21 09:18:57 +00:00
willruddick 54fcd8a453 license 2021-10-21 09:17:49 +00:00
willruddick 14eee2a7e0 Merge branch 'willruddick-master-patch-05822' into 'master' 
updated with link to CIC-Commons

See merge request grassrootseconomics/cic-docs!112
 2021-10-17 08:27:27 +00:00
willruddick 945440c1e5 updated with link to CIC-Commons 2021-10-17 08:27:16 +00:00
willruddick 7db0f57838 Merge branch 'willruddick-master-patch-34440' into 'master' 
Initial draft - based on older voucher creation agreement and the work of Chris Cook

See merge request grassrootseconomics/cic-docs!111
 2021-10-17 08:00:02 +00:00
willruddick a2d867b3e7 Initial draft - based on older voucher creation agreement and the work of Chris Cook 2021-10-17 07:59:47 +00:00
willruddick 5c4d3cce78 Merge branch 'willruddick-master-patch-37564' into 'master' 
Technology and USSD menus

See merge request grassrootseconomics/cic-docs!110
 2021-10-08 13:07:49 +00:00
willruddick d46fb42da8 Technology and USSD menus 2021-10-08 13:06:12 +00:00
willruddick 2203b206fa Merge branch 'willruddick-master-patch-20892' into 'master' 
Replace CIC_Training_Guide_Kenya.pdf

See merge request grassrootseconomics/cic-docs!109
 2021-10-08 12:41:29 +00:00
willruddick 8a20033863 Replace CIC_Training_Guide_Kenya.pdf 2021-10-08 12:40:40 +00:00
willruddick 86324a0f5d Merge branch 'willruddick-master-patch-50225' into 'master' 
typ

See merge request grassrootseconomics/cic-docs!108
 2021-10-04 09:46:25 +00:00
willruddick 24663bd6ae typ 2021-10-04 09:46:08 +00:00
willruddick 219ddcb84a Merge branch 'willruddick-master-patch-11568' into 'master' 
Replace Tokenized-Voucher-Investments-WhitePaper.pdf

See merge request grassrootseconomics/cic-docs!106
 2021-09-29 19:20:37 +00:00
willruddick 9ecf7a07e2 Replace Tokenized-Voucher-Investments-WhitePaper.pdf 2021-09-29 19:20:21 +00:00
willruddick 1a98d1c814 Merge branch 'willruddick-master-patch-57582' into 'master' 
Replace Tokenized-Voucher-Investments-WhitePaper.pdf

See merge request grassrootseconomics/cic-docs!105
 2021-09-27 10:03:08 +00:00
willruddick 0c04d017a1 Replace Tokenized-Voucher-Investments-WhitePaper.pdf 2021-09-27 10:02:55 +00:00
willruddick 9c8ed40a5a Merge branch 'willruddick-master-patch-43574' into 'master' 
Initial Draft

See merge request grassrootseconomics/cic-docs!103
 2021-09-26 13:53:24 +00:00
willruddick 18b9029a7a Initial Draft 2021-09-26 13:53:11 +00:00
willruddick 71614eedfb Merge branch 'willruddick-master-patch-37248' into 'master' 
overview

See merge request grassrootseconomics/cic-docs!102
 2021-09-16 09:30:23 +00:00
willruddick 9bf6aa0a03 overview 2021-09-16 09:30:07 +00:00
willruddick 6c5f78908d Merge branch 'willruddick-master-patch-24058' into 'master' 
trim notes

See merge request grassrootseconomics/cic-docs!101
 2021-09-13 14:10:59 +00:00
willruddick 8ee4e958ac trim notes 2021-09-13 14:10:39 +00:00
willruddick 1b3a5d6f1d Merge branch 'willruddick-master-patch-74026' into 'master' 
added section on Ostrom

See merge request grassrootseconomics/cic-docs!100
 2021-09-13 14:08:22 +00:00
willruddick 981e514323 added section on Ostrom 2021-09-13 14:08:01 +00:00
willruddick 4a50d70da0 Merge branch 'patch-1' into 'master' 
Update 018_Mgmt Platform Spec.md

See merge request grassrootseconomics/cic-docs!17
 2021-09-13 13:37:26 +00:00
willruddick c9c7a1835d Merge branch 'master' into 'patch-1' 
# Conflicts:
#   spec/018_Mgmt Platform Spec.md
 2021-09-13 13:37:09 +00:00
willruddick 80f8b29163 Merge branch 'patch-2' into 'master' 
identifying MVP needs

See merge request grassrootseconomics/cic-docs!25
 2021-09-13 13:36:22 +00:00
willruddick 05e37c6e1c Merge branch 'willruddick-master-patch-67566' into 'master' 
Delete CIC_Support_Guide.pdf

See merge request grassrootseconomics/cic-docs!70
 2021-09-13 13:34:03 +00:00
willruddick 89e87cdace Merge branch 'willruddick-master-patch-29682' into 'master' 
update charter link

See merge request grassrootseconomics/cic-docs!99
 2021-09-13 13:33:29 +00:00
willruddick 34c3575d9c Update README.md 2021-09-13 13:32:44 +00:00
willruddick 24b0e50c66 Merge branch 'willruddick-master-patch-36089' into 'master' 
updated

See merge request grassrootseconomics/cic-docs!98
 2021-09-13 13:31:39 +00:00
willruddick 5c09df18b5 updated 2021-09-13 12:47:28 +00:00
willruddick 09180e1882 Merge branch 'willruddick-master-patch-72015' into 'master' 
Delete CIC_User_Support_Guide_Kenya.pdf

See merge request grassrootseconomics/cic-docs!97
 2021-09-13 09:08:16 +00:00
willruddick e38e4c2028 Delete CIC_User_Support_Guide_Kenya.pdf 2021-09-13 09:08:05 +00:00
willruddick 5403dd5ce9 Merge branch 'willruddick-master-patch-98391' into 'master' 
Delete CIC_Support_Guide.pdf

See merge request grassrootseconomics/cic-docs!96
 2021-09-13 09:06:58 +00:00
willruddick 42a648c4fa Delete CIC_Support_Guide.pdf 2021-09-13 09:06:45 +00:00
willruddick 0d5c4ed678 Merge branch 'willruddick-master-patch-57081' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!95
 2021-09-13 09:04:59 +00:00
willruddick a23ef3e9a8 Update README.md 2021-09-13 09:04:47 +00:00
willruddick 4a10184f4a Merge branch 'willruddick-master-patch-08068' into 'master' 
1st push to gitlab

See merge request grassrootseconomics/cic-docs!94
 2021-09-13 08:58:28 +00:00
willruddick f87da4eb93 Pulled from https://holbrook.no/tmp/top.md and combined with a vision mission and community statement 2021-09-13 08:57:54 +00:00
willruddick 5ec1a391e2 Merge branch 'willruddick-master-patch-75396' into 'master' 
batch txns

See merge request grassrootseconomics/cic-docs!93
 2021-09-09 10:58:36 +00:00
willruddick 0b9e922ec1 batch txns 2021-09-09 10:58:21 +00:00
willruddick b09d349425 Merge branch 'willruddick-master-patch-57891' into 'master' 
removed bonding curves / reserves

See merge request grassrootseconomics/cic-docs!92
 2021-09-05 04:33:37 +00:00
willruddick 73d79dfc4e removed bonding curves / reserves 2021-09-05 04:33:21 +00:00
willruddick 1aa04b2b73 Merge branch 'willruddick-master-patch-44516' into 'master' 
generalized for unique tokens

See merge request grassrootseconomics/cic-docs!91
 2021-09-05 04:32:23 +00:00
willruddick a87a623ef0 generalized for unique tokens 2021-09-05 04:32:08 +00:00
willruddick 111d4baf78 Merge branch 'willruddick-master-patch-21325' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!90
 2021-08-13 12:02:29 +00:00
willruddick b1d1d7acfa Update README.md 2021-08-13 12:02:14 +00:00
willruddick e3aefc9fcd Merge branch 'willruddick-master-patch-48106' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!89
 2021-07-24 09:00:27 +00:00
willruddick 543d848607 Update README.md 2021-07-24 09:00:14 +00:00
willruddick 986b457bc6 Merge branch 'willruddick-master-patch-60286' into 'master' 
Update misc-commands.md

See merge request grassrootseconomics/cic-docs!88
 2021-07-16 13:35:50 +00:00
willruddick ce9c5bc14c Update misc-commands.md 2021-07-16 13:35:37 +00:00
willruddick f0f7938234 Merge branch 'willruddick-master-patch-40766' into 'master' 
Update misc-commands.md

See merge request grassrootseconomics/cic-docs!87
 2021-07-16 12:48:44 +00:00
willruddick 0fc8a0a882 Update misc-commands.md 2021-07-16 12:48:31 +00:00
willruddick 3404dea699 Merge branch 'willruddick-master-patch-88024' into 'master' 
added demurrage calculation

See merge request grassrootseconomics/cic-docs!86
 2021-07-16 12:28:06 +00:00
willruddick ddbf23c008 added demurrage calculation 2021-07-16 12:27:54 +00:00
willruddick 3559da0659 Merge branch 'willruddick-master-patch-59371' into 'master' 
Update 024_token_info.md

See merge request grassrootseconomics/cic-docs!85
 2021-07-16 11:27:33 +00:00
willruddick 016f4db465 Update 024_token_info.md 2021-07-16 11:27:22 +00:00
willruddick 11c7206d3e Merge branch 'willruddick-master-patch-23371' into 'master' 
added token info

See merge request grassrootseconomics/cic-docs!84
 2021-07-16 11:18:56 +00:00
willruddick 3c26945268 Update 022_multi_token_env.md 2021-07-16 11:18:33 +00:00
willruddick ede716e3e7 Merge branch 'willruddick-master-patch-10498' into 'master' 
Update 024_token_info.md

See merge request grassrootseconomics/cic-docs!83
 2021-07-16 11:03:00 +00:00
willruddick 8ce3bf428f Update 024_token_info.md 2021-07-16 11:02:45 +00:00
willruddick cc3e7c7143 Merge branch 'willruddick-master-patch-43735' into 'master' 
added location of issuer

See merge request grassrootseconomics/cic-docs!82
 2021-07-16 11:01:26 +00:00
willruddick 6dd34911e8 added location of issuer 2021-07-16 11:01:14 +00:00
willruddick da2cb34c85 Merge branch 'willruddick-master-patch-97694' into 'master' 
Add new file

See merge request grassrootseconomics/cic-docs!81
 2021-07-16 10:58:43 +00:00
willruddick ac68192e3a Add new file 2021-07-16 10:58:32 +00:00
willruddick 69e2d14d48 Merge branch 'willruddick-master-patch-94166' into 'master' 
Update misc-commands.md

See merge request grassrootseconomics/cic-docs!80
 2021-07-16 10:42:32 +00:00
willruddick b0af86514a Update misc-commands.md 2021-07-16 10:42:19 +00:00
willruddick 35ddf434b4 Merge branch 'willruddick-master-patch-90527' into 'master' 
Update misc-commands.md

See merge request grassrootseconomics/cic-docs!79
 2021-07-16 08:55:13 +00:00
willruddick 1e58de0845 Update misc-commands.md 2021-07-16 08:55:01 +00:00
willruddick 8da8935bc7 Merge branch 'willruddick-master-patch-06982' into 'master' 
suggested to change to the term voucher rather than token

See merge request grassrootseconomics/cic-docs!78
 2021-07-13 12:48:59 +00:00
willruddick d5f0d8f9f3 suggested to change to the term voucher rather than token 2021-07-13 12:48:21 +00:00
willruddick 1d28f9f75f Merge branch 'willruddick-master-patch-32474' into 'master' 
Update 019_wallet_soft_limit.md

See merge request grassrootseconomics/cic-docs!77
 2021-07-11 17:09:54 +00:00
willruddick ac96d247cb Update 019_wallet_soft_limit.md 2021-07-11 17:09:39 +00:00
willruddick ef89daf42a Merge branch 'willruddick-master-patch-18702' into 'master' 
Update 022_multi_token_env.md

See merge request grassrootseconomics/cic-docs!76
 2021-07-11 17:08:19 +00:00
willruddick 40f66b517d Update 022_multi_token_env.md 2021-07-11 17:08:05 +00:00
willruddick ab9f5ad82a Merge branch 'willruddick-master-patch-29900' into 'master' 
simple menu for changing token

See merge request grassrootseconomics/cic-docs!75
 2021-07-11 15:15:52 +00:00
willruddick eb338f4409 simple menu for changing token 2021-07-11 15:15:35 +00:00
willruddick fdbac12b32 Merge branch 'willruddick-master-patch-84548' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!74
 2021-06-18 06:45:41 +00:00
willruddick b8194fba45 Update README.md 2021-06-18 06:45:27 +00:00
willruddick 9b7f2d3c92 Merge branch 'willruddick-master-patch-62581' into 'master' 
Update misc-commands.md

See merge request grassrootseconomics/cic-docs!73
 2021-06-18 06:35:24 +00:00
willruddick ea463de55d Update misc-commands.md 2021-06-18 06:35:07 +00:00
willruddick ec9e29e305 Merge branch 'willruddick-master-patch-16496' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!72
 2021-06-09 16:51:37 +00:00
willruddick e2031d7e95 Update README.md 2021-06-09 16:51:24 +00:00
willruddick a9f9ab39e1 Merge branch 'willruddick-master-patch-65314' into 'master' 
Upload New File

See merge request grassrootseconomics/cic-docs!71
 2021-06-03 09:27:03 +00:00
willruddick 3beeec68b1 Upload New File 2021-06-03 09:26:49 +00:00
willruddick c025c240d3 Delete CIC_Support_Guide.pdf 2021-06-03 09:24:53 +00:00
willruddick dca6fa9841 Merge branch 'willruddick-master-patch-12411' into 'master' 
Replace CIC_Training_Guide_Kenya.pdf

See merge request grassrootseconomics/cic-docs!69
 2021-06-03 09:24:17 +00:00
willruddick 0f500ed313 Replace CIC_Training_Guide_Kenya.pdf 2021-06-03 09:24:03 +00:00
willruddick 7523956b4e Merge branch 'willruddick-master-patch-37001' into 'master' 
Basic Field User support

See merge request grassrootseconomics/cic-docs!68
 2021-06-03 09:23:15 +00:00
willruddick c74b6d1115 Upload New File 2021-06-03 09:22:48 +00:00
willruddick 00724f1205 Merge branch 'willruddick-master-patch-46713' into 'master' 
Depricated

See merge request grassrootseconomics/cic-docs!67
 2021-05-29 09:11:22 +00:00
willruddick d509b602ae Depricated 2021-05-29 09:11:03 +00:00
willruddick d5336141d7 Merge branch 'willruddick-master-patch-08003' into 'master' 
details added for multi-token env

See merge request grassrootseconomics/cic-docs!66
 2021-05-29 09:07:36 +00:00
willruddick fbb93a166d details added for multi-token envirnment 2021-05-29 09:07:11 +00:00
willruddick 07d637e44c Merge branch 'willruddick-master-patch-55330' into 'master' 
Toggle for accepting other tokens or not.

See merge request grassrootseconomics/cic-docs!65
 2021-05-29 09:04:38 +00:00
willruddick 7fe44866df Toggle for accepting other tokens or not. 2021-05-29 09:04:21 +00:00
willruddick d3f82472ba Merge branch 'willruddick-master-patch-74020' into 'master' 
minor update

See merge request grassrootseconomics/cic-docs!63
 2021-05-29 08:38:35 +00:00
willruddick c98bffa3ce Merge branch 'willruddick-master-patch-00812' into 'master' 
removed conversion and multi-token env

See merge request grassrootseconomics/cic-docs!64
 2021-05-29 08:23:04 +00:00
willruddick c51c2b0df5 removed conversion and multi-token env 2021-05-29 08:22:44 +00:00