Commit Graph

348 Commits

Author SHA1 Message Date
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
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
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
0b9e922ec1 batch txns 2021-09-09 10:58:21 +00:00
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
73d79dfc4e removed bonding curves / reserves 2021-09-05 04:33:21 +00:00
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
a87a623ef0 generalized for unique tokens 2021-09-05 04:32:08 +00:00
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
b1d1d7acfa Update README.md 2021-08-13 12:02:14 +00:00
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
543d848607 Update README.md 2021-07-24 09:00:14 +00:00
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
ce9c5bc14c Update misc-commands.md 2021-07-16 13:35:37 +00:00
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
0fc8a0a882 Update misc-commands.md 2021-07-16 12:48:31 +00:00
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
ddbf23c008 added demurrage calculation 2021-07-16 12:27:54 +00:00
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
016f4db465 Update 024_token_info.md 2021-07-16 11:27:22 +00:00
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
3c26945268 Update 022_multi_token_env.md 2021-07-16 11:18:33 +00:00
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
8ce3bf428f Update 024_token_info.md 2021-07-16 11:02:45 +00:00
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
6dd34911e8 added location of issuer 2021-07-16 11:01:14 +00:00
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
ac68192e3a Add new file 2021-07-16 10:58:32 +00:00
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
b0af86514a Update misc-commands.md 2021-07-16 10:42:19 +00:00
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
1e58de0845 Update misc-commands.md 2021-07-16 08:55:01 +00:00
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
d5f0d8f9f3 suggested to change to the term voucher rather than token 2021-07-13 12:48:21 +00:00
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
ac96d247cb Update 019_wallet_soft_limit.md 2021-07-11 17:09:39 +00:00
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
40f66b517d Update 022_multi_token_env.md 2021-07-11 17:08:05 +00:00
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
eb338f4409 simple menu for changing token 2021-07-11 15:15:35 +00:00
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
b8194fba45 Update README.md 2021-06-18 06:45:27 +00:00
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
ea463de55d Update misc-commands.md 2021-06-18 06:35:07 +00:00
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
e2031d7e95 Update README.md 2021-06-09 16:51:24 +00:00
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
3beeec68b1 Upload New File 2021-06-03 09:26:49 +00:00
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
0f500ed313 Replace CIC_Training_Guide_Kenya.pdf 2021-06-03 09:24:03 +00:00