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.

Sign up for GitHub

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

Jump to bottom

Sync with upstream to tag 2.018.48 #29

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Sync with upstream to tag 2.018.48 #29

wants to merge 44 commits into from

Commits on Jun 21, 2018

  1. Added 'has_kpi_hooks' boolean field to 'XForm' model and 'mongo_succe… 

    …ss' boolean field to 'Instance' model
    @noliveleger
    noliveleger committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    d038f11 View commit details
    Browse the repository at this point in the history

  2. Renamed 'mongo_success' to 'is_sync_with_mongo'. Update its value on … 

    …ParsedInstance.save()
    @noliveleger
    noliveleger committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    ec2694b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. New rest service for KPI and (un)register it on XForm.save()

    @noliveleger
    noliveleger committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    0e8b298 View commit details
    Browse the repository at this point in the history

  2. Use KPI_INTERNAL_URL to make call between KC and KPI in Rest Service

    @noliveleger
    noliveleger committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    9f83d34 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. Updated pip requirements. Requests 2.4.1 > Request 2.19.1

    @noliveleger
    noliveleger committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    e10b8c0 View commit details
    Browse the repository at this point in the history

  2. Updated 'kpi_hook' service to post 'xml' and 'json' to kpi endpoint

    @noliveleger
    noliveleger committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    b14da18 View commit details
    Browse the repository at this point in the history

  3. Added XML representation of an instance in API endpoint

    @noliveleger
    noliveleger committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    0ceccc7 View commit details
    Browse the repository at this point in the history

  4. Added XML format in Instance detail endpoint

    @noliveleger
    noliveleger committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    bf66b77 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2018

  1. Added instance_id in payload of kpi_hook service, renamed uuid to uid… 

    … to be consistent with the kpi code
    @noliveleger
    noliveleger committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    6969e3e View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. Changed json representation to match Mongo data

    @noliveleger
    noliveleger committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    576b7dd View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. Removed logger_instance.uid from kpi_hook payload

    @noliveleger
    noliveleger committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    c5d97fb View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. Moved rest_service process to a Celery task

    @noliveleger
    noliveleger committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    fc4a6f6 View commit details
    Browse the repository at this point in the history

  2. Updated remongo & sync mongo command to handle is_synced_with_mongo f… 

    …ield, added command to update is_synced_with_mongo according to Mongo records
    @noliveleger
    noliveleger committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    4962943 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2018

  1. Changed Instance.save() to update only with need fields

    @noliveleger
    noliveleger committed Aug 9, 2018
    Configuration menu
    Copy the full SHA
    a3eb2d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2018

  1. Removed useless and redundant Instance.save(), fixed sync_mongo --all… 

    … for inactive XForm
    @noliveleger
    noliveleger committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    5194de4 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. Send only UUID to kpi hook service

    @noliveleger
    noliveleger committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    a14f388 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Bugfix when saving kpi_hook result

    @noliveleger
    noliveleger committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    5f67122 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. Refactor submission counting without locking

    @jnm
    jnm committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    9615617 View commit details
    Browse the repository at this point in the history

  2. Merge pull request kobotoolbox#479 from kobotoolbox/remove-submission… 

    …-count-locks

Refactor submission counting without locking
    @noliveleger
    noliveleger authored Sep 20, 2018
    Configuration menu
    Copy the full SHA
    24ce281 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2018

  1. Remove SPSS label export feature 

    which is now provided by formpack via KPI
    @jnm
    jnm committed Sep 24, 2018
    Configuration menu
    Copy the full SHA
    f4fb829 View commit details
    Browse the repository at this point in the history

  2. Upgrade pyxform to 0.11.5; closes kobotoolbox#480

    @jnm
    jnm committed Sep 24, 2018
    Configuration menu
    Copy the full SHA
    f439a21 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. Merge remote-tracking branch 'origin/master' into kpi_rest_services

    @jnm
    jnm committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    fb334b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2018

  1. Merge pull request kobotoolbox#481 from kobotoolbox/480-upstream-pyxform 

     Upgrade pyxform to 0.11.5; closes kobotoolbox#480
    @noliveleger
    noliveleger authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    3dd4778 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. Changed Instance.save() to Instance.objects.update() to gain performance

    @noliveleger
    noliveleger committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    0c0f55d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'kpi_rest_services' of github.com:kobotoolbox/kobocat in… 

    …to kpi_rest_services
    @noliveleger
    noliveleger committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    5102a15 View commit details
    Browse the repository at this point in the history

  3. Send instance_id instead of instance_uuid to KPI

    @noliveleger
    noliveleger committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    4038ebd View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2018

  1. update_is_sync_with_mongo - Order queryset by id

    @noliveleger
    noliveleger committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    f0dcf51 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Merge pull request kobotoolbox#482 from kobotoolbox/kpi_rest_services 

    Branch to be used with `kpi`.`REST-UI`
    @jnm
    jnm authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    f73476d View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2018

  1. Disable automatic export creation in export_list 

    Exports can still be generated with the "New Export" button. Closes kobotoolbox#484
    @jnm
    jnm committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    40c67f2 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. Merge pull request kobotoolbox#485 from kobotoolbox/484-no-auto-export 

    Disable automatic export creation in `export_list`
    @noliveleger
    noliveleger authored Oct 9, 2018
    Configuration menu
    Copy the full SHA
    ad21245 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Just get the XForm: don't bother counting first!

    @jnm
    jnm committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    877e155 View commit details
    Browse the repository at this point in the history

  2. Do not lock any rows until attachments are saved 

    Try not to do any locking until as close as possible to the end of the
transaction. Closes kobotoolbox#490
    @jnm
    jnm committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    8370d27 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Merge pull request kobotoolbox#491 from kobotoolbox/490-optimize-subm… 

    …ission-count-locking

Do not lock any rows until attachments are saved
    @noliveleger
    noliveleger authored Oct 31, 2018
    Configuration menu
    Copy the full SHA
    504fbb9 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. Add a new media_file_basename column to improve 

    performance when a single `auth_user` has may rows in `logger_attachment`. This
commit lacks a management command to populate the `media_file_basename` column,
but we'll say that it closes kobotoolbox#495.
    @jnm
    jnm committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    75eb550 View commit details
    Browse the repository at this point in the history

  2. Merge pull request kobotoolbox#496 from kobotoolbox/495-media-file-qu… 

    …ery-optimization

Add a new `media_file_basename` column to improve
    @noliveleger
    noliveleger authored Nov 20, 2018
    Configuration menu
    Copy the full SHA
    39c0996 View commit details
    Browse the repository at this point in the history

  3. Remove Fabric configuration. Closes kobotoolbox#497

    @jnm
    jnm committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    93cea58 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2018

  1. Merge pull request kobotoolbox#498 from kobotoolbox/497-remove-fabric… 

    …-configuration

Remove Fabric configuration. Closes kobotoolbox#497
    @noliveleger
    noliveleger authored Nov 22, 2018
    Configuration menu
    Copy the full SHA
    31a067e View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2018

  1. Bug fix for 'media_file_basename' always saved as empty string

    @noliveleger
    noliveleger committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    ed1b011 View commit details
    Browse the repository at this point in the history

  2. Management command to update 'media_file_basename'

    @noliveleger
    noliveleger committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    4549276 View commit details
    Browse the repository at this point in the history

  3. Use already existing 'filename' property' to initialize 'media_file_b… 

    …asename' field
    @noliveleger
    noliveleger committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    85244d0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request kobotoolbox#501 from kobotoolbox/500-images-collec… 

    …ted-not-found

500 images collected not found - fix
    @jnm
    jnm authored Nov 28, 2018
    Configuration menu
    Copy the full SHA
    f48dba1 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2018

  1. Applied PR#501 suggested changes

    @noliveleger
    noliveleger committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    43f8e1e View commit details
    Browse the repository at this point in the history

  2. Merge pull request kobotoolbox#503 from kobotoolbox/500-images-not-fo… 

    …und-PR-changes

Applied PR#501 suggested changes
    @noliveleger
    noliveleger authored Nov 30, 2018
    Configuration menu
    Copy the full SHA
    b2d8d13 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2019

  1. Merge branch 'upstream-2.018.48' into update-upstream-2.018.48

    @Tomatosoup97
    Tomatosoup97 committed Jan 27, 2019
    Configuration menu
    Copy the full SHA
    6096284 View commit details
    Browse the repository at this point in the history