grassrootseconomics/cic-docs
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
352 Commits 12 Branches 0 Tags 10 MiB
5403dd5ce9
Commit Graph

352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Ruddick
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
Will Ruddick
cebe38af7c basic idea 2021-03-09 09:00:47 +00:00
Will Ruddick
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
Will Ruddick
de880e6117 Update 19_wallet_soft_limit.md 2021-03-09 08:16:22 +00:00
Will Ruddick
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
Will Ruddick
cba574f51c partial update 2021-03-01 05:58:46 +00:00
Will Ruddick
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
Will Ruddick
bf9ab8cc6f initial draft 2021-02-23 16:00:52 +00:00
Will Ruddick
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
Will Ruddick
a8a24e2a3a simplified 2021-02-23 15:37:16 +00:00
Will Ruddick
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
Will Ruddick
d5ae24c9cc Replace CIC-White-Paper.pdf 2021-02-14 08:50:19 +00:00
Will Ruddick
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
Will Ruddick
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
Will Ruddick
52ac71f1c3 Bonded liquidity pool example maths 2021-02-05 05:43:32 +00:00
Will Ruddick
994f7b87dc example calculations for Sarafu - basic income / demuurrage and redistribution token 2021-02-05 05:42:31 +00:00
Will Ruddick
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
Will Ruddick
a5c24d8f6d Update 007_eMoney_integration.md 2021-02-01 13:48:31 +00:00
Will Ruddick
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
Will Ruddick
b139442aea updated 2021-01-19 07:06:20 +00:00
Will Ruddick
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
Will Ruddick
7a2b23c9cc Update to the 2020 xDAI dataset definitions 2021-01-19 05:48:27 +00:00
Will Ruddick
9aa350cba8 Merge branch 'willruddick-master-patch-21186' into 'master' 
CIC Tech brief - overview

See merge request grassrootseconomics/cic-docs!34
 2021-01-13 11:54:59 +00:00
Will Ruddick
b4cfe292f5 CIC Tech brief - overview 2021-01-13 11:54:38 +00:00
Will Ruddick
3983286356 Merge branch 'willruddick-master-patch-70593' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!33
 2020-12-05 13:00:03 +00:00
Will Ruddick
2ed9f419a3 Update README.md 2020-12-05 12:59:52 +00:00
Will Ruddick
0a3ff16429 Merge branch 'willruddick-master-patch-79953' into 'master' 
Upload New File

See merge request grassrootseconomics/cic-docs!32
 2020-12-05 12:59:12 +00:00
Will Ruddick
646f61ebbd Upload New File 2020-12-05 12:58:58 +00:00
Will Ruddick
0bc563c287 Merge branch 'willruddick-master-patch-21369' into 'master' 
Replace CIC-White-Paper.pdf

See merge request grassrootseconomics/cic-docs!31
 2020-12-01 09:16:09 +00:00
Will Ruddick
42dfdb828a Replace CIC-White-Paper.pdf 2020-12-01 09:15:54 +00:00
Will Ruddick
9cd9b563a2 Merge branch 'willruddick-master-patch-08969' into 'master' 
Replace CIC-White-Paper.pdf

See merge request grassrootseconomics/cic-docs!30
 2020-11-17 05:21:13 +00:00
Will Ruddick
13633732c5 Replace CIC-White-Paper.pdf 2020-11-17 05:20:58 +00:00
Will Ruddick
f21b70382f Merge branch 'willruddick-master-patch-75724' into 'master' 
usage / holding

See merge request grassrootseconomics/cic-docs!29
 2020-11-11 04:08:20 +00:00
Will Ruddick
80995b242c Update 001_platform_incentives.md 2020-11-11 04:07:47 +00:00
Will Ruddick
58d03466da Merge branch 'willruddick-master-patch-41224' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!28
 2020-11-04 12:46:31 +00:00
Will Ruddick
29b05b2cd7 Update README.md 2020-11-04 12:46:13 +00:00
Will Ruddick
566264953e Merge branch 'willruddick-master-patch-72791' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!27
 2020-11-04 12:19:53 +00:00
Will Ruddick
d57a9049ca Update README.md 2020-11-04 12:19:36 +00:00
Will Ruddick
71ceff4523 Merge branch 'willruddick-master-patch-88982' into 'master' 
Update README.md

See merge request grassrootseconomics/cic-docs!26
 2020-11-03 13:52:22 +00:00
Will Ruddick
a61b43c625 Update README.md 2020-11-03 13:45:33 +00:00
Louis Holbrook
badb9cab9a Merge branch 'lash/deployment-changes' into 'master' 
Changes to deployment tool description spec

See merge request grassrootseconomics/cic-docs!15
 2020-09-25 05:44:28 +00:00
Will Ruddick
7a523eb6c1 Merge branch 'patch-2' into 'master' 
Update 001_platform_incentives.md

See merge request grassrootseconomics/cic-docs!24
 2020-09-23 12:52:23 +00:00
Will Ruddick
9f5f98abf0 Update 001_platform_incentives.md 2020-09-23 12:50:47 +00:00
Will Ruddick
57624c0b6d Merge branch 'patch-2' into 'master' 
Update 004_Platform_Roles.md

See merge request grassrootseconomics/cic-docs!21
 2020-09-23 12:46:29 +00:00
Will Ruddick
4c2ffdd8c0 Merge branch 'patch-3' into 'master' 
Update 008_Trade_Limits.md

See merge request grassrootseconomics/cic-docs!23
 2020-09-23 12:45:45 +00:00
Will Ruddick
90fac40afa Update 008_Trade_Limits.md 2020-09-23 12:45:33 +00:00
Will Ruddick
d163bfd9e6 Merge branch 'patch-3' into 'master' 
Update 008_Trade_Limits.md

See merge request grassrootseconomics/cic-docs!22
 2020-09-23 12:44:04 +00:00
Will Ruddick
2ff0d76914 Update 008_Trade_Limits.md 2020-09-23 12:42:20 +00:00
Will Ruddick
bd5de1f53b Update 004_Platform_Roles.md 2020-09-23 08:11:39 +00:00
Spencer Ofwiti
31a95a00e9 Merge branch 'patch-2' into 'master' 
small notes

See merge request grassrootseconomics/cic-docs!20
 2020-09-14 18:27:22 +00:00