forked from OpenUpSA/wazimap-ng
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix commit history with upstream #12
Merged
Merged
Changes from all commits
Commits
Show all changes
293 commits
Select commit
Hold shift + click to select a range
617af71
Merge pull request #366 from OpenUpSA/enable-email-configuration
jbothma 286bd46
ordering variables
emre2038 7539ef1
Merge pull request #367 from OpenUpSA/include-profile-in-variable-option
jbothma c56d63d
Added validations to make sure user can only select version from vali…
goyal1092 315247e
Changed default version name according to review
goyal1092 504bdde
Added fixture for dataadmin
goyal1092 cf0ce7c
Merge pull request #353 from goyal1092/geo_version_tests
goyal1092 0ee93dd
Profile indicator UI changes
emre2038 faeb446
Fixed typo in unit tests
goyal1092 fbe90fd
fixed unit test
emre2038 81a1df9
Merge pull request #370 from OpenUpSA/staging
jbothma 31472d2
Merge pull request #369 from OpenUpSA/profile-indicator-ui-change
jbothma 57534a9
Merge pull request #368 from OpenUpSA/WNCM-246
goyal1092 5bbd1af
Merge pull request #371 from OpenUpSA/profile-indicator-ui-change
goyal1092 40dbc9f
Bump pillow from 7.1.0 to 9.0.1
dependabot[bot] 49f837f
Enable session authentication for DRF Api
goyal1092 86daec8
Clear version list if versions api throw error and show error message…
goyal1092 97cd7be
Updated dataset admin form to fix various breaking conditions
goyal1092 672e076
Added tests for admin and versions api
goyal1092 34944ac
Setting up selenium tests and wrting tests for dataset admin
goyal1092 a31a3ff
Change site header accoring to update
goyal1092 2d78014
Set connection max age to 0 for fixing issue in running selenium tests
goyal1092 1483b3d
Black formatting
goyal1092 db650d3
working on the ui changes
emre2038 e343fd6
merging WNCM-246 into profile-indicator-variable-selection
emre2038 87c7d96
Fixed spelling mistake
goyal1092 95323c3
Merge pull request #373 from OpenUpSA/WNCM-246
goyal1092 5c5c8cd
Bump django-tinymce from 3.3.0 to 3.4.0
dependabot[bot] 14ad34c
added tests
emre2038 4e61660
Merge pull request #380 from OpenUpSA/master
goyal1092 5234c22
wip
goyal1092 01882a2
wip
goyal1092 488a9ed
Merge pull request #381 from goyal1092/fix/wip
goyal1092 8adb49d
Fixed breaking CI
goyal1092 0831689
Merge pull request #382 from goyal1092/fix/wip
goyal1092 3dd2f86
Merge pull request #379 from OpenUpSA/staging
goyal1092 2c36363
Merge pull request #375 from OpenUpSA/profile-indicator-variable-sele…
jbothma a9a5604
Merge remote-tracking branch 'origin/master' into staging
jbothma 8cfc3a8
removing the selected variable option when profile or permission type…
emre2038 befa268
Send current instance to variable filter widget
goyal1092 32307e7
Fix out of memory issue for indicator data task execution
goyal1092 ad9903d
Fix failing tests after task update
goyal1092 f63421e
Filter dataset data by universe
goyal1092 44e5a84
Merge pull request #386 from goyal1092/WNCM-265
goyal1092 7a41f1b
Merge pull request #387 from OpenUpSA/master
goyal1092 561110f
bug fix & making it work with profile highlight and profile key metrics
emre2038 0bbef23
filtered private variables on backend
emre2038 a8f1d7d
Fix issue of universe not working
goyal1092 8093026
Fixed breaking test
goyal1092 064d150
validating indicator profile
emre2038 60c0692
show validations errors for uploaded file via admin panel
goyal1092 0ef33e9
Fixed breaking tests
goyal1092 029196d
Updated validation and queryset for variable filter widget
goyal1092 7b6426d
Fix issue of empty form when invalid indicator selected
goyal1092 936a9f2
Added tests and fixed saving empty form
goyal1092 43ab4da
Fixed issue in file upload after changing clean method
goyal1092 18ac856
Show all missing headers rather than returning one at a time
goyal1092 e5f99f5
Changed indicator fixture used in test
goyal1092 619591a
added automated tests
emre2038 5b9b4b8
Merge pull request #383 from OpenUpSA/profile-indicator-variable-sele…
emre2038 dc31e1c
Make indicator and geography unique together to fix issue of duplicat…
goyal1092 498926a
Merge pull request #391 from OpenUpSA/goyal1092-WNCM-327
jbothma adf319b
Merge branch 'master' into staging
jbothma 10bbd11
Merge pull request #390 from goyal1092/WNCM-240
goyal1092 ca7fd41
Fixed failing tests for file upload
goyal1092 c6e4891
Merge pull request #393 from goyal1092/fix/failing_test
goyal1092 37d79f1
Merge pull request #392 from OpenUpSA/staging
goyal1092 78963ff
Updated task according to review
goyal1092 75cb9e5
Merge pull request #389 from goyal1092/WNCM-332
goyal1092 428734c
Bump django from 2.2.24 to 2.2.28
dependabot[bot] 2ccd43f
Merge pull request #394 from OpenUpSA/staging
goyal1092 91820fc
removed mkdocs from requirements
emre2038 32de9f9
Fix timeout issue while saving indicator for first time
goyal1092 018df98
Change geography to autocomplete field for Indicator data admin
goyal1092 67081b9
Merge pull request #396 from OpenUpSA/removing-mkdocs
goyal1092 6c9c694
Merge pull request #395 from OpenUpSA/dependabot/pip/django-2.2.28
goyal1092 2d6e0a5
Merge pull request #376 from OpenUpSA/dependabot/pip/django-tinymce-3…
goyal1092 4d3a9e6
Bump ipython from 7.28.0 to 7.31.1
dependabot[bot] 162fbf3
Merge pull request #374 from OpenUpSA/dependabot/pip/pillow-9.0.1
goyal1092 07e0b41
Merge pull request #358 from OpenUpSA/dependabot/pip/ipython-7.31.1
goyal1092 aa4fbda
Merge pull request #398 from OpenUpSA/staging
goyal1092 0035953
validating the required headers
emre2038 8cd1889
Remove release step from review apps
goyal1092 941fe7c
Merge branch 'add-heroku-review-apps' into review_apps
35a7200
Added config to demo data hierarchy
goyal1092 84730e0
added unit test
emre2038 8b1388b
Merge pull request #397 from goyal1092/WNCM-328b
goyal1092 2608fd1
Merge pull request #401 from OpenUpSA/staging
goyal1092 87ac851
modified required headers of point data file upload and added tests
emre2038 106c071
Merge pull request #399 from OpenUpSA/points-column-feedback
goyal1092 fc31190
Merge pull request #400 from goyal1092/review_apps
jbothma e7c1f15
Merge branch 'master' into goyal1092-review_apps-into-master
jbothma dec7376
Merge pull request #402 from OpenUpSA/goyal1092-review_apps-into-master
jbothma 75832b0
Update demodata superuser password to be slightly harder to guess in …
jbothma 7d87701
Try automating loading demodata in review apps only
jbothma 2fba4af
Merge pull request #404 from OpenUpSA/real-review-apps
jbothma 6d9a3f8
Merge branch 'master' into master-into-staging
jbothma 2af7dc8
Merge pull request #405 from OpenUpSA/master-into-staging
jbothma 8648de5
wazimap-production.netlify.app to demodata profile
jbothma 6285a03
Merge pull request #406 from OpenUpSA/demodata-domain
jbothma 0876cde
Merge pull request #407 from OpenUpSA/demodata-domain
jbothma e49c721
Merge pull request #408 from OpenUpSA/staging
goyal1092 279752b
added chart type configuration
emre2038 488079a
Added chart type to indicator data serializer
goyal1092 b143d6a
moved chart type column
emre2038 f409abf
removed empty space
emre2038 bf47653
warning when line chart is selected
emre2038 75d532c
removed unnecessary logging
emre2038 a752898
Merge pull request #411 from OpenUpSA/ui-chart-type-config
emre2038 40d576c
added choropleth range selection dropdown
emre2038 ffe47cb
modified automated tests
emre2038 c90a940
Merge pull request #410 from OpenUpSA/ui-chart-type-config
goyal1092 5a3650b
Merge pull request #413 from OpenUpSA/staging
goyal1092 ef6a6de
Merge pull request #412 from OpenUpSA/choropleth-range-selection
goyal1092 c11205a
Merge pull request #414 from OpenUpSA/staging
goyal1092 14b5267
Added option for adding boolean for linear scrubber in profile indica…
goyal1092 08035ef
Sanitize location admin action name to ignore format strings
goyal1092 422cdfa
Profile highlight & Profile key metrics UI changes
emre2038 f779a96
Remove color field from profile category
goyal1092 5a732d6
Remove color from demodata
goyal1092 aa244c6
Change sunbindicator group link when variable is changed in linear sc…
goyal1092 5ba26de
Added selenium test for linear scrubber option in profile indicator
goyal1092 ab35b3e
Removed icon field from profile category
goyal1092 813847c
Check if groups exists before returning subindicator group
goyal1092 0b4f769
Merge pull request #415 from OpenUpSA/WNCM-407
goyal1092 3b73b51
Merge pull request #419 from OpenUpSA/staging
goyal1092 e4948fe
Added test for location admin actions
goyal1092 fc162e8
corrected the wording issues
emre2038 0f98e56
Fixed failing test
goyal1092 328ca06
Merge pull request #417 from OpenUpSA/WNCM-348
goyal1092 14aeeae
Merge pull request #416 from goyal1092/WNCM-447
goyal1092 b82ceb5
Merge pull request #418 from goyal1092/WNCM-300
goyal1092 77c0da4
Merge pull request #420 from OpenUpSA/staging
goyal1092 164df26
New Api end point to get data summary for datamapper
goyal1092 eb2f821
show catgeories only if data exist
goyal1092 8e9599c
Added test for summary api endpoint
goyal1092 4dd3294
Remove version from indicator child data for geography
goyal1092 0411530
Get version from profile indicator rather than profile hierarchy
goyal1092 499ab23
Added unit test for profile indicator child data api
goyal1092 94fa4b6
Removed unused logger
goyal1092 31fd550
Updated per indicator view accoring to review
goyal1092 4076bbf
Added datamapper summary api filters
goyal1092 9772c63
Fixed issue in test base
goyal1092 0c074db
Merge pull request #421 from OpenUpSA/WNCM-484
goyal1092 2b22d86
Merge pull request #422 from OpenUpSA/staging
goyal1092 8d95386
Updated summary api to include order and name
goyal1092 8233732
Fixed failing test
goyal1092 0400c5a
Initial big cleanup
jbothma 55cf42c
Changed variable name
goyal1092 8bd6d11
Merge pull request #423 from OpenUpSA/WNCM-277
goyal1092 d996be2
Merge pull request #426 from OpenUpSA/staging
goyal1092 02422d3
Added color field in point themes
goyal1092 562b8c9
Remove treebeard admin form from geography admin page
goyal1092 76c22a2
Move constants to a constants module for now and fix redis url
jbothma 481acfe
Stop pytest looking for django-configuration
jbothma fdba144
Replace str2bool which returns an int with django-environ
jbothma 1d188a7
Merge pull request #424 from OpenUpSA/WNCM-299
goyal1092 5d476bf
Merge pull request #427 from OpenUpSA/WNCM-495
goyal1092 f750aa7
Merge pull request #428 from OpenUpSA/staging
goyal1092 60ca765
Fix settings mistakes
jbothma 3cebf5f
Use a real cache backend for tests relying on working cache
jbothma c9e489f
Delete ancient way of disabling migrations and improve docs
jbothma 0626f5c
Selenium test for admin sortable widget applied in subindicator group…
goyal1092 c260248
Unit test for subindctor ordering in summary view
goyal1092 0a7707d
Fix template dir for extending admin templates
jbothma 8662eba
Make CONN_MAX_AGE 0 for dev and test so that connections die and test…
jbothma ec5cb8b
Fix q sync boolean and make it sync in test but async n dev
jbothma a4a7461
Fix accidental boolean env var
jbothma be89882
Add missing help text migrations
jbothma ba2da40
Don't change prod upload limit so we don't change help text
jbothma 41a2b1a
Removed sleep and added webdriver wait for subindicator group gui test
goyal1092 1fdd454
Merge pull request #429 from OpenUpSA/WNCM-500
goyal1092 7d89e63
Merge pull request #430 from OpenUpSA/help-text-migrations
goyal1092 4485c2a
Merge pull request #432 from OpenUpSA/staging
goyal1092 dc8f71d
added order property for category and subcategory
emre2038 3c20f9b
Merge pull request #425 from OpenUpSA/standardise-config
goyal1092 3ad23fb
Merge pull request #434 from OpenUpSA/staging
goyal1092 2ee9fb3
added automated test coverage
emre2038 bf38e11
Fixed bug in profile indicator admin initial save
goyal1092 dddc265
Added choropleth method
goyal1092 c4613a9
Merge pull request #433 from OpenUpSA/rich-data-ordering
goyal1092 c757b80
Merge pull request #436 from OpenUpSA/staging
goyal1092 6ff2061
updated selenium test
goyal1092 81e33be
Switch to new low cost instance types for review apps and ORM queue t…
jbothma cadcc4d
Merge pull request #435 from OpenUpSA/WNCM-509
goyal1092 eabbd35
Merge pull request #438 from OpenUpSA/staging
goyal1092 ae8721b
Updated dataset tests to include negative values
goyal1092 3c2c578
Remove redis properly
jbothma 5aa7a85
Merge pull request #437 from OpenUpSA/heroku-eco-mini-orm-q
goyal1092 15e15af
Merge pull request #441 from OpenUpSA/staging
goyal1092 7758ba3
Merge pull request #439 from OpenUpSA/WNCM-571
goyal1092 c8ad039
Merge pull request #442 from OpenUpSA/staging
goyal1092 039aad0
Don't retry tasks that fail
jbothma 8968945
Merge pull request #443 from OpenUpSA/dont-retry
jbothma e6e0c7e
Updated profile category api endpoint to show profile indicators
goyal1092 32bd89c
Bump werkzeug from 2.0.2 to 2.2.3
dependabot[bot] 0c7f067
Added id in category and subcategory for profile indicator summary
goyal1092 c401da8
Fixed failing test
goyal1092 e4e3820
Merge pull request #444 from OpenUpSA/WNCM-611
goyal1092 25b8709
Merge pull request #447 from OpenUpSA/staging
goyal1092 1781e2b
adding available filter groups to categories endpoint
emre2038 a5e3707
adding fields
emre2038 b62b11a
added group name and subindicators
emre2038 97c0591
removed unused import
emre2038 132610c
Merge pull request #448 from OpenUpSA/WNCM-682
goyal1092 9e12e3e
Set urllib3 version in requirements
goyal1092 533ffab
Merge pull request #451 from goyal1092/upgrade_urllib3
goyal1092 1cb6d3f
Merge pull request #449 from OpenUpSA/staging
goyal1092 6ad033b
adding content_search field and using it to search
emre2038 10ba8ba
adding trigger
emre2038 2960c69
working on trigger
emre2038 5483663
Updated migration for content serach vector field
goyal1092 9951e04
added unit tests
goyal1092 22d222c
Ability to search multiple params
goyal1092 9c64707
updated migration
goyal1092 29efa39
Enable partial keyword search
goyal1092 3357d89
getting points by distance
emre2038 bc1c01b
Update for getting distance between points
goyal1092 f21c78a
serializing annotate data
emre2038 f430b79
added theme to the serializer
emre2038 8615516
replaced lat and long
emre2038 18f3a6b
Change search type in geography search api endpoint
goyal1092 16d16da
Change search type in geography search api endpoint
goyal1092 1d8611e
Merge pull request #452 from OpenUpSA/point-search
goyal1092 2d2286b
Merge pull request #454 from OpenUpSA/WNCM-867
goyal1092 04ec271
pagination
emre2038 4ebbb8a
added category id
emre2038 2caee10
Merge branch 'master' of https://github.com/OpenUpSA/wazimap-ng into …
emre2038 e6a5792
Merge branch 'staging' of https://github.com/OpenUpSA/wazimap-ng into…
emre2038 f725977
Merge branch 'master' of wazimapng1-aws.openup.org.za:wazimap-ng-stag…
emre2038 e33fb41
Merge pull request #455 from OpenUpSA/staging
goyal1092 2feda02
added category name
emre2038 970a672
filter by profile id
emre2038 0af2812
added color
emre2038 0117e65
Fixed bug in updating contentes via admin
goyal1092 90102d9
Merge pull request #445 from OpenUpSA/dependabot/pip/werkzeug-2.2.3
paulmwatson c4705b6
change requests
emre2038 c989b44
Merge pull request #456 from OpenUpSA/WNCM-859
goyal1092 cae6441
Merge pull request #457 from OpenUpSA/staging
goyal1092 66d3eeb
updated query for fetching locations
goyal1092 99c7da1
Fix bug for dupplicate locations coming in api
goyal1092 60468fd
Added cache_page to URL with one hour expiry
paulmwatson 8436aae
Merge pull request #458 from OpenUpSA/feature/cache-profile-points-do…
paulmwatson 95af7a7
Merge branch 'staging' of wazimapng1-aws.openup.org.za:wazimap-ng-sta…
paulmwatson 8491a7a
Merge branch 'master' of wazimapng1-aws.openup.org.za:wazimap-ng-stag…
paulmwatson 597b15f
Added GUNICORN_TIMEOUT env variable to allow for configurable timeouts
paulmwatson c1f33ae
Merge pull request #459 from OpenUpSA/sys/increase-gunicorn-timeout
paulmwatson 2789e68
Add retry and timeout config to Q_CLUSTER to prevent parellel jobs
paulmwatson 71594f9
Merge pull request #460 from OpenUpSA/fix/overlapping-tasks
paulmwatson 176cb30
Merge branch 'staging' of github.com:OpenUpSA/wazimap-ng into chore/s…
DavidTheProgrammer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it mean this is run "somewhere" else or why don't we need it documented?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is part of the local run configuration that I'll be re-documenting. As for now, we don't need to actually run this command as we don't have static resources really, so it works fine without it.