github.com/ClimateMind/climatemind-frontend commits

Merge pull request #332 from ClimateMind/CM-566_user_can_reset_their_forgotten_password

CM-566: User can reset their forgotten password

8b9d4f3a718f4e03bc6c23e3851e241278da107a authored over 2 years ago

Make api call conditionally

02b4edb6bac69530b175fcf94397c89c7980b7c6 authored over 2 years ago

Merge pull request #331 from ClimateMind/CM-566_user_can_reset_their_forgotten_password

CM-566: User can reset their forgotten password

c36270957c9b5328a8c6a20a550d9a58ff1b9075 authored over 2 years ago

fix linting issue

78312162dc16a99308f174f6c5faeeb6e46f0435 authored over 2 years ago

Include session in the password reset page

51c68bc93d4f0a52d451d337ffd16cadd39be6cf authored over 2 years ago

run prettier

d0567a45432b00a870c5a40d5c2ea5751b60576d authored over 2 years ago

fixed tests

40adc99644e623fa785ca906b746b59758304c8e authored over 2 years ago

CM-1071_intersection_of_ids_auth

7911748e2f1a4054e8c9f5b02ad47fec1c37ae21 authored over 2 years ago

Merge pull request #328 from ClimateMind/CM-566

CM-566: User can reset their forgotten password (Part 2)

0a4b8689269e4c225598a6d8bb27d9b7f57e06d5 authored over 2 years ago

Merge branch 'develop' into CM-566

0c8c6c7fe099acac5b586acda6c8d816bfcd448d authored over 2 years ago

Merge pull request #326 from ClimateMind/CM-1100_userb_no_thanks

User B No thanks button

75ac5c2407dd7230c62117c81ffd1e85351f65bb authored over 2 years ago

fix cypress test

041eaa7b424ba734ad09a322f49983594e51fa5b authored over 2 years ago

Merge branch 'CM-1100_userb_no_thanks' of https://github.com/ClimateMind/climatemind-frontend into CM-1100_userb_no_thanks

1680729b135f2835aee05c827f020afcbae46e1d authored over 2 years ago

Rename back button

f053925942f7067c8e74270a4694d4c01dc72d9e authored over 2 years ago

Merge branch 'CM-1100_userb_no_thanks' of https://github.com/ClimateMind/climatemind-frontend into CM-1100_userb_no_thanks

8ce9cecf79a3a73fe657511a97d4771053d2c370 authored over 2 years ago

Change text of back button

65e811c872543dbb1efce1d33dd249afdd9f0d34 authored over 2 years ago

Merge branch 'develop' into CM-1100_userb_no_thanks

b2c6ea051a509928a0f5118043d954c9661396f8 authored over 2 years ago

fix merge issues with dev

8826bf9c4b9d069a1c6ec7478e0653bf9489756d authored over 2 years ago

Merge branch 'develop' into CM-1071_intersection_of_ids_auth

a3d0365f1a7852375465ef54f8442124810ec53d authored over 2 years ago

add useUserB hook with mega reset for landing page

b5734efa39ae348b0c4e043e57714c8903477e11 authored over 2 years ago

👺 ugly fix for re-login problem

f09f102b6797a9a19dfc5adfa5d11f73ee9fb0b3 authored over 2 years ago

Move refresh token login to so only called on app

load.

eb3e0f773053e6110306eeed17be02dee632fda2 authored over 2 years ago

run prettier

cc1593da64f9ceec1ff7d03753ab259c1324ec6f authored over 2 years ago

fixed tests to mock useLocation

843ef9a92c978d7d924d39b2e24e9125b558f089 authored over 2 years ago

run prettier

7cef9b5b88034c0123a192a9663734b348f855a7 authored over 2 years ago

CM-1102-user-b-makes-account-from-link-after-conversation

* Added location and state to user B path to keep track of conversation ID

* Changed route for ...

c64fcedbfaaee3c65a3da7611f19da2d5abf3f17 authored over 2 years ago

Merge branch 'develop' into CM-566

7f69787e376c0a0b7cfc739672f28a0cd0c9c8ed authored over 2 years ago

Merge pull request #329 from ClimateMind/scores_endpoint_bug

Fix bug: scores endpoint

0d0421db9b4ce7bdb4c53771e648626e484c1626 authored over 2 years ago

Merge branch 'develop' into CM-1100_userb_no_thanks

bc461f127f597a7050e05e844509abd1b3740899 authored over 2 years ago

adapt post scores headers

28ec24f4eaeeb09fa394e8d8bcaa8af319a0a50a authored over 2 years ago

Merge branch 'develop' into CM-566

b3c57d335286a0a947aa10ebe70b20ffbafe1c6d authored over 2 years ago

fix linting issues

e52a21cbfc7e0c33dc7472fba8e1e307be0745c2 authored over 2 years ago

last adaptions

0c60892f1b9961842890101a640ef28799eeefc1 authored over 2 years ago

run prettier

95e844499d658e5a259e68e7c8a248f62c3df9d8 authored over 2 years ago

Implement the reset password endpoint

3ed4efd27ca6725fde5bed4611d30cdae5e49840 authored over 2 years ago

Implement form to reset password

73f54d350fad7823686d5180ec950bdf9671989f authored over 2 years ago

Prepare page and api call to check if link is expired or not

cfeaf5b56b8e22154b20a0cd5e9190cc5efc18a5 authored over 2 years ago

Merge pull request #322 from ClimateMind/CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard

CM-1076: Email links user to login and routes straight to conversation dashboard

40b5612e6446e972a76cf4bebe3dd4fa6c87382d authored over 2 years ago

Merge branch 'develop' into CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard

e0577a532458a652db9e5fc9d1730f35567f55bf authored over 2 years ago

Update unit tests

dfb92ac31a39e1e14a5b03c87d36af0d7842ff73 authored over 2 years ago

Merge pull request #327 from ClimateMind/enter_should_not_open_form

Pressing enter shouldn't open the reset password form

1bbf8e1258f858f1c45b80424d7a3e4267cde75c authored over 2 years ago

fix the problem

8be8516f8da4bb5bcdeb1b12836033cf4b56e74a authored over 2 years ago

remove only in test

631a08c742d94f716b52fc1f191a38029ca49697 authored over 2 years ago

add test for the button

0848a4c0f50bcc6ec1720c1db28f369733eb1edd authored over 2 years ago

Merge branch 'CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard' of https://github.com/ClimateMind/climatemind-frontend into CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard

60c0ddc1e18bb3a170ce8b20ffe1ded9b9dc0dca authored over 2 years ago

rename useQuery hook

61ce71e636b1214b7ff5281696e9de2eb216e3e5 authored over 2 years ago

Refactors & update conversation tests

3e014c34c62650a601b75448e1f7bf4058ca4620 authored over 2 years ago

Merge branch 'develop' into CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard

5baf3dc094475d453b249855093f0a5d0674466e authored over 2 years ago

Impove_cypress_login (#325)

Update the cypress login command so that it mocks the refresh endpoint rather than user ui to lo...

c46404740d6ad72d5b9d307fb146f3a2b35e39cc authored over 2 years ago

remove unneeded login command

b044c868ae0c45da814c9b82849c17fb392e74a8 authored over 2 years ago

Update cypress tests

20b516b715ec72e024dc06417216b4a65eb20e39 authored over 2 years ago

comment out test

9fdd4d7285bb33dcddba865a51271cd9a2c38f98 authored over 2 years ago

fix react tests

bce51d7b4fb644b15e9c195ef2fa52c0ce48e5c7 authored over 2 years ago

fix react test

e36e741a4046bf7bb780f70fbeb64b4611dcfd96 authored over 2 years ago

fix import for useLocation

dd4163d77bef2393ce659df028b15d7e6f140db2 authored over 2 years ago

run prettier

d242acc1fd318db3f40c90870a49cc846451ff76 authored over 2 years ago

fix merging issues

0cd5bf7f572402888a2dc218952f8980101b93cb authored over 2 years ago

Merge branch 'develop' into CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard

164939a390c6159e9ce784be463174efaa0b78c0 authored over 2 years ago

Merge pull request #324 from ClimateMind/CM-1087_redo_better_navigation_from_convo_screens_to_convo_dashboard

CM-1087: Redo better navigation from convo screens to convo dashboard

7a1b577e58b485745c21420c10ee67abe250e98e authored over 2 years ago

run prettier

f7cc7f27860e98c99e320bc7b559f03548bfdee4 authored over 2 years ago

Merge branch 'develop' into CM-1076-email-links-user-to-login-and-routes-straight-to-conversation-dashboard

e3cbc305afc0e06b78b4f5c6b85f7043a03ea572 authored over 2 years ago

Merge branch 'develop' into CM-1087_redo_better_navigation_from_convo_screens_to_convo_dashboard

e9adb74054c878804afd072414cb184007d11aa6 authored over 2 years ago

Merge pull request #319 from ClimateMind/CM-566

CM-566: User can reset his forgotten password (Part 1)

dfe21aaf321d3f4b8b881116798ac0054bfbbef3 authored over 2 years ago

fix cypress test

97bf622fd62aef15a5b604bb6aa045722f373baa authored over 2 years ago

fix cypress test

6d4429de1c5bf3e1e34cfe94f2f9e8273c9c4865 authored over 2 years ago

fix test

213aa68ea99294fd2e4733ff81d78f9c62076fa7 authored over 2 years ago

Fixing linting issue

d30cefb9dc5e45c62a45b6cc946c17953f52f579 authored over 2 years ago

revert changes made to mockServiceWorker.js

001c3c4c99d001180928896c4876d7c9d4f25a8b authored over 2 years ago

revert changes made to mockServiceWorker.js

9558a833680c8e603ed8361f5160f1b93a7821d5 authored over 2 years ago

run prettier

8358e4e5f85c822ac3059e00c41901f59ea16d83 authored over 2 years ago

Implement the feature based on the last branch

69c1fd30651f034ae1ead599a2b36559a292d26f authored over 2 years ago

run prettier

3531b59cf67eef4698fabff38bf3a51b83b75c14 authored over 2 years ago

show conversation card when logged in

308935ec2fdf31d837972ffd0cdfb6ab8142ab7a authored over 2 years ago

Revert "CM-1087-better-navigation-from-convo-screens-to-convo-dashboard" (#320)

302a59d82fffe7de71d9f37fead3145ffa4fa74d authored over 2 years ago

Merge pull request #318 from ClimateMind/CM-1087-better-navigation-from-convo-screens-to-convo-dashboard

CM-1087-better-navigation-from-convo-screens-to-convo-dashboard

f023b88c19dbe01bd3b990c7e859a1aa8de55031 authored over 2 years ago

Fix typo

f52d0ffd6e3c121b22d4216ccb145a129efc3b8e authored over 2 years ago

Run prettier

89e904a7c153bab134830145e50666b3d3f38f83 authored over 2 years ago

Merge branch 'develop' into CM-566

48053b377007ad895292701c399f2dce9b008b0e authored over 2 years ago

Revert "Merge branch 'develop' into CM-1087-better-navigation-from-convo-screens-to-convo-dashboard"

This reverts commit 9adeae4e31fd79195573eb611c3980edb0e0dc47, reversing
changes made to d988c817...

b0509501097984265d49f9aa710d9ed6a3f477ff authored over 2 years ago

Add cypress test

7462d734de46e7d3082bbec10e8c034b1b21f8b3 authored over 2 years ago

Merge branch 'develop' into CM-1087-better-navigation-from-convo-screens-to-convo-dashboard

9adeae4e31fd79195573eb611c3980edb0e0dc47 authored over 2 years ago

add cypress fixture for reset-password

eef80d5f2ac5e97b24ea07387285e3206545a963 authored over 2 years ago

Fix prettier issue

a73c2bc5709f1d8f2443bb6291ed9d0db2468577 authored over 2 years ago

Remove withCredentials

b6448efaa5b2f0457e121c6276e69e09a570e9d9 authored over 2 years ago