Commit Graph

389 Commits

Author SHA1 Message Date
Will Ruddick 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
Will Ruddick ce9c5bc14c Update misc-commands.md 2021-07-16 13:35:37 +00:00
Will Ruddick 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
Will Ruddick 0fc8a0a882 Update misc-commands.md 2021-07-16 12:48:31 +00:00
Will Ruddick 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
Will Ruddick ddbf23c008 added demurrage calculation 2021-07-16 12:27:54 +00:00
Will Ruddick 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
Will Ruddick 016f4db465 Update 024_token_info.md 2021-07-16 11:27:22 +00:00
Will Ruddick 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
Will Ruddick 3c26945268 Update 022_multi_token_env.md 2021-07-16 11:18:33 +00:00
Will Ruddick 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
Will Ruddick 8ce3bf428f Update 024_token_info.md 2021-07-16 11:02:45 +00:00
Will Ruddick 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
Will Ruddick 6dd34911e8 added location of issuer 2021-07-16 11:01:14 +00:00
Will Ruddick 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
Will Ruddick ac68192e3a Add new file 2021-07-16 10:58:32 +00:00
Will Ruddick 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
Will Ruddick b0af86514a Update misc-commands.md 2021-07-16 10:42:19 +00:00
Will Ruddick 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
Will Ruddick 1e58de0845 Update misc-commands.md 2021-07-16 08:55:01 +00:00
Will Ruddick 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
Will Ruddick d5f0d8f9f3 suggested to change to the term voucher rather than token 2021-07-13 12:48:21 +00:00
Will Ruddick 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
Will Ruddick ac96d247cb Update 019_wallet_soft_limit.md 2021-07-11 17:09:39 +00:00
Will Ruddick 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
Will Ruddick 40f66b517d Update 022_multi_token_env.md 2021-07-11 17:08:05 +00:00
Will Ruddick 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
Will Ruddick eb338f4409 simple menu for changing token 2021-07-11 15:15:35 +00:00
Will Ruddick 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
Will Ruddick b8194fba45 Update README.md 2021-06-18 06:45:27 +00:00
Will Ruddick 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
Will Ruddick ea463de55d Update misc-commands.md 2021-06-18 06:35:07 +00:00
Will Ruddick 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
Will Ruddick e2031d7e95 Update README.md 2021-06-09 16:51:24 +00:00
Will Ruddick 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
Will Ruddick 3beeec68b1 Upload New File 2021-06-03 09:26:49 +00:00
Will Ruddick c025c240d3 Delete CIC_Support_Guide.pdf 2021-06-03 09:24:53 +00:00
Will Ruddick 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
Will Ruddick 0f500ed313 Replace CIC_Training_Guide_Kenya.pdf 2021-06-03 09:24:03 +00:00
Will Ruddick 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
Will Ruddick c74b6d1115 Upload New File 2021-06-03 09:22:48 +00:00
Will Ruddick 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
Will Ruddick d509b602ae Depricated 2021-05-29 09:11:03 +00:00
Will Ruddick 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
Will Ruddick fbb93a166d details added for multi-token envirnment 2021-05-29 09:07:11 +00:00
Will Ruddick 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
Will Ruddick 7fe44866df Toggle for accepting other tokens or not. 2021-05-29 09:04:21 +00:00
Will Ruddick 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
Will Ruddick 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
Will Ruddick c51c2b0df5 removed conversion and multi-token env 2021-05-29 08:22:44 +00:00