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

Allow votes from the user frontend #283

Merged
merged 39 commits into from
May 8, 2017
Merged

Allow votes from the user frontend #283

merged 39 commits into from
May 8, 2017

Commits on Apr 27, 2017

  1. Add django-nested-formset as dependency and with a small fix for fields

    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    6eef631 View commit details
    Browse the repository at this point in the history

  2. Use nested formsets for poll creation

    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    709c033 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2017-04-jd-polls-refactoring' into 2017-04-jd-polls-man… 

    …agement
    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    71de7d0 View commit details
    Browse the repository at this point in the history

  4. Adapt forms to model refactoring

    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    260c9e5 View commit details
    Browse the repository at this point in the history

  5. Revert "Add django-nested-formset as dependency and with a small fix … 

    …for fields"

This reverts commit 6eef631.
    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    215d0b8 View commit details
    Browse the repository at this point in the history

  6. Add react based poll management

    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    12024a1 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into 2017-04-jd-polls-ma… 

    …nagement
    Johannes Dillmann committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    c5d443d View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. Use Manager to annotate vote count

    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    e3a2d55 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into 2017-04-jd-polls-ma… 

    …nagement
    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    b1e1722 View commit details
    Browse the repository at this point in the history

  3. Fix: Use Manager to annotate vote count

    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    c56cc75 View commit details
    Browse the repository at this point in the history

  4. Add poll api endpoint

    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    a869c35 View commit details
    Browse the repository at this point in the history

  5. Use Ajax for poll management submission.

    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    f36368a View commit details
    Browse the repository at this point in the history

  6. Show validation errors in poll forms

    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    906404c View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into 2017-04-jd-polls-ma… 

    …nagement
    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    b4b887d View commit details
    Browse the repository at this point in the history

  8. Fix rules for the polls management api

    Johannes Dillmann committed May 2, 2017
    Configuration menu
    Copy the full SHA
    aef2072 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

  1. Merge remote-tracking branch 'origin/master' into 2017-04-jd-polls-ma… 

    …nagement
    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    b85d3db View commit details
    Browse the repository at this point in the history

  2. Add correct rules for votes

    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    a51ea32 View commit details
    Browse the repository at this point in the history

  3. Add vote per user per question validator

    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    8c1a6ea View commit details
    Browse the repository at this point in the history

  4. Use a4 api.js

    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    98b9918 View commit details
    Browse the repository at this point in the history

  5. Use react state for poll/choice inputs

    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    5c55af3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into 2017-04-jd-polls-management

    @kleingeist
    kleingeist committed May 3, 2017
    Configuration menu
    Copy the full SHA
    b47339e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into 2017-05-jd-polls-frontend

    @kleingeist
    kleingeist committed May 3, 2017
    Configuration menu
    Copy the full SHA
    c28f416 View commit details
    Browse the repository at this point in the history

  8. Remove falsy unique together constraint

    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    7334de5 View commit details
    Browse the repository at this point in the history

  9. Merge branch '2017-04-jd-polls-management' into 2017-05-jd-polls-fron… 

    …tend
    Johannes Dillmann committed May 3, 2017
    Configuration menu
    Copy the full SHA
    f2530f3 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2017

  1. Rename Polls.jsx to react_polls.jsx

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    0df16d7 View commit details
    Browse the repository at this point in the history

  2. Enable vote rest api

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    d3a4efd View commit details
    Browse the repository at this point in the history

  3. Use /polls route for updating

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    1e2a440 View commit details
    Browse the repository at this point in the history

  4. Use /pollvotes/$questionId route for the voting API

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    6f14b0b View commit details
    Browse the repository at this point in the history

  5. Gardening

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    1d3770f View commit details
    Browse the repository at this point in the history

  6. fix typo

    @vellip
    vellip committed May 4, 2017
    Configuration menu
    Copy the full SHA
    0dacc0f View commit details
    Browse the repository at this point in the history

  7. Remove weight from Question serializer 

    The weight ist updated from the questions relative position in the question
list.
    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    6f15acd View commit details
    Browse the repository at this point in the history

  8. Split Poll Serializer update functions

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    de028b9 View commit details
    Browse the repository at this point in the history

  9. Fix vote submission on create.

    Johannes Dillmann committed May 4, 2017
    Configuration menu
    Copy the full SHA
    3d5c8b1 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2017

  1. Merge remote-tracking branch 'origin/master' into 2017-05-jd-polls-fr… 

    …ontend
    Johannes Dillmann committed May 8, 2017
    Configuration menu
    Copy the full SHA
    c672e89 View commit details
    Browse the repository at this point in the history

  2. Gardening in response to review

    Johannes Dillmann committed May 8, 2017
    Configuration menu
    Copy the full SHA
    0c3931c View commit details
    Browse the repository at this point in the history

  3. Move maxKeys counters from the state to the object

    Johannes Dillmann committed May 8, 2017
    Configuration menu
    Copy the full SHA
    0dbeaaa View commit details
    Browse the repository at this point in the history

  4. Use arrow functions

    Johannes Dillmann committed May 8, 2017
    Configuration menu
    Copy the full SHA
    695453b View commit details
    Browse the repository at this point in the history

  5. Use ErrorList and Alert Components

    Johannes Dillmann committed May 8, 2017
    Configuration menu
    Copy the full SHA
    caf77e5 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into 2017-05-jd-polls-fr… 

    …ontend
    Johannes Dillmann committed May 8, 2017
    Configuration menu
    Copy the full SHA
    baf53a5 View commit details
    Browse the repository at this point in the history