Code

Merge new changes#11

Code

Open

krysnuvadga wants to merge 58 commits intopeacecorps:developpeacecorps/app-web-server:developfrom Tahirih-Natang:developCopy head branch name to clipboard

+12,597-72,367

Commits

Commits on Jul 17, 2015

• Create .travis.yml

  Show description for eca68a3
  rosariorobinson

  committed
  eca68a3

• Delete .travis.yml

  rosariorobinson

  committed
  4d78f19

Commits on Jul 18, 2015

• Experimenting with Bootstrap forms

  Nerdylicious

  committed
  3853476

Commits on Jul 22, 2015

• Moved malaria functionality to its own Django app

  Nerdylicious

  committed
  ac5cfe5

• Added update schema guide

  Nerdylicious

  committed
  a961c37

Commits on Jul 23, 2015

• Moved malaria api code to its own Django app

  Nerdylicious

  committed
  182b783

Commits on Jul 26, 2015

• Updated templates to use bootstrap components

  Nerdylicious

  committed
  4be3e2d

• Moved some code from create_post view function to services layer

  Nerdylicious

  committed
  80d5497

Commits on Jul 29, 2015

• Changed error message text to white and updated Post model regex validator to allow newlines and some special characters

  Nerdylicious

  committed
  f94a5f5

• Fixed width of description post contents and changed the color of some buttons

  Nerdylicious

  committed
  6182fd0

• Fixed how post description contents are displayed so that HTML line breaks are inserted where there are new lines in plaintext

  Nerdylicious

  committed
  ce83754

Commits on Jul 31, 2015

• Updated description_post field in the Post model to be a TextField. Updated title_post_rev field in RevPost model to include a regex validator and updated description_post_rev field in RevPost mode…

  Show description for 03f49cb
  Nerdylicious

  committed
  03f49cb

• 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

  committed
  0173720

• Updated the update schema guide to remind the user to update the api serializers if necessary

  Nerdylicious

  committed
  7c27890

Commits on Aug 1, 2015

• Fixed header and footer to be responsive to window size changes

  Nerdylicious

  committed
  6d81ca1

Commits on Aug 4, 2015

• Added profile button in header

  Nerdylicious

  committed
  da4f7f8

• Added logout button to header

  Nerdylicious

  committed
  93e7546

Commits on Aug 5, 2015

• Updated views so that functionality is only accessible when a user is logged in, otherwise the user is redirected to the login page

  Nerdylicious

  committed
  b480a81

• Added tests for get_posts_by_id

  Nerdylicious

  committed
  9a5e5ba

Commits on Aug 8, 2015

• Added unit tests for deleting posts

  Nerdylicious

  committed
  9ca1645

• Added unit tests for create_revpost method

  Nerdylicious

  committed
  c7dc6a6

Commits on Aug 11, 2015

• Added unit tests for get_revposts_of_owner function

  Nerdylicious

  committed
  5498b87

Commits on Aug 14, 2015

• Added test cases with an additional owner

  Nerdylicious

  committed
  109326c

• Put import on multiple lines to comply with PEP8

  Nerdylicious

  committed
  41e7a42

Commits on Aug 20, 2015

• Added .travis.yml file

  Nerdylicious

  committed
  5b35438

• Updated .travis.yml

  Nerdylicious

  committed
  7c86f0f

• Updated .travis.yml

  Nerdylicious

  committed
  0693cfa

• Added Travis CI status image in README.md

  Nerdylicious

  committed
  248026f

• Added Travis CI status image in README.md

  Nerdylicious

  committed
  98eb4ee

• Update .travis.yml file

  Show description for 6ae95a1
  Nerdylicious

  committed
  6ae95a1

• Update .travis.yml file so that builds are sent to container-based infrastructure

  Nerdylicious

  committed
  50f00e0

• Updated .travis.yml file

  Nerdylicious

  committed
  2c2bb8a

Commits on Jan 11, 2016

• Merge pull request #29 from Nerdylicious/master

  Show description for 66ed26a
  Nerdylicious

  committed
  66ed26a

Commits on Jun 15, 2016

• PeaceTrack App removed

  medhach

  committed
  298b99b

Commits on Jun 18, 2016

• Moved registration functionality to own django app

  medhach

  committed
  de68179

• Merge pull request #53 from medhach/develop

  Show description for f6662ad
  Nerdylicious

  authored
  f6662ad

Commits on Jun 19, 2016

• Allow ' in Post description

  medhach

  committed
  d6d9d07

• Separated CSS from HTML.

  medhach

  committed
  d7e59e5

Commits on Jun 21, 2016

• Made necessary changes in signup app

  medhach

  committed
  8d1cb0b

• Profile functionality moved to separate app

  medhach

  committed
  ebc1b2b

Commits on Jun 22, 2016

• Merge pull request #55 from medhach/develop

  Show description for 113dc26
  Nerdylicious

  authored
  113dc26

Commits on Jun 24, 2016

• Changed app name from malaria to malaria_web

  medhach

  committed
  e09e69b

• Changed Contents to link systers/Installation Guide

  medhach

  committed
  a03cdad

• Removed revpost title_change and description_change fields

  medhach

  committed
  c4aa830

• Travis Build repairs

  medhach

  committed
  ce6f49a

• Travis repair

  medhach

  committed
  7d18b72

Commits on Jun 25, 2016

• Merge pull request #56 from medhach/develop

  Show description for 8a76de1
  Nerdylicious

  authored
  8a76de1

Commits on Jul 6, 2016

• Added PCSA front-end pages and in-app functionality

  medhach

  committed
  d2aac5f

Commits on Jul 10, 2016

• Merge pull request #57 from medhach/develop

  Show description for 67b85cb
  AngieSky

  authored
  67b85cb

Commits on Jul 13, 2016

• serializers.py added to Pcsa

  medhach

  committed
  64c606c

Commits on Jul 17, 2016

• Merge pull request #60 from medhach/develop

  Show description for 6c99c17
  Nerdylicious

  authored
  6c99c17

Commits on Jul 20, 2016

• Implemented model and serializer for Malaria users

  medhach

  committed
  81f4342

• Added id attribute to pcsa serializer

  medhach

  committed
  faa3d0c

Commits on Jul 24, 2016

• Merge pull request #62 from medhach/develop

  Show description for 7bdf097
  AngieSky

  authored
  7bdf097

Commits on Jul 30, 2016

• Merge branch 'master' of https://github.com/Tahirih-Natang/app-web-server into develop

  Tahirih-Natang

  committed
  f6abbb2

Commits on Aug 8, 2016

• Merge pull request #1 from systers/develop

  Show description for 55f8df8
  Tahirih-Natang

  authored
  55f8df8

• updates

  krysnuvadga

  committed
  aff4df1

• Merge branch 'develop' of https://github.com/Tahirih-Natang/app-web-server into develop

  Tahirih-Natang

  committed
  0cae462