Commit Graph

382 Commits

Author SHA1 Message Date
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
0794c5262b Merge branch 'willruddick-master-patch-85122' into 'master'
Update 020_certifcate_ledgar_nft.md

See merge request grassrootseconomics/cic-docs!46
2021-03-09 09:03:03 +00:00
00e85accd9 Update 020_certifcate_ledgar_nft.md 2021-03-09 09:02:51 +00:00
c6318f6876 Merge branch 'willruddick-master-patch-60770' into 'master'
basic idea

See merge request grassrootseconomics/cic-docs!45
2021-03-09 09:01:00 +00:00
cebe38af7c basic idea 2021-03-09 09:00:47 +00:00
94933dec30 Merge branch 'willruddick-master-patch-72258' into 'master'
Update 19_wallet_soft_limit.md

See merge request grassrootseconomics/cic-docs!44
2021-03-09 08:17:08 +00:00
de880e6117 Update 19_wallet_soft_limit.md 2021-03-09 08:16:22 +00:00
e7ec7f5f32 Merge branch 'willruddick-master-patch-94559' into 'master'
partial update

See merge request grassrootseconomics/cic-docs!43
2021-03-01 05:59:01 +00:00
cba574f51c partial update 2021-03-01 05:58:46 +00:00
31dad6ea38 Merge branch 'willruddick-master-patch-27050' into 'master'
initial

See merge request grassrootseconomics/cic-docs!42
2021-02-23 16:01:54 +00:00
bf9ab8cc6f initial draft 2021-02-23 16:00:52 +00:00
8648777985 Merge branch 'willruddick-master-patch-67009' into 'master'
simplified

See merge request grassrootseconomics/cic-docs!41
2021-02-23 15:37:37 +00:00
a8a24e2a3a simplified 2021-02-23 15:37:16 +00:00
7df7be3d64 Merge branch 'willruddick-master-patch-72717' into 'master'
Replace CIC-White-Paper.pdf

See merge request grassrootseconomics/cic-docs!40
2021-02-14 08:50:56 +00:00
d5ae24c9cc Replace CIC-White-Paper.pdf 2021-02-14 08:50:19 +00:00
8e00f1880f Merge branch 'willruddick-master-patch-50682' into 'master'
example calculations for Sarafu - basic income / demurrage and redistribution token

See merge request grassrootseconomics/cic-docs!38
2021-02-05 05:44:25 +00:00
609076ec11 Merge branch 'willruddick-master-patch-82550' into 'master'
Bonded liquidity pool example maths

See merge request grassrootseconomics/cic-docs!39
2021-02-05 05:44:01 +00:00
52ac71f1c3 Bonded liquidity pool example maths 2021-02-05 05:43:32 +00:00
994f7b87dc example calculations for Sarafu - basic income / demuurrage and redistribution token 2021-02-05 05:42:31 +00:00
f1fd77f7d8 Merge branch 'willruddick-master-patch-44621' into 'master'
Update 007_eMoney_integration.md

See merge request grassrootseconomics/cic-docs!37
2021-02-01 13:48:48 +00:00
a5c24d8f6d Update 007_eMoney_integration.md 2021-02-01 13:48:31 +00:00
8fd364bc52 Merge branch 'willruddick-master-patch-21635' into 'master'
updated

See merge request grassrootseconomics/cic-docs!36
2021-01-19 07:06:35 +00:00
b139442aea updated 2021-01-19 07:06:20 +00:00
2c2b9ec66f Merge branch 'willruddick-master-patch-55738' into 'master'
Update to the 2020 xDAI dataset definitions

See merge request grassrootseconomics/cic-docs!35
2021-01-19 05:48:46 +00:00
7a2b23c9cc Update to the 2020 xDAI dataset definitions 2021-01-19 05:48:27 +00:00