Commit Graph

354 Commits

Author SHA1 Message Date
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
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
c74b6d1115 Upload New File 2021-06-03 09:22:48 +00:00
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
d509b602ae Depricated 2021-05-29 09:11:03 +00:00
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
fbb93a166d details added for multi-token envirnment 2021-05-29 09:07:11 +00:00
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
7fe44866df Toggle for accepting other tokens or not. 2021-05-29 09:04:21 +00:00
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
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
c51c2b0df5 removed conversion and multi-token env 2021-05-29 08:22:44 +00:00
3eaa5c6cef minor update 2021-05-29 08:21:08 +00:00
d34989184a Merge branch 'willruddick-master-patch-00655' into 'master'
stub for conversion

See merge request grassrootseconomics/cic-docs!62
2021-05-29 08:16:25 +00:00
879a562381 stub for conversion 2021-05-29 08:15:34 +00:00
5d03710a65 Merge branch 'willruddick-master-patch-69525' into 'master'
moved conversion and multi-token issues to their own specs

See merge request grassrootseconomics/cic-docs!61
2021-05-29 08:15:29 +00:00
9f0cd601e4 moved conversion and multi-token issues to their own specs 2021-05-29 08:15:15 +00:00
ebec819689 Merge branch 'willruddick-master-patch-88576' into 'master'
simple multi-token env

See merge request grassrootseconomics/cic-docs!60
2021-05-29 08:15:10 +00:00
b89601e835 simple multi-token env 2021-05-29 08:14:54 +00:00
b0f4ed64ac Merge branch 'willruddick-master-patch-33973' into 'master'
added clauses

See merge request grassrootseconomics/cic-docs!59
2021-05-17 07:52:50 +00:00
4bc70f8a12 added clauses 2021-05-17 07:52:32 +00:00
047b7963d4 Merge branch 'willruddick-master-patch-45838' into 'master'
Shortened

See merge request grassrootseconomics/cic-docs!58
2021-05-13 11:38:06 +00:00
7b6a6f45ac Shortened 2021-05-13 11:37:52 +00:00
b8ca064a8d Merge branch 'willruddick-master-patch-36455' into 'master'
Update 021_manual_token_creation.md

See merge request grassrootseconomics/cic-docs!57
2021-05-12 09:33:10 +00:00
05d2cf4287 Update 021_manual_token_creation.md 2021-05-12 09:32:41 +00:00
2a90d75aa7 Merge branch 'willruddick-master-patch-45611' into 'master'
THis is for issuance of Sarafu - but will be modified for issuance of other...

See merge request grassrootseconomics/cic-docs!56
2021-05-12 09:31:50 +00:00
3c1d728e48 THis is for issuance of Sarafu - but will be modified for issuance of other community tokens as well 2021-05-12 09:31:31 +00:00
abfd64d704 Merge branch 'willruddick-master-patch-06058' into 'master'
modified from older auto-token-creation spec

See merge request grassrootseconomics/cic-docs!55
2021-05-12 09:23:53 +00:00
6f2bfb2fe3 modified from older auto-token-creation spec 2021-05-12 09:23:32 +00:00
15dc9f9b34 Merge branch 'willruddick-master-patch-18038' into 'master'
basic intro

See merge request grassrootseconomics/cic-docs!54
2021-04-22 07:36:05 +00:00
85ee6f7877 basic intro 2021-04-22 07:35:44 +00:00
0781b9a46c Merge branch 'teodoro.criscione-master-patch-52417' into 'master'
Update TransactionDatasets.md

See merge request grassrootseconomics/cic-docs!49
2021-04-22 05:11:18 +00:00
d60fee1939 Merge branch 'willruddick-master-patch-72147' into 'master'
Update 020_redeemable_certifcate.md

See merge request grassrootseconomics/cic-docs!53
2021-04-22 05:10:47 +00:00
2c43bd1803 Update 020_redeemable_certifcate.md 2021-04-20 11:42:11 +00:00
c04b786da8 Merge branch 'willruddick-master-patch-42719' into 'master'
Various updates

See merge request grassrootseconomics/cic-docs!52
2021-04-19 05:03:03 +00:00
f32ada588e Various updates 2021-04-19 05:02:47 +00:00
d4d066b39d Merge branch 'willruddick-master-patch-23979' into 'master'
updated some privacy settings

See merge request grassrootseconomics/cic-docs!51
2021-04-16 12:05:23 +00:00
3547fe0cca updated some privacy settings 2021-04-16 12:05:01 +00:00
3f93ebc896 Merge branch 'willruddick-master-patch-51264' into 'master'
Update 010_Web_Wallet.md

See merge request grassrootseconomics/cic-docs!50
2021-04-16 11:00:27 +00:00
b766029d2c Update 010_Web_Wallet.md 2021-04-16 10:59:33 +00:00
Teodoro Criscione
089b7f5f42 Update TransactionDatasets.md 2021-03-15 17:23:32 +00:00
69a7091419 Merge branch 'willruddick-master-patch-84791' into 'master'
Update 020_redeemable_certifcate.md

See merge request grassrootseconomics/cic-docs!48
2021-03-10 12:03:48 +00:00
f7441e35bc Update 020_redeemable_certifcate.md 2021-03-10 12:03:38 +00:00
a915e58538 Merge branch 'willruddick-master-patch-29075' into 'master'
Update 020_redeemable_certifcate.md

See merge request grassrootseconomics/cic-docs!47
2021-03-09 16:02:03 +00:00
9df1229a85 Update 020_redeemable_certifcate.md 2021-03-09 09:06:58 +00:00