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.

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

Merge new changes #11

Open
wants to merge 58 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
eca68a3
Create .travis.yml
rosariorobinson Jul 17, 2015
4d78f19
Delete .travis.yml
rosariorobinson Jul 17, 2015
3853476
Experimenting with Bootstrap forms
Nerdylicious Jul 18, 2015
ac5cfe5
Moved malaria functionality to its own Django app
Nerdylicious Jul 22, 2015
a961c37
Added update schema guide
Nerdylicious Jul 22, 2015
182b783
Moved malaria api code to its own Django app
Nerdylicious Jul 23, 2015
4be3e2d
Updated templates to use bootstrap components
Nerdylicious Jul 26, 2015
80d5497
Moved some code from create_post view function to services layer
Nerdylicious Jul 26, 2015
f94a5f5
Changed error message text to white and updated Post model regex vali…
Nerdylicious Jul 29, 2015
6182fd0
Fixed width of description post contents and changed the color of som…
Nerdylicious Jul 29, 2015
ce83754
Fixed how post description contents are displayed so that HTML line b…
Nerdylicious Jul 29, 2015
03f49cb
Updated description_post field in the Post model to be a TextField. U…
Nerdylicious Jul 31, 2015
0173720
Update author name displayed in Revision History so that the username…
Nerdylicious Jul 31, 2015
7c27890
Updated the update schema guide to remind the user to update the api …
Nerdylicious Jul 31, 2015
6d81ca1
Fixed header and footer to be responsive to window size changes
Nerdylicious Aug 1, 2015
da4f7f8
Added profile button in header
Nerdylicious Aug 4, 2015
93e7546
Added logout button to header
Nerdylicious Aug 4, 2015
b480a81
Updated views so that functionality is only accessible when a user is…
Nerdylicious Aug 5, 2015
9a5e5ba
Added tests for get_posts_by_id
Nerdylicious Aug 5, 2015
9ca1645
Added unit tests for deleting posts
Nerdylicious Aug 8, 2015
c7dc6a6
Added unit tests for create_revpost method
Nerdylicious Aug 8, 2015
5498b87
Added unit tests for get_revposts_of_owner function
Nerdylicious Aug 11, 2015
109326c
Added test cases with an additional owner
Nerdylicious Aug 14, 2015
41e7a42
Put import on multiple lines to comply with PEP8
Nerdylicious Aug 14, 2015
5b35438
Added .travis.yml file
Nerdylicious Aug 20, 2015
7c86f0f
Updated .travis.yml
Nerdylicious Aug 20, 2015
0693cfa
Updated .travis.yml
Nerdylicious Aug 20, 2015
248026f
Added Travis CI status image in README.md
Nerdylicious Aug 20, 2015
98eb4ee
Added Travis CI status image in README.md
Nerdylicious Aug 20, 2015
6ae95a1
Update .travis.yml file
Nerdylicious Aug 20, 2015
50f00e0
Update .travis.yml file so that builds are sent to container-based in…
Nerdylicious Aug 20, 2015
2c2bb8a
Updated .travis.yml file
Nerdylicious Aug 20, 2015
66ed26a
Merge pull request #29 from Nerdylicious/master
Nerdylicious Jan 11, 2016
298b99b
PeaceTrack App removed
medhach Jun 15, 2016
de68179
Moved registration functionality to own django app
medhach Jun 18, 2016
f6662ad
Merge pull request #53 from medhach/develop
Nerdylicious Jun 18, 2016
d6d9d07
Allow ' in Post description
medhach Jun 19, 2016
d7e59e5
Separated CSS from HTML.
medhach Jun 19, 2016
8d1cb0b
Made necessary changes in signup app
medhach Jun 21, 2016
ebc1b2b
Profile functionality moved to separate app
medhach Jun 21, 2016
113dc26
Merge pull request #55 from medhach/develop
Nerdylicious Jun 22, 2016
e09e69b
Changed app name from malaria to malaria_web
medhach Jun 24, 2016
a03cdad
Changed Contents to link systers/Installation Guide
medhach Jun 24, 2016
c4aa830
Removed revpost title_change and description_change fields
medhach Jun 24, 2016
ce6f49a
Travis Build repairs
medhach Jun 24, 2016
7d18b72
Travis repair
medhach Jun 24, 2016
8a76de1
Merge pull request #56 from medhach/develop
Nerdylicious Jun 25, 2016
d2aac5f
Added PCSA front-end pages and in-app functionality
medhach Jul 6, 2016
67b85cb
Merge pull request #57 from medhach/develop
AngieSky Jul 10, 2016
64c606c
serializers.py added to Pcsa
medhach Jul 13, 2016
6c99c17
Merge pull request #60 from medhach/develop
Nerdylicious Jul 17, 2016
81f4342
Implemented model and serializer for Malaria users
medhach Jul 20, 2016
faa3d0c
Added id attribute to pcsa serializer
medhach Jul 20, 2016
7bdf097
Merge pull request #62 from medhach/develop
AngieSky Jul 24, 2016
f6abbb2
Merge branch 'master' of https://github.com/Tahirih-Natang/app-web-se…
Tahirih-Natang Jul 30, 2016
55f8df8
Merge pull request #1 from systers/develop
Tahirih-Natang Aug 8, 2016
aff4df1
updates
krysnuvadga Aug 8, 2016
0cae462
Merge branch 'develop' of https://github.com/Tahirih-Natang/app-web-s…
Tahirih-Natang Aug 8, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
sudo: false
language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "nightly"

# command to install dependencies
install: "pip install -r requirements.txt"

# command to run tests
script: nosetests
install:
- "pip install -r requirements.txt"
before_script:
- psql -c "create role myuser with createrole createdb login password 'mypassword';" -U postgres
- psql -c "create database webapp;" -U postgres
script: python manage.py test
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<h1>Malaria App Project</h1>
Malaria App Project [![Build Status](https://travis-ci.org/Nerdylicious/app-web-server.svg?branch=master)](https://travis-ci.org/Nerdylicious/app-web-server)
==============

The malaria-app-readme repository is intended to be the central repo for discussions, decision making, and feedback about the project goals and features so that the user experience across platforms is uniform. Comments and coding for a specific platform can happen at the repositories linked to below.

Expand Down
Loading