github.com/ClimateMind/climatemind-backend commits

Merge branch 'develop' into CM-371-fix-missing-myth-iris

c99dcf823b95b3299883013136af56c602bc5393 authored about 4 years ago

Merge pull request #144 from ClimateMind/CM-369-Separation-of-Concerns

Cm 369 separation of concerns

e87c62639128d2eda436e2dd5349088f049b9307 authored about 4 years ago

Merge branch 'develop' into CM-369-Separation-of-Concerns

# Conflicts:
# knowledge_graph/score_nodes.py

0a1583fed59d0544d51f3f993c9da0211ff91ac1 authored about 4 years ago

Merge branch 'CM-369-Separation-of-Concerns' into develop

y

35732bfc9daa48f3be2ab4250bd5359d13134b0b authored about 4 years ago

Merge branch 'develop' into CM-369-Separation-of-Concerns

k

abe712764257803f8017a78d60690f3346e96e42 authored about 4 years ago

attempting merge

fee223cad3cd11194b4424b5f3cc185b065e930c authored about 4 years ago

Merge branch 'CM-369-Separation-of-Concerns' into develop

Git told me to do this.

9e009e5946c9da2a3dc7810406a85ee739b3ba7e authored about 4 years ago

Merge branch 'develop' into CM-369-Separation-of-Concerns

git told me to do this

6dabc477916a4fe44b2ede31345c225283a54d95 authored about 4 years ago

Merge pull request #142 from ClimateMind/CM-253-Mind-Conversion

CM-253 updated Mind to use networkx

07094cbc89e718d57d7524079eeb2fe88eec03f1 authored about 4 years ago

Merge branch 'develop' into CM-253-Mind-Conversion

f6048de737d445f89994950eef72094e9dbeda3e authored about 4 years ago

mark background impacts as not local

this needs to change in the future.

2c0c574d2b879d473568bc7156f739019592ed7d authored about 4 years ago

don't assume impacts are local

This needs to change later, but for now this will prevent things from showing that aren't local.

42306ece55d3e8e650e16b727eb1e6bf8f859fa6 authored about 4 years ago

Lint

f30e4bede04433e480a7809af3222c861d79b35e authored about 4 years ago

Final fix

Still need to later in another bug fix how all the G objects in the
whole app aren’t all the same.

571f3a091ab3aea82e3ae52cd89764b6c00beac3 authored about 4 years ago

Updated ontology - solution myths working

b5b309ad9118ab64b372e02a34d9bffe2a17a713 authored about 4 years ago

Intermediate fix

6de46414c989a2c0723e9c45a9b7a1ae737a4a5c authored about 4 years ago

Merge pull request #145 from ClimateMind/CM-334_task_CM-360_code_to_add_feed_data_to_table

Cm 334 task cm 360 code to add feed data to table

f3eeca0a372c6f5114d933f9193cc9e8e1c9f4fa authored about 4 years ago

code cleanup of for loops

ad1b70f47ce9ff1833ced08af8245473dd8c107e authored about 4 years ago

linting

14197341d3adb329670506a8a886ac2b1dbfdc21 authored about 4 years ago

function added to commit feed data to climate_feed table

b56c8b65fe2e8ccfb78d2e0f04a314873f51b1cc authored about 4 years ago

removing unnecessary comments adding config

fbb5c984b5ec6bbb9dd8bd6cadb72c83022cfd00 authored about 4 years ago

removing duplicate file

ad42beb7c5d1c71f067e4645767673aab3cbc24e authored about 4 years ago

big reorg

3aebeeab47d8a9eaa92ceeb677aac31b44f62909 authored about 4 years ago

separation of concerns

a226d8ccd76abc35e2ffa19fc7923e5cfe9520e1 authored about 4 years ago

replacing Mind with networkx

d7e48597b2b1371660eb465661383ea9ddb43ebf authored about 4 years ago

show all impacts just for Q&A testing

000af3012097b0ec820f939acff545c57a46ecd3 authored about 4 years ago

Merge pull request #143 from ClimateMind/CM-334_task_359_feed_data_table

feed data table added, migrations complete

d0c30576013833aa1597e8502e6594c6c9758996 authored about 4 years ago

feed data table added, migrations complete

43934bcf4501c949b9e1ff0edae477dccda9179e authored about 4 years ago

linting

09af9c871566961622f0544decc815256704884b authored about 4 years ago

updated Mind to use networkx

3018a2df85a96284c48f52526553be0ccfe1f7c3 authored about 4 years ago

hotfix: remove add_lrf_table.py from entrypoint.sh

hotfix to remove add_lrf_table.py from entrypoint.sh because the database already has this data ...

1e87d52b5d7770bfe9cc0f11ff83bc0343bab031 authored about 4 years ago

remove add_lrf_table.py for cloud

72ba7283b9a4738f8820de820aac60c2e862add0 authored about 4 years ago

Merge pull request #141 from ClimateMind/develop

merging latest dev changes to master

c6f74d9c85b2f2b7be74b33640184e0c3ebc60b7 authored about 4 years ago

Merge branch 'master' into develop

69354909596366ff5fff64e562d48d4432d0d443 authored about 4 years ago

Merge pull request #140 from ClimateMind/CM-335-direct-adaptation-only

CM-335 prevents upstream adaptation solutions from appearing in feed

3b34cd530fb21061bf958e7cbc9ea1177db8ff9c authored about 4 years ago

Merge branch 'develop' into CM-335-direct-adaptation-only

20de3ade2e602656018e1a9ff408b7cca07d2586 authored about 4 years ago

Merge pull request #139 from ClimateMind/CM-354_signup_table

Cm 354 signup table

99fa9fe0f1b337d9e0818330c61554a4cd02412d authored about 4 years ago

prevents upstream adaptation solutions from appearing in feed

6adb1699aead3eb207aee0875343c471b9610630 authored about 4 years ago

Merge branch 'develop' into CM-354_signup_table

ce1121c43426087633ce9ddb2979d0659be52809 authored about 4 years ago

signup table added, migrations complete

e5f0bce6973145ce64453692b39839fb72fceb73 authored about 4 years ago

Merge pull request #136 from ClimateMind/CM240_task_272_localise_impacts

Cm240 task 272 localise impacts

2859429910a7b847321f915b82420e99e7389b51 authored about 4 years ago

Merge branch 'develop' into CM240_task_272_localise_impacts

32921838377cb009265c491cb00bd240191329ca authored about 4 years ago

Merge pull request #137 from ClimateMind/CM-358-Add-IRI-For-Solutions

CM-358-added-iri

0514c2674da0c7fb691dc6e0408a0a15c023d199 authored about 4 years ago

Merge branch 'develop' into CM240_task_272_localise_impacts

ae95d76bc9c5173f4dd70d1c1f8af64ae044bb69 authored about 4 years ago

Merge branch 'develop' into CM-358-Add-IRI-For-Solutions

90f232029feeb69ea7887128325a3a0bce70ff7d authored about 4 years ago

Merge pull request #138 from ClimateMind/CM-353-add-signup-endpoint

CM-353-Add-Signup

fe70c7f1101b40437687ae760fee15a45032ba8a authored about 4 years ago

black

f814c9477970f4c968bc2bbdf4e5eb7e31d98be2 authored about 4 years ago

Remove breakpoints

025c8657236d6f1c3adef9439929e1769421eec1 authored about 4 years ago

added signup

f452e91abf449be7814317f4367acc91bd3396a0 authored about 4 years ago

added iri

f00b05f6baeab4b9f809b4891c71407e5ec12b42 authored about 4 years ago

Removed commented out lines

43b163ba89df01535497aa962d3c145421f1e3c2 authored about 4 years ago

Bug fix

* if not zip code provided, all impacts return isPossibleLocal as 0 so
that the local identifier...

b9b59d53a7a33cb158a6928559750545edb75d9f authored about 4 years ago

black

055be7f891cec86502edf7fb2225b68e65593186 authored about 4 years ago

signup model added, no migrations run

426b73bed30bf04399bf1f8e880e0ca1694a03d2 authored about 4 years ago

Recursive function bug fix

e0c67cb925176e42c6c2ad5be75488a58def90c4 authored about 4 years ago

Bug fixes

459d29e9d87e4619a95ffeea1513307719dea749 authored about 4 years ago

Breakpoint added to help debug

b417a63747070485e969b27e501f6df21f36452f authored about 4 years ago

Adding in working recursive function to populate isPossiblyLocal values

9714257e6a98daf6337f1f4fea26de40ef7dd9c5 authored about 4 years ago

Merge pull request #135 from ClimateMind/acyclic_climate_mind

Acyclic climate mind

3c86991ba7f7c1bf0674e8921c512d725f1e56f7 authored about 4 years ago

Merge branch 'develop' into CM240_task_272_localise_impacts

# Conflicts:
# Climate_Mind_DiGraph.gpickle

95da68f83b91f6df9859c449c1464e0a6e579298 authored about 4 years ago

Merge branch 'develop' into acyclic_climate_mind

# Conflicts:
# Climate_Mind_DiGraph.gpickle

2e4f7ae77a44133a84a646c433eb118eb93eef8c authored about 4 years ago

Black

2c9dfd09b279047620155901f35ba1f45174396a authored about 4 years ago

new_acyclic_functions

784ef2d3fb22fcc0c008862df603d96af65a046d authored about 4 years ago

recursive function incomplete, postal code checking & adding lrf data complete

af20fd5be3006830168f13b63164a0739470f31c authored about 4 years ago

make_acyclic function

e2fb37c957c3ecd09f9d056951daebefd3bd5923 authored about 4 years ago

Merge pull request #134 from ClimateMind/develop

CM-338 image upgrade for test ontology impacts

ae4141b68b7e203e71d946b1f43c2155c1905168 authored about 4 years ago

Merge branch 'master' into develop

11abbf1018ad4df051e86e9ab65ade3e7cf74f20 authored about 4 years ago

Merge pull request #133 from ClimateMind/CM-338-better-images

CM-338 test ontology upgrade with better images

6365acd98a67e10b66efe11b8aa506478fab9395 authored about 4 years ago

Merge branch 'develop' into CM-338-better-images

# Conflicts:
# Climate_Mind_DiGraph.gpickle

84e1f2d9fa3f740ef67a4bec6f893581472247c0 authored about 4 years ago

Merge in develop

973f5e53ffd3ca339b6f5ecd1194ae3ae98982e5 authored about 4 years ago

test ontology upgrade with better images

0732dc24fa3f3d66513b4a4502c5c38551b47466 authored about 4 years ago

Merge pull request #132 from ClimateMind/develop

CM-345 add sources to solution feed

1114d75f1b3920c9a7e421c0edbf50d2123fee18 authored about 4 years ago

Merge pull request #131 from ClimateMind/CM-345-add-solution-sources

Adds solution sources to /solutions endpoint

e842b3434e204f9f6de1813f954e8a77a366cd03 authored about 4 years ago

Merge branch 'develop' into CM-345-add-solution-sources

b1487c8dba43a03a9cb34e8c91c6bc0477f6ce59 authored about 4 years ago

Adds solution sources to /solutions endpoint

37a49b0cc92b54625a441152bb75cdda80efc6b2 authored about 4 years ago

Merge pull request #130 from ClimateMind/develop

CM-342 fix for missing impact sources

507756c9b969c567ed84c18500ed7d9291a543d8 authored about 4 years ago

Merge branch 'master' into develop

46cd1cf68ca45c264b753fd92e91b526c33c37ae authored about 4 years ago

Merge pull request #129 from ClimateMind/CM-342-missing-effect-sources-bug

Missing effect/impact sources bug fix CM-342

3473e95980336aab3acbaa6005b4ebcc3ff0ccd0 authored about 4 years ago

Black

55ceaefc2fa86f521f69e45090060681d5cd7882 authored about 4 years ago

Missing effect/impact sources bug fix

* new networkx object that has the missing effect/impact sources

45c0512e312cde3dd5cf807052d445f48fe1e549 authored about 4 years ago

Merge pull request #127 from ClimateMind/develop

version 0.5

f6758631a25aa7a8b6c8259d3d82cbec8d3ab248 authored about 4 years ago

Merge pull request #124 from ClimateMind/CM-340-remove-duplicate-solutions

CM-340 removing duplicate solutions from solutions feed

138ece09c5b40f7d4114b1cecaf566a637528cc9 authored about 4 years ago

Merge branch 'develop' into CM-340-remove-duplicate-solutions

0443fa3ed92152b2a3160a4221e82a81e81a241a authored about 4 years ago

Merge pull request #125 from ClimateMind/CM-290-bug-fix

CM 290 bug fix

b0a6a6bd19755101be6c03a5259ff28ade08a85e authored about 4 years ago

Merge branch 'develop' into CM-340-remove-duplicate-solutions

40bb5f2e03fa65e91cd23b06fb270c8e90eee037 authored about 4 years ago

Merge branch 'develop' into CM-290-bug-fix

acaaaccd4f61e0190751171a098cc6389e46d9e7 authored about 4 years ago

Merge pull request #126 from ClimateMind/CM-77_defect_should_return_empty_list_when_no_iris

Cm 77 defect should return empty list when no iris

39355dbdc3c7764c07978ee9994a80abd91ef7e9 authored about 4 years ago

lint

872b09040ee9495f4c6aad9267f680fb040acd28 authored about 4 years ago

retrun an empty list when no myths

5b2e66baf7d2ab030775af0764335af3e166b3d3 authored about 4 years ago

corrected networkx object and breakpoints removed

f335bcbf40d70bd9bc13e96129fab465aa8ed9b5 authored about 4 years ago

Bug solution with breakpoints

d47d0f76ce80d643203f28244ddcb2270eecc53a authored about 4 years ago

CM-340 fix

8f87f7f4a985388cc96abc49b8a4700b06a5cb71 authored about 4 years ago

Merge pull request #123 from ClimateMind/develop

hotfix API Caching

3219aeb6eb410d4b012b068f9ad2a11ed7e97443 authored about 4 years ago

Merge pull request #119 from ClimateMind/CM-336-API-cache

Caching added CM-336

2e7d04afc9f35f4ffc053814a0205ede9d73d9a7 authored about 4 years ago

Merge branch 'develop' into CM-336-API-cache

a2f2dd061b11c259a9c0845fbe30aa02a5d09856 authored about 4 years ago

Merge pull request #122 from ClimateMind/master

update develop

c975800d09db73b81767484ccea5d85f4b88e85e authored about 4 years ago

Merge branch 'master' into CM-336-API-cache

df407dcc5dd8c5d9c0d29af7bafec252197c446a authored about 4 years ago

Merge pull request #121 from ClimateMind/CM-232-test-environment-deployment

activate deployment on develop branch

4ef77bbf12419b41ff90be5d96a6ec187a7d7b5f authored about 4 years ago

activate deployment on develop branch

4602401ffb748067ea3ea3b19a58984bca832cc4 authored about 4 years ago

Merge pull request #118 from ClimateMind/CM-232-test-environment-deployment

Cm 232 test environment deployment

8488fa863d1d0401de08c8f34740072e499b6d3d authored about 4 years ago

Ecosyste.ms: OpenCollective

github.com/ClimateMind/climatemind-backend