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

Merge new changes #11

Open
wants to merge 58 commits into
base: develop
Choose a base branch
from
Open

Merge new changes #11

wants to merge 58 commits into from

Commits on Jul 17, 2015

  1. Create .travis.yml 

    Creating .travis.yml file for Python
    @rosariorobinson
    rosariorobinson committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    eca68a3 View commit details
    Browse the repository at this point in the history

  2. Delete .travis.yml

    @rosariorobinson
    rosariorobinson committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    4d78f19 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2015

  1. Experimenting with Bootstrap forms

    @Nerdylicious
    Nerdylicious committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    3853476 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. Moved malaria functionality to its own Django app

    @Nerdylicious
    Nerdylicious committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    ac5cfe5 View commit details
    Browse the repository at this point in the history

  2. Added update schema guide

    @Nerdylicious
    Nerdylicious committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    a961c37 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2015

  1. Moved malaria api code to its own Django app

    @Nerdylicious
    Nerdylicious committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    182b783 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2015

  1. Updated templates to use bootstrap components

    @Nerdylicious
    Nerdylicious committed Jul 26, 2015
    Configuration menu
    Copy the full SHA
    4be3e2d View commit details
    Browse the repository at this point in the history

  2. Moved some code from create_post view function to services layer

    @Nerdylicious
    Nerdylicious committed Jul 26, 2015
    Configuration menu
    Copy the full SHA
    80d5497 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. Changed error message text to white and updated Post model regex vali… 

    …dator to allow newlines and some special characters
    @Nerdylicious
    Nerdylicious committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    f94a5f5 View commit details
    Browse the repository at this point in the history

  2. Fixed width of description post contents and changed the color of som… 

    …e buttons
    @Nerdylicious
    Nerdylicious committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    6182fd0 View commit details
    Browse the repository at this point in the history

  3. Fixed how post description contents are displayed so that HTML line b… 

    …reaks are inserted where there are new lines in plaintext
    @Nerdylicious
    Nerdylicious committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    ce83754 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. Updated description_post field in the Post model to be a TextField. U… 

    …pdated title_post_rev field in RevPost model to include a regex validator and updated description_post_rev field in RevPost model to include a regex validator and to be a TextField.
    @Nerdylicious
    Nerdylicious committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    03f49cb View commit details
    Browse the repository at this point in the history

  2. Update author name displayed in Revision History so that the username… 

    … is displayed if the first name or the last name in a user’s profile hasnt been set
    @Nerdylicious
    Nerdylicious committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    0173720 View commit details
    Browse the repository at this point in the history

  3. Updated the update schema guide to remind the user to update the api … 

    …serializers if necessary
    @Nerdylicious
    Nerdylicious committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    7c27890 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2015

  1. Fixed header and footer to be responsive to window size changes

    @Nerdylicious
    Nerdylicious committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    6d81ca1 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2015

  1. Added profile button in header

    @Nerdylicious
    Nerdylicious committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    da4f7f8 View commit details
    Browse the repository at this point in the history

  2. Added logout button to header

    @Nerdylicious
    Nerdylicious committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    93e7546 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2015

  1. Updated views so that functionality is only accessible when a user is… 

    … logged in, otherwise the user is redirected to the login page
    @Nerdylicious
    Nerdylicious committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    b480a81 View commit details
    Browse the repository at this point in the history

  2. Added tests for get_posts_by_id

    @Nerdylicious
    Nerdylicious committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    9a5e5ba View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2015

  1. Added unit tests for deleting posts

    @Nerdylicious
    Nerdylicious committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    9ca1645 View commit details
    Browse the repository at this point in the history

  2. Added unit tests for create_revpost method

    @Nerdylicious
    Nerdylicious committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    c7dc6a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2015

  1. Added unit tests for get_revposts_of_owner function

    @Nerdylicious
    Nerdylicious committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    5498b87 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2015

  1. Added test cases with an additional owner

    @Nerdylicious
    Nerdylicious committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    109326c View commit details
    Browse the repository at this point in the history

  2. Put import on multiple lines to comply with PEP8

    @Nerdylicious
    Nerdylicious committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    41e7a42 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2015

  1. Added .travis.yml file

    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    5b35438 View commit details
    Browse the repository at this point in the history

  2. Updated .travis.yml

    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    7c86f0f View commit details
    Browse the repository at this point in the history

  3. Updated .travis.yml

    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    0693cfa View commit details
    Browse the repository at this point in the history

  4. Added Travis CI status image in README.md

    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    248026f View commit details
    Browse the repository at this point in the history

  5. Added Travis CI status image in README.md

    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    98eb4ee View commit details
    Browse the repository at this point in the history

  6. Update .travis.yml file 

    Updated .travis.yml file to make my build pass
    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    6ae95a1 View commit details
    Browse the repository at this point in the history

  7. Update .travis.yml file so that builds are sent to container-based in… 

    …frastructure
    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    50f00e0 View commit details
    Browse the repository at this point in the history

  8. Updated .travis.yml file

    @Nerdylicious
    Nerdylicious committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    2c2bb8a View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Merge pull request #29 from Nerdylicious/master 

    Merge request #2 after updating .travis.yml file
    @Nerdylicious
    Nerdylicious committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    66ed26a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. PeaceTrack App removed

    @medhach
    medhach committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    298b99b View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2016

  1. Moved registration functionality to own django app

    @medhach
    medhach committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    de68179 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #53 from medhach/develop 

    PeaceTrack App removed
    @Nerdylicious
    Nerdylicious committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    f6662ad View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2016

  1. Allow ' in Post description

    @medhach
    medhach committed Jun 19, 2016
    Configuration menu
    Copy the full SHA
    d6d9d07 View commit details
    Browse the repository at this point in the history

  2. Separated CSS from HTML.

    @medhach
    medhach committed Jun 19, 2016
    Configuration menu
    Copy the full SHA
    d7e59e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2016

  1. Made necessary changes in signup app

    @medhach
    medhach committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    8d1cb0b View commit details
    Browse the repository at this point in the history

  2. Profile functionality moved to separate app

    @medhach
    medhach committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    ebc1b2b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. Merge pull request #55 from medhach/develop 

    Profile functionality moved to separate Django app
    @Nerdylicious
    Nerdylicious committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    113dc26 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. Changed app name from malaria to malaria_web

    @medhach
    medhach committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    e09e69b View commit details
    Browse the repository at this point in the history

  2. Changed Contents to link systers/Installation Guide

    @medhach
    medhach committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    a03cdad View commit details
    Browse the repository at this point in the history

  3. Removed revpost title_change and description_change fields

    @medhach
    medhach committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    c4aa830 View commit details
    Browse the repository at this point in the history

  4. Travis Build repairs

    @medhach
    medhach committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    ce6f49a View commit details
    Browse the repository at this point in the history

  5. Travis repair

    @medhach
    medhach committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    7d18b72 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2016

  1. Merge pull request #56 from medhach/develop 

    Solved few issues
    @Nerdylicious
    Nerdylicious committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    8a76de1 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Added PCSA front-end pages and in-app functionality

    @medhach
    medhach committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    d2aac5f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2016

  1. Merge pull request #57 from medhach/develop 

    Added PCSA front-end pages and in-app functionality
    @AngieSky
    AngieSky committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    67b85cb View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. serializers.py added to Pcsa

    @medhach
    medhach committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    64c606c View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2016

  1. Merge pull request #60 from medhach/develop 

    serializers.py added to Pcsa
    @Nerdylicious
    Nerdylicious committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    6c99c17 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. Implemented model and serializer for Malaria users

    @medhach
    medhach committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    81f4342 View commit details
    Browse the repository at this point in the history

  2. Added id attribute to pcsa serializer

    @medhach
    medhach committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    faa3d0c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2016

  1. Merge pull request #62 from medhach/develop 

    New Functionality for Malaria app
    @AngieSky
    AngieSky committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    7bdf097 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2016

  1. Merge branch 'master' of https://github.com/Tahirih-Natang/app-web-se… 

    …rver into develop
    @Tahirih-Natang
    Tahirih-Natang committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    f6abbb2 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. Merge pull request #1 from systers/develop 

    merge all updates
    @Tahirih-Natang
    Tahirih-Natang committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    55f8df8 View commit details
    Browse the repository at this point in the history

  2. updates

    @krysnuvadga
    krysnuvadga committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    aff4df1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/Tahirih-Natang/app-web-s… 

    …erver into develop
    @Tahirih-Natang
    Tahirih-Natang committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    0cae462 View commit details
    Browse the repository at this point in the history