nolash
|
64e4b10b3a
|
Merge remote-tracking branch 'origin/master' into lash/import-ussd
|
2021-04-06 20:09:25 +02:00 |
|
|
|
fd629cdc51
|
Merge branch 'philip/ussd-bug-fixes' into 'master'
Philip/ussd bug fixes
See merge request grassrootseconomics/cic-internal-integration!72
|
2021-04-06 17:53:38 +00:00 |
|
|
|
e9fb80ab78
|
Philip/ussd bug fixes
|
2021-04-06 17:53:38 +00:00 |
|
nolash
|
e668d0b8b3
|
Allow ip subnet comparison in ussd ip access check
|
2021-04-06 18:24:49 +02:00 |
|
Louis Holbrook
|
7728f38f14
|
Merge branch 'lash/4k' into 'master'
Make 40k import pass
See merge request grassrootseconomics/cic-internal-integration!86
|
2021-04-06 15:14:04 +00:00 |
|
Louis Holbrook
|
a305aafc86
|
Make 40k import pass
|
2021-04-06 15:14:04 +00:00 |
|
Louis Holbrook
|
9e6bb2acb2
|
Merge branch 'lash/external-chain-queue' into 'master'
cic-eth: Rehabilitate retrier with chainqueue
See merge request grassrootseconomics/cic-internal-integration!85
|
2021-04-05 15:07:09 +00:00 |
|
Louis Holbrook
|
a7ab2e3f3f
|
cic-eth: Rehabilitate retrier with chainqueue
|
2021-04-05 15:07:09 +00:00 |
|
Louis Holbrook
|
1f2fc3e952
|
Merge branch 'lash/external-chain-queue' into 'master'
Use external chain queue engine
See merge request grassrootseconomics/cic-internal-integration!84
|
2021-04-04 12:41:00 +00:00 |
|
Louis Holbrook
|
a9258c3085
|
Use external chain queue engine
|
2021-04-04 12:40:59 +00:00 |
|
Louis Holbrook
|
1a97f1e97d
|
Merge branch 'lash/rehabilitate-cic-cache' into 'master'
Rehabilitate cic cache
See merge request grassrootseconomics/cic-internal-integration!82
|
2021-04-02 13:20:05 +00:00 |
|
Louis Holbrook
|
fc59e24c80
|
Rehabilitate cic cache
|
2021-04-02 13:20:05 +00:00 |
|
Louis Holbrook
|
68bdadcdf1
|
Merge branch 'lash/rehabilitate-retrier' into 'master'
Rehabilitate retrier
See merge request grassrootseconomics/cic-internal-integration!77
|
2021-04-02 13:16:27 +00:00 |
|
Louis Holbrook
|
810f9fe994
|
Rehabilitate retrier
|
2021-04-02 13:16:27 +00:00 |
|
Louis Holbrook
|
7762020186
|
Merge branch 'lash/clean-sovereign-imports' into 'master'
Remove custodial dependencies from sovereign import scripts
See merge request grassrootseconomics/cic-internal-integration!83
|
2021-04-01 20:55:39 +00:00 |
|
Louis Holbrook
|
462933d8ae
|
Remove custodial dependencies from sovereign import scripts
|
2021-04-01 20:55:39 +00:00 |
|
Louis Holbrook
|
3f8d7fc10a
|
Merge branch 'lash/sovereign-import' into 'master'
Sovereign import part II
See merge request grassrootseconomics/cic-internal-integration!81
|
2021-03-31 11:04:05 +00:00 |
|
Louis Holbrook
|
426e46c791
|
Sovereign import part II
|
2021-03-31 11:04:05 +00:00 |
|
Louis Holbrook
|
050da4ae36
|
Merge branch 'lash/sovereign-import' into 'master'
Sovereign import script
See merge request grassrootseconomics/cic-internal-integration!80
|
2021-03-31 10:52:27 +00:00 |
|
Louis Holbrook
|
1886e6743b
|
Sovereign import script
|
2021-03-31 10:52:27 +00:00 |
|
|
|
5fa93633da
|
add gitkeep back
|
2021-03-30 16:58:45 -07:00 |
|
Louis Holbrook
|
d822470937
|
Merge branch 'lash/connect-registry' into 'master'
Add declarator to tasker registry instantiation
See merge request grassrootseconomics/cic-internal-integration!79
|
2021-03-30 16:33:10 +00:00 |
|
Louis Holbrook
|
206a585fd1
|
Add declarator to tasker registry instantiation
|
2021-03-30 16:33:09 +00:00 |
|
Louis Holbrook
|
80d0bfe234
|
Merge branch 'lash/migration-verify-faucet' into 'master'
Add faucet and gas gift check to migration script verify
See merge request grassrootseconomics/cic-internal-integration!76
|
2021-03-29 19:29:29 +00:00 |
|
Louis Holbrook
|
21fd034478
|
Add faucet and gas gift check to migration script verify
|
2021-03-29 19:29:29 +00:00 |
|
Louis Holbrook
|
74457790a4
|
Merge branch 'lash/cic-ussd-cic-eth-upgrade' into 'master'
Bump cic-ussd to apply bumped cic-eth dep
See merge request grassrootseconomics/cic-internal-integration!75
|
2021-03-29 19:20:07 +00:00 |
|
Louis Holbrook
|
fd5e208acd
|
Bump cic-ussd to apply bumped cic-eth dep
|
2021-03-29 19:20:06 +00:00 |
|
Louis Holbrook
|
2cb1d6d9fb
|
Merge branch 'lash/add-omitted-tests' into 'master'
Add omitted tests from previous MR
See merge request grassrootseconomics/cic-internal-integration!74
|
2021-03-29 13:42:40 +00:00 |
|
nolash
|
5efc336962
|
Add omitted tests from previous MR
|
2021-03-29 15:35:51 +02:00 |
|
Louis Holbrook
|
cf761b3b31
|
Merge branch 'lash/migration-last-gasp' into 'master'
Replace web3 with chainlib
See merge request grassrootseconomics/cic-internal-integration!73
|
2021-03-29 13:27:54 +00:00 |
|
Louis Holbrook
|
b65ab8a0ca
|
Rehabilitate transfer, approve
Signed-off-by: nolash <dev@holbrook.no>
|
2021-03-29 13:27:53 +00:00 |
|
|
|
299385f320
|
recursive own
|
2021-03-21 17:18:47 -07:00 |
|
|
|
bdd7ca14c2
|
contract migration permissions
|
2021-03-21 11:32:53 -07:00 |
|
|
|
88ace15d6b
|
Merge branch 'lash/new-contract-migration' into 'master'
Fix breaking seed script
See merge request grassrootseconomics/cic-internal-integration!71
|
2021-03-20 06:04:02 +00:00 |
|
Louis Holbrook
|
e3ab8bcd82
|
Fix breaking seed script
|
2021-03-20 06:04:02 +00:00 |
|
|
|
992c5f3c00
|
Merge branch 'bvander/contract-migration-refactor' into 'master'
contract migration refactor
See merge request grassrootseconomics/cic-internal-integration!70
|
2021-03-19 14:19:40 +00:00 |
|
|
|
e4d1f5b65c
|
contract migration refactor
|
2021-03-19 14:19:40 +00:00 |
|
|
|
7fe5b6bea3
|
add libpq to runtime
|
2021-03-17 07:30:34 -07:00 |
|
|
|
fc27dd6826
|
Merge branch 'bvander/more-contract-migration-permissions' into 'master'
add permissions and move some pip installs
See merge request grassrootseconomics/cic-internal-integration!69
|
2021-03-16 05:34:20 +00:00 |
|
|
|
75262dae5d
|
add permissions and move some pip installs
|
2021-03-16 05:34:19 +00:00 |
|
|
|
c59f9da0fc
|
try the multiple dest flags...
|
2021-03-15 14:31:48 +00:00 |
|
|
|
20a26045eb
|
Update .cic-template.yml
|
2021-03-15 14:21:39 +00:00 |
|
|
|
09a79e10d5
|
Merge branch 'bvander/fix-contract-migration-permissions' into 'master'
fix home dir permissions
See merge request grassrootseconomics/cic-internal-integration!68
|
2021-03-15 14:17:09 +00:00 |
|
|
|
c0dff41b3c
|
fix home dir permissions
|
2021-03-15 07:10:08 -07:00 |
|
|
|
18be4c48a7
|
Merge branch 'fix-cache-tasker' into 'master'
adding cic cache details
See merge request grassrootseconomics/cic-internal-integration!65
|
2021-03-15 13:22:39 +00:00 |
|
|
|
432dbe9fee
|
adding cic cache details
|
2021-03-15 13:22:39 +00:00 |
|
|
|
93338aebea
|
Merge branch 'bvander/add-cache-dbinit' into 'master'
cic cache db fixes
See merge request grassrootseconomics/cic-internal-integration!64
|
2021-03-15 13:20:18 +00:00 |
|
|
|
097a80e8de
|
cic cache db fixes
|
2021-03-15 13:20:18 +00:00 |
|
|
|
bd4e5b0a40
|
Merge branch 'contract-migration-file-issue' into 'master'
Contract migration file issue
See merge request grassrootseconomics/cic-internal-integration!67
|
2021-03-15 03:27:33 +00:00 |
|
|
|
4927d92215
|
seperate module install
|
2021-03-14 20:21:07 -07:00 |
|
