This file contains hidden or 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
| diff --git a/medley/grids/models.py b/medley/grids/models.py | |
| index f24ce55..a30e147 100644 | |
| --- a/medley/grids/models.py | |
| +++ b/medley/grids/models.py | |
| @@ -992,7 +992,8 @@ class Slot(models.Model): | |
| # NB This should hit the cache populated by a prior | |
| # call to Layout.fetch_content_object_results() | |
| results = get_results_by_guid( | |
| - get_guid_uri(self.content_object) | |
| + get_guid_uri(self.content_object), |
This file contains hidden or 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
| run: | |
| med d janrain_settings | |
| then: | |
| add these site settings: | |
| janrain_backplane_version 1.2 (None) www.local.ajc.com:8000 | |
| janrain_backplane_bus_name coxmediagroup-dev (None) www.local.ajc.com:8000 |
This file contains hidden or 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
| diff --git a/usaspending_api/api_docs/api_documentation/search_filters.md b/usaspending_api/api_docs/api_documentation/search_filters.md | |
| index 1e70c081..d4039ee9 100644 | |
| --- a/usaspending_api/api_docs/api_documentation/search_filters.md | |
| +++ b/usaspending_api/api_docs/api_documentation/search_filters.md | |
| @@ -103,6 +103,13 @@ Keys in a location object include: | |
| "keyword": "example search text" | |
| } | |
| ``` | |
| +OR | |
| +``` |
This file contains hidden or 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
| diff --git a/usaspending_api/api_docs/api_documentation/search_filters.md b/usaspending_api/api_docs/api_documentation/search_filters.md | |
| index 1e70c081..d4039ee9 100644 | |
| --- a/usaspending_api/api_docs/api_documentation/search_filters.md | |
| +++ b/usaspending_api/api_docs/api_documentation/search_filters.md | |
| @@ -103,6 +103,13 @@ Keys in a location object include: | |
| "keyword": "example search text" | |
| } | |
| ``` | |
| +OR | |
| +``` |
This file contains hidden or 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
| diff --git a/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md b/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md | |
| index ee1613dc..1eb75c8a 100644 | |
| --- a/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md | |
| +++ b/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md | |
| @@ -7,7 +7,7 @@ This route takes keyword search terms and returns awards where a certain subset | |
| ### Request | |
| fields: An array of string column names to return. See Fields list below. | |
| -filters: An object with `keyword` and `award_type_codes` keys. `keyword` should be a string that you are performing a keyword search operation with. `award_type_codes` is an array of strings of the award type codes that should be searched within. | |
| +filters: An object with `keywords` and `award_type_codes` keys. `keywords` should be an array of strings that you are performing a keyword search operation with. |
This file contains hidden or 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
| diff --git a/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md b/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md | |
| index ee1613dc..1eb75c8a 100644 | |
| --- a/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md | |
| +++ b/usaspending_api/api_docs/api_documentation/advanced_award_search/spending_by_transaction.md | |
| @@ -7,7 +7,7 @@ This route takes keyword search terms and returns awards where a certain subset | |
| ### Request | |
| fields: An array of string column names to return. See Fields list below. | |
| -filters: An object with `keyword` and `award_type_codes` keys. `keyword` should be a string that you are performing a keyword search operation with. `award_type_codes` is an array of strings of the award type codes that should be searched within. | |
| +filters: An object with `keywords` and `award_type_codes` keys. `keywords` should be an array of strings that you are performing a keyword search operation with. |
This file contains hidden or 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
| diff --git a/.travis.yml b/.travis.yml | |
| index 7fc7455b..2e605fe7 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -24,7 +24,6 @@ before_script: | |
| script: | |
| - flake8 | |
| -- pytest --cov=usaspending_api | |
| - python manage.py migrate |
This file contains hidden or 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
| diff --git a/.travis.yml b/.travis.yml | |
| index 7fc7455b..2e605fe7 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -24,7 +24,6 @@ before_script: | |
| script: | |
| - flake8 | |
| -- pytest --cov=usaspending_api | |
| - python manage.py migrate |
This file contains hidden or 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
| diff --git a/.travis.yml b/.travis.yml | |
| index 7fc7455b..2e605fe7 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -24,7 +24,6 @@ before_script: | |
| script: | |
| - flake8 | |
| -- pytest --cov=usaspending_api | |
| - python manage.py migrate |
OlderNewer