Skip to content
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

Incorporate previously reviewed changes (for 2.021.24) #734

Merged
merged 372 commits into from
Jun 15, 2021
Merged

Incorporate previously reviewed changes (for 2.021.24) #734

merged 372 commits into from
Jun 15, 2021
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 28, 2020

  1. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    noliveleger committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    e98f778 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'kobokitten-py3-remove-extend-object' into kobokitten-py…

    …3-django2
    
     # Conflicts:
     #	onadata/apps/survey_report/views.py
    noliveleger committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    eba2e9d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d2c170a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3de0833 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1a51872 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7d32652 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0786d96 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    noliveleger committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    6c92276 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b413f54 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a99883a View commit details
    Browse the repository at this point in the history
  11. update: pip dependencies

    noliveleger committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    bb0a0e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2020

  1. Configuration menu
    Copy the full SHA
    70e445a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8fb9226 View commit details
    Browse the repository at this point in the history
  3. Remove GoogleDoc exports

    noliveleger committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    e926a07 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0a6c5a8 View commit details
    Browse the repository at this point in the history
  5. Removed CSV zip exports

    noliveleger committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    725780c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bbeab63 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d5910e6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    05f47cd View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2020

  1. Removed Analyzer export

    noliveleger committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    a1587e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    daa525b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4dff8d5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9ae11fd View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    32e7d91 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. Configuration menu
    Copy the full SHA
    eba116d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8eb8ed7 View commit details
    Browse the repository at this point in the history
  3. fixed form media tests

    noliveleger committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    603b180 View commit details
    Browse the repository at this point in the history
  4. Removed user settings

    noliveleger committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    e5fe0f9 View commit details
    Browse the repository at this point in the history
  5. Removed activity view

    noliveleger committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    56768a6 View commit details
    Browse the repository at this point in the history
  6. WIP: Removed obsolete HTML templates

    - tutorial
    - about-us
    - getting_started
    - faq
    - syntax
    - privacy
    - tos
    - resources
    - members_list
    - xls2xform
    - support
    - clone_xlsform
    - get_qrcode
    - mongo_view_api
    - public_api
    - set_perm
    - update_xform
    - enketo_preview
    noliveleger committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    ffe0747 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Configuration menu
    Copy the full SHA
    f3e9a2a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d32d1a1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    637651e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4ce30ce View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Configuration menu
    Copy the full SHA
    d3bf370 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Configuration menu
    Copy the full SHA
    cf16bc8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    19e1537 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9a85218 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    13e518f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    77e2a1d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. Configuration menu
    Copy the full SHA
    8281dab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f617ac View commit details
    Browse the repository at this point in the history
  3. Refactored "test_form_permissions" to "test_premissions", removed obs…

    …olete tests and updated the others
    noliveleger committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    4b83a39 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'kobokitten-remove-ui-CUD-actions' into kobokitten-remov…

    …e-ui-CUD-actions-unicode
    
     # Conflicts:
     #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
     #	onadata/apps/export/views.py
     #	onadata/apps/logger/views.py
     #	onadata/apps/main/forms.py
     #	onadata/apps/main/google_doc.py
     #	onadata/apps/main/google_export.py
     #	onadata/apps/main/models/__init__.py
     #	onadata/apps/main/models/google_oath.py
     #	onadata/apps/main/registration_urls.py
     #	onadata/apps/main/registration_views.py
     #	onadata/apps/main/tests/test_base.py
     #	onadata/apps/main/tests/test_form_api.py
     #	onadata/apps/main/tests/test_form_api_delete.py
     #	onadata/apps/main/tests/test_form_edit.py
     #	onadata/apps/main/tests/test_form_enter_data.py
     #	onadata/apps/main/tests/test_form_gallery.py
     #	onadata/apps/main/tests/test_form_metadata.py
     #	onadata/apps/main/tests/test_form_permissions.py
     #	onadata/apps/main/tests/test_form_public_api.py
     #	onadata/apps/main/tests/test_form_show.py
     #	onadata/apps/main/tests/test_google_doc.py
     #	onadata/apps/main/tests/test_google_docs_export.py
     #	onadata/apps/main/tests/test_style.py
     #	onadata/apps/main/tests/test_user_settings.py
     #	onadata/apps/main/views.py
     #	onadata/apps/sms_support/__init__.py
     #	onadata/apps/sms_support/autodoc.py
     #	onadata/apps/sms_support/models.py
     #	onadata/apps/sms_support/parser.py
     #	onadata/apps/sms_support/providers/__init__.py
     #	onadata/apps/sms_support/providers/smssync.py
     #	onadata/apps/sms_support/providers/telerivet.py
     #	onadata/apps/sms_support/providers/textit.py
     #	onadata/apps/sms_support/providers/twilio.py
     #	onadata/apps/sms_support/tests/__init__.py
     #	onadata/apps/sms_support/tests/test_base_sms.py
     #	onadata/apps/sms_support/tests/test_notallowed.py
     #	onadata/apps/sms_support/tests/test_parser.py
     #	onadata/apps/sms_support/tools.py
     #	onadata/apps/sms_support/views.py
     #	onadata/apps/survey_report/__init__.py
     #	onadata/apps/survey_report/templatetags/__init__.py
     #	onadata/apps/survey_report/templatetags/data_manipulation.py
     #	onadata/apps/survey_report/urls.py
     #	onadata/apps/survey_report/views.py
     #	onadata/apps/viewer/tests/test_data_view.py
     #	onadata/apps/viewer/tests/test_export_builder.py
     #	onadata/apps/viewer/tests/test_instance_view.py
     #	onadata/apps/viewer/views.py
     #	onadata/libs/authentication.py
     #	onadata/libs/utils/analyser_export.py
     #	onadata/libs/utils/google.py
    noliveleger committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    f3eeaa5 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'kobokitten-unicode' into kobokitten-remove-ui-CUD-actio…

    …ns-unicode
    
     # Conflicts:
     #	onadata/apps/sms_support/providers/smssync.py
     #	onadata/apps/sms_support/providers/textit.py
     #	onadata/apps/sms_support/providers/twilio.py
     #	onadata/apps/viewer/views.py
    noliveleger committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    004e80a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4817e4b View commit details
    Browse the repository at this point in the history
  7. Merge branch 'kobokitten-remove-ui-CUD-actions' into kobokitten-remov…

    …e-ui-CUD-actions-unicode
    
     # Conflicts:
     #	onadata/apps/viewer/views.py
    noliveleger committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    bf54251 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ee1fc40 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'kobokitten-remove-ui-CUD-actions' into kobokitten-remov…

    …e-ui-CUD-actions-unicode
    
     # Conflicts:
     #	onadata/apps/main/views.py
    noliveleger committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    1b72ee4 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    356523e View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Configuration menu
    Copy the full SHA
    85d2b4a View commit details
    Browse the repository at this point in the history
  2. Merge branch 'kobokitten-remove-ui-CUD-actions' into kobokitten-remov…

    …e-ui-CUD-actions-unicode
    
     # Conflicts:
     #	onadata/apps/main/views.py
    noliveleger committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    8009cdc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f46eb31 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    68dc905 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a075eda View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2020

  1. Configuration menu
    Copy the full SHA
    7744ef3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4185156 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d6f180 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fd07aee View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fb6619b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Configuration menu
    Copy the full SHA
    7deb24b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    020183a View commit details
    Browse the repository at this point in the history
  3. Removed several settings from base.py:

    - removed South Migration configuration
    - removed nose tests configuration
    noliveleger committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    9a6e7d2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1a168e7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    542a718 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. Configuration menu
    Copy the full SHA
    682dc70 View commit details
    Browse the repository at this point in the history
  2. Reorganized settings

    noliveleger committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    0cdddf8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5c3aaf1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0a02cac View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5a74dff View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cde9f0b View commit details
    Browse the repository at this point in the history
  7. Merge branch 'kobokitten-remove-ui-CUD-actions-unicode' into kobokitt…

    …en-py3
    
     # Conflicts:
     #	kobocat-template/templates/data_view.html
     #	kobocat-template/templates/instance.html
     #	kobocat-template/templates/map.html
     #	kobocat-template/templates/show.html
     #	kobocat-template/templates/stats_tables.html
     #	kobocat-template/templates/topbar.html
     #	onadata/apps/api/tests/viewsets/test_abstract_viewset.py
     #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
     #	onadata/apps/api/viewsets/xform_viewset.py
     #	onadata/apps/logger/models/xform.py
     #	onadata/apps/logger/templates/list_xforms.html
     #	onadata/apps/logger/templates/submission.html
     #	onadata/apps/logger/views.py
     #	onadata/apps/main/forms.py
     #	onadata/apps/main/google_doc.py
     #	onadata/apps/main/google_export.py
     #	onadata/apps/main/models/google_oath.py
     #	onadata/apps/main/registration_urls.py
     #	onadata/apps/main/templates/activity.html
     #	onadata/apps/main/templates/getting_started.html
     #	onadata/apps/main/templates/profile.html
     #	onadata/apps/main/templates/published_surveys.html
     #	onadata/apps/main/templates/settings.html
     #	onadata/apps/main/templates/show.html
     #	onadata/apps/main/templates/show_form_settings.html
     #	onadata/apps/main/templates/tutorial.html
     #	onadata/apps/main/tests/test_base.py
     #	onadata/apps/main/tests/test_form_api.py
     #	onadata/apps/main/tests/test_form_api_delete.py
     #	onadata/apps/main/tests/test_form_enter_data.py
     #	onadata/apps/main/tests/test_form_errors.py
     #	onadata/apps/main/tests/test_form_metadata.py
     #	onadata/apps/main/tests/test_form_permissions.py
     #	onadata/apps/main/tests/test_form_show.py
     #	onadata/apps/main/tests/test_google_doc.py
     #	onadata/apps/main/tests/test_google_docs_export.py
     #	onadata/apps/main/tests/test_process.py
     #	onadata/apps/main/tests/test_user_settings.py
     #	onadata/apps/main/urls.py
     #	onadata/apps/main/views.py
     #	onadata/apps/sms_support/autodoc.py
     #	onadata/apps/sms_support/parser.py
     #	onadata/apps/sms_support/tests/test_base_sms.py
     #	onadata/apps/sms_support/tools.py
     #	onadata/apps/survey_report/templates/survey_report/auto_report.html
     #	onadata/apps/survey_report/templates/survey_report/auto_report_split_by.html
     #	onadata/apps/survey_report/templates/survey_report/export_html.html
     #	onadata/apps/survey_report/templates/survey_report/export_menu.html
     #	onadata/apps/survey_report/templatetags/data_manipulation.py
     #	onadata/apps/survey_report/urls.py
     #	onadata/apps/survey_report/views.py
     #	onadata/apps/viewer/templates/charts.html
     #	onadata/apps/viewer/templates/data_view.html
     #	onadata/apps/viewer/templates/instance.html
     #	onadata/apps/viewer/templates/map.html
     #	onadata/apps/viewer/templates/stats_tables.html
     #	onadata/apps/viewer/tests/test_export_builder.py
     #	onadata/apps/viewer/views.py
     #	onadata/koboform/redirect_middleware.py
     #	onadata/libs/serializers/xform_serializer.py
     #	onadata/libs/templates/home_topbar.html
     #	onadata/libs/templates/topbar.html
     #	onadata/libs/utils/analyser_export.py
     #	onadata/libs/utils/export_tools.py
     #	onadata/libs/utils/google.py
     #	onadata/settings/common.py
    noliveleger committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    d2b7261 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'kobokitten-py3' into kobokitten-py3-drop-__future__-imp…

    …orts
    
     # Conflicts:
     #	onadata/apps/api/south_migrations/0002_auto__add_project__add_unique_project_name_organization.py
     #	onadata/apps/api/south_migrations/0003_auto__add_projectxform__add_unique_projectxform_xform_project.py
     #	onadata/apps/logger/south_migrations/0024_auto__add_field_xform_allows_sms__add_field_xform_sms_id_string.py
     #	onadata/apps/logger/south_migrations/0024_auto__chg_field_attachment_mimetype.py
     #	onadata/apps/logger/south_migrations/0025_auto__add_field_xform_encrypted.py
     #	onadata/apps/logger/south_migrations/0025_sms_id_string_filling.py
     #	onadata/apps/logger/south_migrations/0026_auto__chg_field_xform_sms_id_string__add_unique_xform_sms_id_string_us.py
     #	onadata/apps/logger/south_migrations/0027_added_instance_is_deleted.py
     #	onadata/apps/logger/south_migrations/0028_update_is_deleted_field.py
     #	onadata/apps/logger/south_migrations/0029_auto__chg_field_attachment_mimetype__add_field_xform_encrypted__add_fi.py
     #	onadata/apps/logger/south_migrations/0030_auto__add_field_xform_num_of_submissions.py
     #	onadata/apps/logger/south_migrations/0030_auto__add_ziggyinstance.py
     #	onadata/apps/logger/south_migrations/0031_auto__add_field_xform_last_submission_time.py
     #	onadata/apps/logger/south_migrations/0031_auto__add_field_ziggyinstance_form_version.py
     #	onadata/apps/logger/south_migrations/0032_added_xform_to_ziggy_submissions.py
     #	onadata/apps/logger/south_migrations/0033_add_model_Note.py
     #	onadata/apps/logger/south_migrations/0033_auto__chg_field_xform_id_string.py
     #	onadata/apps/logger/south_migrations/0034_add_field_Instance_json.py
     #	onadata/apps/logger/south_migrations/0035_fill_json.py
     #	onadata/apps/logger/south_migrations/0036_auto__chg_field_xform_sms_id_string.py
     #	onadata/apps/logger/south_migrations/0037_auto__del_field_instance_start_time__del_field_instance_date.py
     #	onadata/apps/logger/south_migrations/0038_auto__del_field_instance_is_deleted.py
     #	onadata/apps/logger/south_migrations/0039_auto__del_field_xform_surveys_with_geopoints__add_field_xform_instance.py
     #	onadata/apps/logger/south_migrations/0040_auto__add_field_instance_geom.py
     #	onadata/apps/logger/south_migrations/0041_convert_lng_lat_to_points.py
     #	onadata/apps/logger/south_migrations/0042_remove_odk_prefix.py
     #	onadata/apps/logger/south_migrations/0043_xform_title_255.py
     #	onadata/apps/logger/south_migrations/0044_auto__del_field_xform_is_crowd_form.py
     #	onadata/apps/logger/south_migrations/0045_auto__add_field_xform_require_auth.py
     #	onadata/apps/main/forms.py
     #	onadata/apps/main/google_doc.py
     #	onadata/apps/main/google_export.py
     #	onadata/apps/main/models/google_oath.py
     #	onadata/apps/main/registration_urls.py
     #	onadata/apps/main/registration_views.py
     #	onadata/apps/main/south_migrations/0009_auto__add_field_userprofile_address__add_field_userprofile_phonenumber.py
     #	onadata/apps/main/south_migrations/0010_auto__add_field_userprofile_created_by.py
     #	onadata/apps/main/south_migrations/0011_auto__add_field_userprofile_num_of_submissions.py
     #	onadata/apps/main/south_migrations/0012_auto__add_unique_metadata_xform_data_type_data_value.py
     #	onadata/apps/main/south_migrations/0013_auto__add_field_metadata_file_hash.py
     #	onadata/apps/main/south_migrations/0014_added_metadata_field_to_user_profile.py
     #	onadata/apps/main/tests/test_form_api.py
     #	onadata/apps/main/tests/test_form_api_delete.py
     #	onadata/apps/main/tests/test_form_edit.py
     #	onadata/apps/main/tests/test_form_enter_data.py
     #	onadata/apps/main/tests/test_form_gallery.py
     #	onadata/apps/main/tests/test_form_metadata.py
     #	onadata/apps/main/tests/test_form_permissions.py
     #	onadata/apps/main/tests/test_form_public_api.py
     #	onadata/apps/main/tests/test_google_doc.py
     #	onadata/apps/main/tests/test_google_docs_export.py
     #	onadata/apps/main/tests/test_style.py
     #	onadata/apps/main/tests/test_user_settings.py
     #	onadata/apps/main/views.py
     #	onadata/apps/sms_support/__init__.py
     #	onadata/apps/sms_support/autodoc.py
     #	onadata/apps/sms_support/models.py
     #	onadata/apps/sms_support/parser.py
     #	onadata/apps/sms_support/providers/__init__.py
     #	onadata/apps/sms_support/providers/smssync.py
     #	onadata/apps/sms_support/providers/telerivet.py
     #	onadata/apps/sms_support/providers/textit.py
     #	onadata/apps/sms_support/providers/twilio.py
     #	onadata/apps/sms_support/tests/__init__.py
     #	onadata/apps/sms_support/tests/test_base_sms.py
     #	onadata/apps/sms_support/tests/test_notallowed.py
     #	onadata/apps/sms_support/tests/test_parser.py
     #	onadata/apps/sms_support/tools.py
     #	onadata/apps/sms_support/views.py
     #	onadata/apps/survey_report/__init__.py
     #	onadata/apps/survey_report/templatetags/__init__.py
     #	onadata/apps/survey_report/templatetags/data_manipulation.py
     #	onadata/apps/survey_report/urls.py
     #	onadata/apps/survey_report/views.py
     #	onadata/apps/viewer/south_migrations/0014_auto__add_field_export__status.py
     #	onadata/apps/viewer/south_migrations/0015_auto__del_field_export__status__add_field_export_internal_status.py
     #	onadata/apps/viewer/south_migrations/0016_auto__add_field_export_export_url.py
     #	onadata/apps/viewer/south_migrations/0017_remove_odk_prefix.py
     #	onadata/apps/viewer/tests/test_data_view.py
     #	onadata/apps/viewer/tests/test_instance_view.py
     #	onadata/libs/authentication.py
     #	onadata/libs/utils/analyser_export.py
     #	onadata/libs/utils/google.py
     #	onadata/libs/utils/model_tools.py
     #
    noliveleger committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    2517570 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    
     # Conflicts:
     #	onadata/apps/main/google_doc.py
    noliveleger committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    21e362b View commit details
    Browse the repository at this point in the history
  10. Merge branch 'kobokitten-py3-remove-extend-object' into kobokitten-py…

    …3-django2
    
     # Conflicts:
     #	kobocat-template/templates/base.html
     #	onadata/apps/logger/models/xform.py
     #	onadata/apps/logger/tests/test_webforms.py
     #	onadata/apps/main/google_export.py
     #	onadata/apps/main/registration_urls.py
     #	onadata/apps/main/tests/test_form_api.py
     #	onadata/apps/main/tests/test_form_api_delete.py
     #	onadata/apps/main/tests/test_form_edit.py
     #	onadata/apps/main/tests/test_form_enter_data.py
     #	onadata/apps/main/tests/test_form_gallery.py
     #	onadata/apps/main/tests/test_form_permissions.py
     #	onadata/apps/main/tests/test_form_public_api.py
     #	onadata/apps/main/tests/test_google_docs_export.py
     #	onadata/apps/main/tests/test_process.py
     #	onadata/apps/main/tests/test_user_settings.py
     #	onadata/apps/main/urls.py
     #	onadata/apps/main/views.py
     #	onadata/apps/sms_support/providers/smssync.py
     #	onadata/apps/sms_support/providers/telerivet.py
     #	onadata/apps/sms_support/providers/textit.py
     #	onadata/apps/sms_support/providers/twilio.py
     #	onadata/apps/sms_support/tools.py
     #	onadata/apps/survey_report/urls.py
     #	onadata/apps/survey_report/views.py
     #	onadata/apps/viewer/tests/test_data_view.py
     #	onadata/apps/viewer/tests/test_instance_view.py
     #	onadata/apps/viewer/views.py
    noliveleger committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    be40b6e View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    be59b31 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ef851c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Removed South migrations

    noliveleger committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    2dad434 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d553e1c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ae3e4f8 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    noliveleger committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    be93fd6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0b94f1b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    af303f0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    587e525 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    69f0eda View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bff02de View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0b6958c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    116a18a View commit details
    Browse the repository at this point in the history
  12. Merge branch 'kobokitten-remove-ui-CUD-actions-unicode' into kobokitt…

    …en-py3
    
     # Conflicts:
     #	kobocat-template/templates/show.html
    noliveleger committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    f7e4f1e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    3fcb6e3 View commit details
    Browse the repository at this point in the history
  14. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    noliveleger committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    3410df5 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    99f1775 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    480014c View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    ab65d65 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    bb69e77 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    7d98845 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    b19a9b1 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a17b9d8 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    7bdc8d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2020

  1. Configuration menu
    Copy the full SHA
    7ea46e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ff4d00b View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2020

  1. Simplify super() calls

    noliveleger committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    eea933e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c096133 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9b749f5 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'kobokitten-py3-new-docker-image' into kobokitten-py3-dj…

    …ango2-new-settings
    
     # Conflicts:
     #	onadata/libs/utils/nose_plugins/SilenceSouth.py
    noliveleger committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    e87b589 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Removed old check for ziggy

    duvld committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    ced6fec View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. Merge pull request #646 from kobotoolbox/kitten-kpi-2770-uuid-query

    Removed old check for ziggy
    noliveleger authored Sep 8, 2020
    Configuration menu
    Copy the full SHA
    ce5005c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. - Run wait_for_* scripts in init.bash at startup

    - Copy environment variables to $UWSGI_USER's bash rc
    noliveleger committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    598f787 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8f1ad36 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ec3663a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2443855 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    95cccea View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Configuration menu
    Copy the full SHA
    234dae6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b1b1f17 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2020

  1. Delete old requirements

    noliveleger committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    504d3cc View commit details
    Browse the repository at this point in the history
  2. - Remove USER command from Dockerfile

    - Remove non-root user's password
    - Use uWSGI and Celery `--uid` and `--gid` option to start processes
    - Use gosu for other processes that don't have such option
    noliveleger committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    a21dd37 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'kobokitten-py3-new-docker-image' into kobokitten-py3-dj…

    …ango2-new-settings
    
     # Conflicts:
     #	Dockerfile
     #	docker/init.bash
     #	docker/run_uwsgi.bash
    noliveleger committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    d31485b View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2020

  1. Merge branch '2488-kpi_add_delete_data_permission' into kobokitten-re…

    …move-ui-CUD-actions-unicode
    
     # Conflicts:
     #	kobocat-template/templates/base.html
     #	kobocat-template/templates/data_view.html
     #	kobocat-template/templates/instance.html
     #	kobocat-template/templates/profile.html
     #	kobocat-template/templates/show.html
     #	kobocat-template/templates/stats_tables.html
     #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
     #	onadata/apps/api/viewsets/xform_viewset.py
     #	onadata/apps/logger/models/xform.py
     #	onadata/apps/logger/views.py
     #	onadata/apps/main/views.py
     #	onadata/apps/viewer/views.py
    noliveleger committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    3c12889 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d02b758 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'kobokitten-remove-ui-CUD-actions-unicode' of github.com…

    …:kobotoolbox/kobocat into kobokitten-remove-ui-CUD-actions-unicode
    noliveleger committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    4e63901 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'kpi-2487-form-media' into kobokitten-remove-ui-CUD-acti…

    …ons-unicode
    
     # Conflicts:
     #	onadata/libs/serializers/xform_serializer.py
    noliveleger committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    bd99a7e View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. Configuration menu
    Copy the full SHA
    6f4216a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    612f97a View commit details
    Browse the repository at this point in the history
  3. Use boolean for database engine detection to run PostgreSQL queries o…

    …r patched queries with SQLite
    noliveleger committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    7ea4503 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e89a7a1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7431668 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    83db855 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. Configuration menu
    Copy the full SHA
    82d33be View commit details
    Browse the repository at this point in the history
  2. Merge branch 'kobokitten-remove-ui-CUD-actions-unicode' into kobokitt…

    …en-py3
    
     # Conflicts:
     #	onadata/apps/api/tests/viewsets/test_data_viewset.py
     #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
     #	onadata/apps/api/viewsets/xform_list_api.py
     #	onadata/apps/logger/models/xform.py
     #	onadata/apps/viewer/models/data_dictionary.py
     #	onadata/libs/serializers/xform_serializer.py
     #	onadata/libs/utils/export_tools.py
     #	onadata/libs/utils/user_auth.py
    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    301920c View commit details
    Browse the repository at this point in the history
  3. Merge branch 'kobokitten-py3' into kobokitten-py3-drop-__future__-imp…

    …orts
    
     # Conflicts:
     #	onadata/apps/api/tools.py
     #	onadata/apps/main/views.py
     #	onadata/libs/permissions.py
     #	onadata/libs/serializers/metadata_serializer.py
     #	onadata/libs/serializers/xform_serializer.py
     #	onadata/libs/utils/export_tools.py
     #	onadata/libs/utils/user_auth.py
    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    bdaa45b View commit details
    Browse the repository at this point in the history
  4. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    
     # Conflicts:
     #	onadata/apps/api/viewsets/xform_list_api.py
     #
     # It looks like you may be committing a merge.
     # If this is not correct, please remove the file
     #	.git/MERGE_HEAD
     # and try again.
    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    d424979 View commit details
    Browse the repository at this point in the history
  5. Fixed migrations conflict

    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    cc58f86 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    00deb30 View commit details
    Browse the repository at this point in the history
  7. Fixed upgrade issues

    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    7b66047 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    add3040 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'kobokitten-py3-drop-__future__-imports' into kobokitten…

    …-py3-remove-extend-object
    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    5ff0ad0 View commit details
    Browse the repository at this point in the history
  10. Merge branch 'kobokitten-py3-remove-extend-object' into kobokitten-py…

    …3-django2
    
     # Conflicts:
     #	dependencies/pip/requirements.in
     #	onadata/apps/api/tools.py
     #	onadata/apps/logger/models/xform.py
     #	onadata/apps/logger/views.py
     #	onadata/libs/serializers/metadata_serializer.py
    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    9af94a3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    155c1e0 View commit details
    Browse the repository at this point in the history
  12. Fixed XML comparison

    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    63abebc View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    3cb7bfc View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    fb87131 View commit details
    Browse the repository at this point in the history
  15. Merge branch 'kobokitten-py3-new-docker-image' into kobokitten-py3-dj…

    …ango2-new-settings
    
     # Conflicts:
     #	onadata/settings/base.py
    noliveleger committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    c8df68e View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. Configuration menu
    Copy the full SHA
    37cd29e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5837b53 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5a2749c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f50b830 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0caaadc View commit details
    Browse the repository at this point in the history
  6. Merge branch 'kobokitten-py3-new-docker-image' into kobokitten-py3-dj…

    …ango2-new-settings
    
     # Conflicts:
     # 	dependencies/pip/requirements.in
    noliveleger committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    9bca32f View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2021

  1. Configuration menu
    Copy the full SHA
    699142f View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2021

  1. Configuration menu
    Copy the full SHA
    ca2a0ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ec6e21 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2021

  1. Configuration menu
    Copy the full SHA
    b8bfc00 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6a45ad3 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Remove QR Code generator

    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    32851fc View commit details
    Browse the repository at this point in the history
  2. Code reformat

    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    0a4ec2b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    014c0fd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a97a91a View commit details
    Browse the repository at this point in the history
  5. Merge branch 'kobocat2.0-step3-remove-objects-inheritance' into koboc…

    …at2.0-step4-upgrade-django2.2
    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    dbc74b2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5f2a7c3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    81e1d52 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2359362 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'kobocat2.0-step0-remove-deprecated-views' into kobocat2…

    ….0-step1-upgrade-python3-django1.11
    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    b190d0b View commit details
    Browse the repository at this point in the history
  10. Merge branch 'kobocat2.0-step1-upgrade-python3-django1.11' into koboc…

    …at2.0-step2-remove-__future__-imports
    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    a2d8e4b View commit details
    Browse the repository at this point in the history
  11. Merge branch 'kobocat2.0-step2-remove-__future__-imports' into koboca…

    …t2.0-step3-remove-objects-inheritance
    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    555703e View commit details
    Browse the repository at this point in the history
  12. Merge branch 'kobocat2.0-step3-remove-objects-inheritance' into koboc…

    …at2.0-step4-upgrade-django2.2
    noliveleger committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    3b62885 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    314f492 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ac1ce8c View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Configuration menu
    Copy the full SHA
    b7c8dc9 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Configuration menu
    Copy the full SHA
    cb1f3fa View commit details
    Browse the repository at this point in the history
  2. Merge branch 'kobocat2.0-step0-remove-deprecated-views' into kobocat2…

    ….0-step1-upgrade-python3-django1.11
    
     # Conflicts:
     #	onadata/apps/logger/templates/submission.html
     #	onadata/apps/logger/views.py
    noliveleger committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    0f1dba9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #677 from kobotoolbox/kobocat2.0-step0-remove-depr…

    …ecated-views
    
    [Python3 and Django2.2 upgrade] part 0 - Remove legacy views
    jnm authored Mar 11, 2021
    Configuration menu
    Copy the full SHA
    af22d3e View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. Merge pull request #678 from kobotoolbox/kobocat2.0-step1-upgrade-pyt…

    …hon3-django1.11
    
    [Python3 and Django2.2 upgrade] part 1 - Use Python 3 & Django 1.11
    jnm authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    e2113e6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #679 from kobotoolbox/kobocat2.0-step2-remove-__fu…

    …ture__-imports
    
    [Python3 and Django2.2 upgrade] part 2 - Bulk update: Drop `__future__` imports
    jnm authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    964c651 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #680 from kobotoolbox/kobocat2.0-step3-remove-obje…

    …cts-inheritance
    
    [Python3 and Django2.2 upgrade] part 3 - Bulk update: remove object inheritance
    jnm authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    29f552e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2ef7609 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #682 from kobotoolbox/kobocat2.0-step4-upgrade-dja…

    …ngo2.2
    
    [Python3 and Django2.2 upgrade] part 4 - Upgrade to Django 2.2
    jnm authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    0314ba3 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #681 from kobotoolbox/kobocat2.0-step5-new-docker-…

    …image
    
    [Python3 and Django2.2 upgrade] part 5 - Updated docker image with non-root user
    jnm authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    1b91ec2 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #683 from kobotoolbox/kobocat2.0-step6-refactoring…

    …-settings
    
    [Python3 and Django2.2 upgrade] part 6 - Settings files refactoring
    jnm authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    97ead87 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. ran remove sms migrations

    duvld committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    59d955d View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Change tests to expect new error message

    "SMS-keyword" does not exist anymore, and ID collisions should not
    happen either with all deployments coming from KPI, which uses UIDs for
    KoBoCAT IDs
    jnm committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    3dceb38 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #692 from kobotoolbox/kobocat-2.0-remove-sms

    Remove old SMS model functions and run migrations
    noliveleger authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    f3f9638 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    797f4e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. Skip AlterUniqueTogether for logger_xform

    …and rely instead on the `unique_together` constraint being
    automatically removed when its constituent column is dropped
    jnm committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    2098ca2 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Merge pull request #693 from kobotoolbox/skip-alteruniquetogether

    Skip AlterUniqueTogether for logger_xform
    noliveleger authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    bb5492d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'kpi-2487-form-media' into beta

     # Conflicts:
     #	onadata/libs/serializers/xform_serializer.py
    noliveleger committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    d7b2a2c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d7ed9e3 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/github-actions' into github-acti…

    …ons-py3
    
     # Conflicts:
     #	dependencies/pip/github_actions.pip
     #	onadata/apps/main/tests/test_form_enter_data.py
     #	onadata/libs/data/tests/test_tools.py
     #	onadata/settings/base.py
     #	onadata/settings/kc_environ.py
     #	onadata/settings/test_environ.py
     #	onadata/settings/travis_ci.py
     #	pytest.ini
    noliveleger committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    2ea8553 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Adapt GH action YML file for Python3.8. Add beta to trigger actions and

    use conditional testing settings (PostgreSQL or SQLite)
    noliveleger committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    2b82d55 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d8f7277 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f7dea4d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    76bf89f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #695 from kobotoolbox/github-actions-py3

    GitHub actions for Python 3
    JacquelineMorrissette authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    a80cc3b View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. Configuration menu
    Copy the full SHA
    493481e View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Configuration menu
    Copy the full SHA
    37bd4f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. optimizing

    JacquelineMorrissette committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    3cb87c6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8056aa6 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Cleaned up code

    JacquelineMorrissette committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    18f5eb8 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

  1. fix typo

    joshuaberetta committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    7019f5d View commit details
    Browse the repository at this point in the history
  2. added tests

    JacquelineMorrissette committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    ad2a432 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. Configuration menu
    Copy the full SHA
    f84e711 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. Merge pull request #704 from kobotoolbox/github-actions-py3

    Fixed apt dependencies breaking
    noliveleger authored Apr 30, 2021
    Configuration menu
    Copy the full SHA
    657c94f View commit details
    Browse the repository at this point in the history

Commits on May 3, 2021

  1. Configuration menu
    Copy the full SHA
    8fa222d View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. Configuration menu
    Copy the full SHA
    2eb044d View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Fix argparse config for sync_mongo

    It's a thing that we need to use
    jnm committed May 11, 2021
    Configuration menu
    Copy the full SHA
    e0c4b95 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. Merge pull request #708 from kobotoolbox/fix-sync_mongo-argparse

    Fix argparse config for sync_mongo
    noliveleger authored May 12, 2021
    Configuration menu
    Copy the full SHA
    bead719 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Configuration menu
    Copy the full SHA
    1511f6f View commit details
    Browse the repository at this point in the history

Commits on May 18, 2021

  1. Configuration menu
    Copy the full SHA
    d09166b View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Configuration menu
    Copy the full SHA
    3ac4270 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3e5124 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #713 from kobotoolbox/kc2.0-punch-list

    Python3 and Django2.2 upgrade punch list items
    noliveleger authored May 19, 2021
    Configuration menu
    Copy the full SHA
    67cdfa5 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. Configuration menu
    Copy the full SHA
    7615dc2 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Configuration menu
    Copy the full SHA
    0baa021 View commit details
    Browse the repository at this point in the history
  2. Revert "Fixed XML comparison"

    This reverts commit 63abebc.
    jnm committed May 25, 2021
    Configuration menu
    Copy the full SHA
    cd0a151 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c4998cf View commit details
    Browse the repository at this point in the history
  4. Add a shell script shortcut for pip-compile

    …to avoid running pip-compile three times manually whenever there's a
    Python dependency change
    jnm committed May 25, 2021
    Configuration menu
    Copy the full SHA
    db7bda8 View commit details
    Browse the repository at this point in the history
  5. Update pyxform requirement to 1.5.1

    Includes a humongous diff thanks to jazzband/pip-tools#1237, which
    places each "via" package on a separate line
    jnm committed May 25, 2021
    Configuration menu
    Copy the full SHA
    09e7da8 View commit details
    Browse the repository at this point in the history
  6. Fix XML attribute order and response bytestring…

    issues in unit tests
    jnm committed May 25, 2021
    Configuration menu
    Copy the full SHA
    46b6650 View commit details
    Browse the repository at this point in the history
  7. Resolve encoding-related errors

    …and prefer explicit encoding/decoding over `smart_str()`. See #718
    jnm committed May 25, 2021
    Configuration menu
    Copy the full SHA
    77ab828 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #719 from kobotoolbox/update-pyxform-beta-branch

    Apply pyxform 1.5.1 upgrade to beta branch
    jnm authored May 25, 2021
    Configuration menu
    Copy the full SHA
    8e3c89a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    66f8ea8 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    70953d9 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2021

  1. Merge pull request #703 from kobotoolbox/3069-user-reports

    Created Submission Counter Model
    noliveleger authored May 26, 2021
    Configuration menu
    Copy the full SHA
    3686577 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #711 from kobotoolbox/re-add-missing-api-endpoint

    Added missing api endpoint
    noliveleger authored May 26, 2021
    Configuration menu
    Copy the full SHA
    8078966 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ebeb747 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6751121 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ef28459 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6bda1ef View commit details
    Browse the repository at this point in the history
  7. Merge pull request #720 from kobotoolbox/remove-captcha-dependency

    Removed recaptcha client dependency and registration HTML templates
    joshuaberetta authored May 26, 2021
    Configuration menu
    Copy the full SHA
    29b2a8d View commit details
    Browse the repository at this point in the history
  8. Cleaned up code

    JacquelineMorrissette committed May 26, 2021
    Configuration menu
    Copy the full SHA
    308ecef View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. Merge branch 'kpi-2487-form-media' into beta-validate-meta-media

     # Conflicts:
     #	kobocat-template/templates/profile.html
     #	onadata/apps/main/views.py
     #	onadata/libs/serializers/metadata_serializer.py
     #	onadata/libs/serializers/xform_serializer.py
    noliveleger committed May 31, 2021
    Configuration menu
    Copy the full SHA
    2aecc19 View commit details
    Browse the repository at this point in the history
  2. Update REMOVALS.md

    Indicate specific releases; remove caveat about `api` endpoint since #711 has been merged
    jnm authored May 31, 2021
    Configuration menu
    Copy the full SHA
    0435b4c View commit details
    Browse the repository at this point in the history
  3. restore Sync Xform button

    noliveleger committed May 31, 2021
    Configuration menu
    Copy the full SHA
    e2285c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Configuration menu
    Copy the full SHA
    de85fbf View commit details
    Browse the repository at this point in the history
  2. Fixed logout template

    noliveleger committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    7d919fa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8e61689 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Configuration menu
    Copy the full SHA
    038013f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    233ba24 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    899c550 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Configuration menu
    Copy the full SHA
    8740598 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. Configuration menu
    Copy the full SHA
    072f465 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #722 from kobotoolbox/712-background-documents

    Readd background documents
    noliveleger authored Jun 11, 2021
    Configuration menu
    Copy the full SHA
    f093265 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6bba071 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #726 from kobotoolbox/beta-validate-meta-media

    Add validation metadata content type support to `beta`
    joshuaberetta authored Jun 11, 2021
    Configuration menu
    Copy the full SHA
    3186b7b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2021

  1. Install libsqlite3-mod-spatialite by default

    …and waste less of developers' time. Closes #717.
    jnm committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    fd61098 View commit details
    Browse the repository at this point in the history
  2. Fix form media file download permissions

    Only allow users with permission to submit to a form to download that
    form's associated media files
    jnm committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    2279457 View commit details
    Browse the repository at this point in the history
  3. Add guidance and redirect links to KPI for legacy…

    form and data views, to help ease the transition away from removed
    features of KoBoCAT's legacy UI
    jnm committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    27fa2be View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    63168d7 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #729 from kobotoolbox/legacy-redirect-to-kpi

    Add guidance and redirect links to KPI for legacy form and data views
    JacquelineMorrissette authored Jun 14, 2021
    Configuration menu
    Copy the full SHA
    3630bd4 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Configuration menu
    Copy the full SHA
    badd9f3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32294a6 View commit details
    Browse the repository at this point in the history