github.com/ClimateMind/climatemind-backend commits

Merge branch 'develop' into CM-882-CM-892-get-shared-impacts

35f1ba18787ef3d4b58b10957ecc046cfa11a4c9 authored almost 3 years ago

removed breakpoint

349a686daaf57f9c9b5318fb29e4538d741c4e9d authored almost 3 years ago

added get shared impacts endpoint

9afd2a2bb4432e88af89f347e9b57c8f6f842b25 authored almost 3 years ago

Merge pull request #284 from ClimateMind/CM-865-CM-919-get-alignment

Cm 865 cm 919 get alignment

326b8d6c710cf7cfefad9fece10ed9a91390cf84 authored almost 3 years ago

Merge branch 'develop' into CM-865-CM-919-get-alignment

1fa9cb955c7dbb5b13b992e3ca2cb488555f5966 authored almost 3 years ago

attempting to solve merge conflict

4d9c6867107ed45cb33b3f1af7be68c49c8a6473 authored almost 3 years ago

Added app/static/Climate-Mind_bundled.yml

21b2dda22463285f139186a69d7db536b89d446d authored almost 3 years ago

starting commit

10320e2ce0e3767eba274009d465778470bd0745 authored almost 3 years ago

Merge branch 'develop' into CM-865-CM-919-get-alignment

d81527c2346165b8201d6cce50e9b808d209c4f4 authored almost 3 years ago

added missing import statement + changed top value to come from db rather than sorted dict

8466099c544790fcbc64ec1f8d2fcc74cc1c4700 authored almost 3 years ago

Merge pull request #283 from ClimateMind/CM-980-982-post-user-b-event

Cm 980 982 post user b event

2045d5e79d0e7ff623a3ffa197587df2a9dc54e8 authored almost 3 years ago

Merge branch 'develop' into CM-980-982-post-user-b-event

2a26fe642dfaaab8adf4c3c4f95fdd262d6f9b42 authored almost 3 years ago

updated get conversation docstring to mention conversation uuid validation

da1b23cf2179d2f119235c7f2568d575ecde01ba authored almost 3 years ago

Merge pull request #282 from ClimateMind/CM-980-981-refactor-get-conversation

session uuid validation and analytics tracking removed from get conve…

4bb515fec3e6619fb569fcd1485bfd3d0e9f27e2 authored almost 3 years ago

Added docstrings

2c1f0cc31802f2c92bb4d9913b06f3b62c8b168e authored almost 3 years ago

Fixed field names in response

19f8b0896800f483588d028b4dd62abab109b095 authored almost 3 years ago

Formatted with black

ca521239c85c33bd8db55387cc6fbb3fd3ef9ff7 authored almost 3 years ago

Updated GET alignment_scores in line with stoplight

72d2c93b5dce57a75964b12743f1e8b8e1e9cccd authored almost 3 years ago

added post endoint for user b analytics logging/event tracking. edited docstring for get conversation to reflect changes

5fd33b63a3ee10f19933d311f5b1eaef19ef3b54 authored almost 3 years ago

session uuid validation and analytics tracking removed from get conversation endpoint

22bd9669a04b1e3933424c6335adf215c5379f86 authored almost 3 years ago

Partially implemented response data

77a510044c9604f7423d425ce1d49a311851e523 authored about 3 years ago

Merge branch 'develop' into CM-865-CM-919-get-alignment

7f7e1787ba54b4c5f56e210c27305d1000390ca2 authored about 3 years ago

Merge pull request #280 from ClimateMind/CM-865-CM-965-post-alignment

Cm 865 cm 965 post alignment

f773e907049e44fba216cca7cc0ee8d6a8ca25b1 authored about 3 years ago

Added alignment scores get endpoint (with empty response)

d44147f93e08b4551014374a54acea5292dbe3c3 authored about 3 years ago

fixed imports, edited alignment scores to values under 1 for conversion to percentages later

224c3ab79b276c1afcc04a9b8557e313b73385e3 authored about 3 years ago

Moved code and fixed imports and typo

*Moved all of Yasmine’s user_b code to the app folder.
*Fixed import errors in alignment and con...

5a0d435df82530b7b23eef8aaa7d8bb3a6229ae2 authored about 3 years ago

Merge branch 'CM-865-CM-965-post-alignment' of https://github.com/ClimateMind/climatemind-backend into CM-865-CM-965-post-alignment

d03cfab56928d083281d2402f96b4b3c08e6a4b8 authored about 3 years ago

post alignment endpoint updated, data saved to db, analytics tracking, dummy functions for calculating alignment scores and feed

e60ea91a9fdc4d4ecccef2e87798959734e79fd8 authored about 3 years ago

Merge pull request #279 from ClimateMind/develop

update

00121a7055117cda5664e66bbbb332ba147e0a4c authored about 3 years ago

Merge branch 'CM-865-CM-965-post-alignment' into develop

0c5be184cce85f1a01196a859828d82949cf90aa authored about 3 years ago

Merge pull request #278 from ClimateMind/CM-977-get-conversation

get single conversation endpoint created

c9f42d793ca536f57b21c76d6c6e49a7f2d546f2 authored about 3 years ago

Merge branch 'CM-977-get-conversation' of https://github.com/ClimateMind/climatemind-backend into CM-977-get-conversation

050eceaa4d83c9ce03038f2bd9006c1c3a1f6fc6 authored about 3 years ago

requested docstring edits, changed event types for solution and effect choices to uuids

b13dd11fabdbf74340ee580ed6a3c4afd561a324 authored about 3 years ago

Missing documentation

db126a764af287915fc0d56e4b0259ff735eef3b authored about 3 years ago

removed breakpoint!

fe4bc4838c23d9866b86fd43b141b9d34dac1d7f authored about 3 years ago

changed not found to 404, added session id check, added analytics event logging

313b81452d77090917ea6223da22ea842c0f792e authored about 3 years ago

get single conversation endpoint created

ec4e3c8e50f061a1bc68350d7b6ad76a760767a8 authored about 3 years ago

Merge pull request #277 from ClimateMind/CM-973-V2-DB

migrations complete for local, test and prod db

ebddb2df9fb0181c097aa23a2a938c0493b90919 authored about 3 years ago

Merge branch 'develop' into CM-973-V2-DB

fdb3abaaace1d4a076d9ab3265591f9afbb5163b authored about 3 years ago

migrations complete for local, test and prod db

08895fd6008b9a634a24c912b1fbd11f72ed09bc authored about 3 years ago

Merge pull request #276 from ClimateMind/CM-969-adjust-name-length-requirements

Cm-969 changed name length requirements for registering users and for inviti…

cb7ab6f4b9ad203e747350f1e3becccbc67ce8bb authored about 3 years ago

Error message update to match backend message

8c01931832b0924d71eee4a7d2c26851804943e7 authored about 3 years ago

Updated test condition message

1e5b2094687a635fb9fd8a4034d31a51c26cc87a authored about 3 years ago

Updating tests to match backend requirements

aca742b7b4c3966dc431efa5870bab36ccbeb642 authored about 3 years ago

commenting out migrate command

65b62b5ed1f0ca21123781c04fbd39189ddd2dea authored about 3 years ago

added minimum 1 character

3740c0d8139279798b07f2fd95be5d300fd9ec2e authored about 3 years ago

changed name length requirements for registering users and for inviting user b - name <=20. error messages updated

10f9b53d2f6738d019a05a1d7b7f1aa1bc94a2d6 authored about 3 years ago

post alignment endpoint created

bca8016ee220b2d42d9976932038f0d6877d1eb2 authored about 3 years ago

Merge pull request #274 from ClimateMind/CM-925-927-copy-changes

order changed to reflect desired order in the frontend with correct i…

50f613c138364d39696b6f93abf2cbfe179ee24d authored about 3 years ago

order changed to reflect desired order in the frontend with correct id/value pairings. note that ids in json file are intentionally not in numerical order

c0dac459bf092f8c7860b7c4e3f728fdab2dbcad authored about 3 years ago

Merge pull request #273 from ClimateMind/CM-925-927-copy-changes

reversed order of set 1 questions

c17cb37f2ef9c8aae775347738bb4741f280ccc1 authored about 3 years ago

reversed order of set 1 questions

0abd6a7f611dd360f78833f6797e32f469e50865 authored about 3 years ago

Merge pull request #272 from ClimateMind/CM-925-927-copy-changes

updated set 1 questions with shorter/simpler text

869ac215804d954e5e6cf8004d669622f0aee71e authored about 3 years ago

updated set 1 questions with shorter/simpler text

115791ab81cf38c24e14539648db665ed7e38b6a authored about 3 years ago

removed cookie secure false, so only cookie secure true remains, added cookie_samesite None

89de93dbb2393c9775d6ca7ea1a5bfa977c0319e authored about 3 years ago

Merge pull request #271 from ClimateMind/CM-873-user-loses-feed

CM-873 User loses feed with refresh

41769a26a0a3d8dbb6201d7ef48daf9208a7c75a authored about 3 years ago

reverting test changes

64dd1e75dbc4cc9a37714f32580c22a0b4817039 authored about 3 years ago

fixing issues with refresh

f3b1b06e4da7e3f40700487be912d15b6a0641c4 authored about 3 years ago

Revert "added jwt cookie secure to try to fix chrome refresh bug"

This reverts commit 6bf5201bd6c712eb240bcbcad1f7e235ecc51426.

f3e199fc8977c9148698bc16322c633114cc5843 authored over 3 years ago

added jwt cookie secure to try to fix chrome refresh bug

6bf5201bd6c712eb240bcbcad1f7e235ecc51426 authored over 3 years ago

Merge pull request #269 from ClimateMind/cm-877-gunicorn-for-production

Cm 877 gunicorn for production

8ee12c8747e6eebb2da80900d87016a7d45177fe authored over 3 years ago

Merge branch 'develop' into cm-877-gunicorn-for-production

714b7b9bd7905d61cf4ad969a006fe4ae5389bbe authored over 3 years ago

Merge pull request #268 from ClimateMind/CM-817

CM-817 Building the scaffold to run pytest

cf033a1ec59f2db46e21345bf2d34fdd02051571 authored over 3 years ago

updating permissions

295fb0a768d3f288f12a9ec63fbba8151fe6cc8e authored over 3 years ago

testing

cc25e5ef79c03e4fde8c9820d9b360f0b862a79f authored over 3 years ago

adding entrypoint.prod

4cabbe698f054ef9b10caf2d7efd900923c5fbcb authored over 3 years ago

fixing formatting

2b8816a8216387ea36ef5b9f4b479adccf46ccf2 authored over 3 years ago

adding permissions to user in prod file

1d9794c0a95f609ff35b4830776c79d37b3415b7 authored over 3 years ago

fixing broken build command

a150604354cc6759b8570d871dc4e37833d0c9ac authored over 3 years ago

updating config & docker files

e880505b55303fad76bf89667d469193d93149d8 authored over 3 years ago

adding prod build

3415608d380071951247b9dd28ba2a5c4b94da20 authored over 3 years ago

config again

671117b67a2af73dbee672f10e42d9f49ba1a2e4 authored over 3 years ago

updating config

4f9e6d04e92542d085e3a15382accb4bc1e6fb1d authored over 3 years ago

updating config

6cd2a0d71ecaf990a8495ff7e87debbef9c2c09b authored over 3 years ago

updating config

5247801fa9cdabdfa58ad9c3b8baef4afaebe740 authored over 3 years ago

testing gunicorn

d52462485870fbae7f806eb89e07d2ff89b4f495 authored over 3 years ago

updating circleci config to use prod version

b1d5e895009de889d06f84d7949a2195f9436695 authored over 3 years ago

Use Dockerfile.prod in docker-compose.yml

561b9f0e5640a2bada1ee1bcd2cfedbc2ea9a8e6 authored over 3 years ago

Circleci uses production version of app

a6d89f13420c216bd52edf6d597b3a75ebcf96c5 authored over 3 years ago

Combine entrypoint scripts to single version

236a70d8cbd2ecc9edfb12a03a23de27ca8a8789 authored over 3 years ago

fixing linting issues

0b64cd0dcacc2c2e9dda975af583b7d7ecccb175 authored over 3 years ago

solving conflicts

480d9a76cf68de433f18bf622ffc481dffbaf37d authored over 3 years ago

creating the test file

0c59a80097b42757d4e2dd600a8fe3a542c5428c authored over 3 years ago

Merge pull request #255 from ClimateMind/CM-567-Users-can-update-email

user can update email - new email endpoint

5d9877cf60a57e318f200af7746a77afd8a0d726 authored over 3 years ago

swapped order of checks to update email

29450c92fe5c19edf93a8ad0f2cc024d90b6c301 authored over 3 years ago

lint

75bc4795672129f9801dc3bc2a648d7d8f0d418a authored over 3 years ago

testing prod config

0dc67915dff109e9ad805e03df920601daa89f1e authored over 3 years ago

lint

db36363df55747df1825db1196c7a350f2c934d2 authored over 3 years ago

checking if removing effing´breakpoint restores cypress

dbab2e8faa0316ae2b2f20781cb6a97020c7ab84 authored over 3 years ago

checking cypress is restored

3fb1237f864f8ae1a6f4344a30647868de22f01e authored over 3 years ago

shorter delay

d18105d3453a9c51b770556d25bf447f4a04bfe5 authored over 3 years ago

adding 1 minute wait to cypress

8afe95f2f378faa915561b85da9949a2a1dc2dae authored over 3 years ago

debugging cypress

247a68aa000d0f3a955215e1a873903751d851db authored over 3 years ago

testing if circleci will pass with .first() rather than .one_or_none() in email uniqueness checks

18b5c82a3d3b8f0e6df374970cc3660984888a98 authored over 3 years ago

changed error code back!

822b9d7511f22b44dedf88297ed14896613a3c23 authored over 3 years ago

edited incorrect error code in cypress

e510c6d6a7ba02984e94db74e97e24cafaec213b authored over 3 years ago

edited error code in second place where need to update cypress

a048181a2dc947454dde20b0b19b00b4ede3350c authored over 3 years ago

changed cypress error code for email already registered

c62595f98e8c318840880ab35f00247a17a55dc4 authored over 3 years ago

small edits to error messages to standardise code

9cf703e3a9bea6a3fd711e4524db399883e37d95 authored over 3 years ago

Debug email tests failing on circle ci

Debug email tests failing on circle ci

307a8bbb8c9473f8b94c59c38cad8a07b0990438 authored over 3 years ago

Ecosyste.ms: OpenCollective

github.com/ClimateMind/climatemind-backend