Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into paginated_transfer_cards
* master: (28 commits) Adding blockchain_task_uuid index to worker messages (#551) Make location lookup look at existing users' coordinates as a last resort (#555) Add support for Commcare (#569) Improve external transaction detection (#570) Remove unused imports (#571) Celo integration (#535) feat: small improvements to accessibility across the web app (#562) Group by Sender and Recipient (#567) Enable multiple chains (#496) Silence loading spinner warning (#568) Custom attribute bugfix (#549) Antify Message Bar (#566) Stop retrying infinitely (#565) Only update BlockchainTransaction on the worker when we absolutely have to (#564) Make SynchronizedBlock be updated in batch instead of one giant update (#563) Hide Filters and Groups (#558) adding more colors to charts, and tweaking legends (#561) Chart Tweaks (#560) Recipients filter (#533) Dynamic transfer card loaded (#559) ... # Conflicts: # app/server/api/transfer_card_api.py # app/test_app/functional/api/test_transfer_card_api.py
- Loading branch information
Showing
167 changed files
with
3,262 additions
and
1,097 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -237,7 +237,7 @@ workflows: | |
branches: | ||
only: | ||
- master | ||
- catch_not_found_hash | ||
- fix-external-tx | ||
|
||
requires: | ||
- build | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
45 changes: 0 additions & 45 deletions
45
app/client/__tests__/functional/reducers/message/actions.test.ts
This file was deleted.
Oops, something went wrong.
52 changes: 0 additions & 52 deletions
52
app/client/__tests__/functional/reducers/message/reducers.test.ts
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.