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

All open User Stories #61

Merged
merged 49 commits into from
Mar 21, 2017
Merged

All open User Stories #61

merged 49 commits into from
Mar 21, 2017

Commits on Feb 16, 2017

  1. user-story 46 functionalities

    @kaymaky
    kaymaky committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    1ead8c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2017

  1. Added state-restrictions for evaluation, provided tests

    @igorbraun
    igorbraun committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    da852e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2017

  1. Merged branch user-story-40 into order-wizard

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    ca98f19 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/user-story-42' into order-wizard

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    7c0b4a9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/user-story-43' into order-wizard

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    9bad199 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'user-story-50' into order-wizard

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    86e22ac View commit details
    Browse the repository at this point in the history

  5. Merge branch 'order-wizard' into user-story-46

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    b00981c View commit details
    Browse the repository at this point in the history

  6. updated requirements

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    28d7feb View commit details
    Browse the repository at this point in the history

  7. added bootstrap

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    235296a View commit details
    Browse the repository at this point in the history

  8. implemented modal for order closing

    @yduman
    yduman committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    a38e1ee View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2017

  1. removed Bootstrap version and realized as FormView

    @yduman
    yduman committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    5e3b0fe View commit details
    Browse the repository at this point in the history

  2. provided tests

    @yduman
    yduman committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    607a4cc View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. added todo

    @yduman
    yduman committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    39fb509 View commit details
    Browse the repository at this point in the history

  2. Added possibility to login as Veranstalter in every state

    @igorbraun
    igorbraun committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    5287206 View commit details
    Browse the repository at this point in the history

  3. Added logout button from Veranstalter-dashboard

    @igorbraun
    igorbraun committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    09618b3 View commit details
    Browse the repository at this point in the history

  4. Added logout button for bestellung-done view

    @igorbraun
    igorbraun committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    9d638ff View commit details
    Browse the repository at this point in the history

  5. added more statusmanagement for order closing

    @yduman
    yduman committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    0748b1f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'order-wizard' into user-story-46

    @yduman
    yduman committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    83fb484 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'order-wizard' into user-story-51

    @yduman
    yduman committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    1f73992 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'order-wizard' into user-story-47

    @yduman
    yduman committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    c4641f5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'order-wizard' into user-story-48

    @yduman
    yduman committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    1978c9b View commit details
    Browse the repository at this point in the history

  10. Some progress for story 52

    @igorbraun
    igorbraun committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    19e53be View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. added jquery plugin 'chosen' to be able to select multiple statuses, … 

    …but needs bugfix: see FIXME at __init__.py
    @yduman
    yduman committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    26d0531 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. fixed POST data handling

    @yduman
    yduman committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    e9cef10 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. the sending of mails in relation to the status of a lecture is now po… 

    …ssible
    @yduman
    yduman committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    3fd9d9f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'order-wizard' into user-story-52

    @yduman
    yduman committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    84a283e View commit details
    Browse the repository at this point in the history

  3. user can now send mails to tutors too

    @yduman
    yduman committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    76e4572 View commit details
    Browse the repository at this point in the history

  4. added some formatting

    @yduman
    yduman committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    f29167f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'order-wizard' into user-story-53

    @yduman
    yduman committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    13fd72b View commit details
    Browse the repository at this point in the history

  6. fixed error from merge

    @yduman
    yduman committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    feaeca8 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. modified the model BarcodeAllowedState and added tests for it

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    3dd4e47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'user-story-46' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    8d0ec8e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'user-story-51' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    9d8ee30 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'user-story-47' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    bd17ed2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'user-story-48' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    14e76da View commit details
    Browse the repository at this point in the history

  6. Merge branch 'user-story-52' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    d2f9edd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'user-story-53' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    b0c6d07 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'order-wizard' into user-story-49

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    cb58876 View commit details
    Browse the repository at this point in the history

  9. fixed migration

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    cae44ba View commit details
    Browse the repository at this point in the history

  10. Merge branch 'user-story-49' into order-wizard

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    d3e3d0b View commit details
    Browse the repository at this point in the history

  11. added documentation for models

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    e43a80c View commit details
    Browse the repository at this point in the history

  12. added documentation for intern/__init__.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    c8519ec View commit details
    Browse the repository at this point in the history

  13. added documentation for intern/vv.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    96e5388 View commit details
    Browse the repository at this point in the history

  14. added documentation for views/veranstalter.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    5c10602 View commit details
    Browse the repository at this point in the history

  15. added documentation for admin.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    7032e9e View commit details
    Browse the repository at this point in the history

  16. refactored auth.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    a8e50b8 View commit details
    Browse the repository at this point in the history

  17. added documentation forms.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    02817bb View commit details
    Browse the repository at this point in the history

  18. refactored tools.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    712f65c View commit details
    Browse the repository at this point in the history

  19. refactored urls.py

    @yduman
    yduman committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    8bc044e View commit details
    Browse the repository at this point in the history