Commit Graph

221 Commits

Author SHA1 Message Date
13633732c5 Replace CIC-White-Paper.pdf 2020-11-17 05:20:58 +00:00
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
80995b242c Update 001_platform_incentives.md 2020-11-11 04:07:47 +00:00
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
29b05b2cd7 Update README.md 2020-11-04 12:46:13 +00:00
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
d57a9049ca Update README.md 2020-11-04 12:19:36 +00:00
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
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
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
9f5f98abf0 Update 001_platform_incentives.md 2020-09-23 12:50:47 +00:00
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
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
90fac40afa Update 008_Trade_Limits.md 2020-09-23 12:45:33 +00:00
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
2ff0d76914 Update 008_Trade_Limits.md 2020-09-23 12:42:20 +00:00
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
99cb9c4d00 small notes 2020-09-14 13:33:35 +00:00
cd845bc459 Merge branch 'spencer/management-platform' into 'master'
Add CIC management platform spec.

See merge request grassrootseconomics/cic-docs!19
2020-09-14 13:30:30 +00:00
SpencerOfwiti
c88889f7e6
Add CIC management platform spec.
- Add system overview.
- Add user stories.
2020-09-14 15:49:33 +03:00
d66531ef5c Merge branch 'patch-2' into 'master'
Update 004_Platform_Roles.md

See merge request grassrootseconomics/cic-docs!18
2020-09-10 11:55:18 +00:00
ad7249104d Update 004_Platform_Roles.md 2020-09-10 11:55:03 +00:00
7bb9db63b9 Merge branch 'patch-1' into 'master'
Initial

See merge request grassrootseconomics/cic-docs!16
2020-09-09 05:53:51 +00:00
459cfcf011 Add new file 2020-09-09 05:53:24 +00:00
nolash
40c0207015 Remove irrelevant content 2020-08-26 11:24:39 +02:00
b6eae9b930 Merge branch 'tags' into 'master'
adding tags

See merge request grassrootseconomics/cic-docs!14
2020-08-26 08:25:09 +00:00
2097f29585 adding tags 2020-08-26 08:24:53 +00:00
9b6eed1f0a Merge branch 'patch-1' into 'master'
Update 017_CIC Deployment.md

See merge request grassrootseconomics/cic-docs!13
2020-08-26 08:19:22 +00:00
d87b40cb79 Update 017_CIC Deployment.md 2020-08-26 08:18:37 +00:00
4c602526b6 Merge branch 'patch-1' into 'master'
Add new file

See merge request grassrootseconomics/cic-docs!12
2020-08-26 08:16:59 +00:00
795567b12f Add new file 2020-08-26 08:16:33 +00:00
e952927364 Merge branch 'lash/token-registration' into 'master'
Token registration and announcement framework

See merge request grassrootseconomics/cic-docs!11
2020-08-26 08:09:25 +00:00
8664af4937 Merge branch 'lash/extension-api-2' into 'master'
WIP extension APIs per 20200810

See merge request grassrootseconomics/cic-docs!10
2020-08-26 08:09:09 +00:00
f794a98f5a Merge branch 'lash/reserve-proof' into 'master'
Reserve proof format

See merge request grassrootseconomics/cic-docs!8
2020-08-26 08:08:01 +00:00
nolash
d45afab168 Restructure the registration mapping description 2020-08-21 17:05:38 +02:00
nolash
346de183de Add link resources 2020-08-21 16:25:40 +02:00
nolash
9166d0ae72 Add token platform registration description 2020-08-21 16:21:55 +02:00
nolash
a13f4cac2c
Add 014 2020-08-10 09:25:11 +02:00
nolash
4faed30e2b
Revert 2020-08-10 09:23:41 +02:00
nolash
b2947b89c6
WIP api extension specs per 20200810 2020-08-10 09:13:45 +02:00
nolash
0b8040adcd
Add resrve proof draft 2020-08-09 23:06:55 +02:00
a4890d4191 Merge branch 'patch-1' into 'master'
Insert first draft of the web wallet spec from...

See merge request grassrootseconomics/cic-docs!7
2020-08-05 11:02:40 +00:00
Kisgus
7ed8b97e4c Insert first draft of the web wallet spec from https://docs.google.com/document/d/1zSpXwraDJQIDvkad0wf6kc7GpMkGbWIQp2WwX8pFB9c/edit 2020-07-28 16:57:13 +00:00
2a47a58831 added location information 2020-07-28 04:44:03 +00:00
bc7bb4daa8 Update README.md 2020-07-27 08:42:13 +00:00
6b52740ffa bDAI 2020-07-18 05:19:34 +00:00
ce824818a3 bDai 2020-07-18 05:14:16 +00:00
fe950b8bcf Merge branch 'lash/review-xdai-migration' into 'master'
XDAI migration review comments

See merge request grassrootseconomics/cic-docs!5
2020-07-16 06:13:08 +00:00