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

Conversation

krysnuvadga
Copy link

No description provided.

rosariorobinson and others added 30 commits July 17, 2015 07:51
@rosariorobinson
Create .travis.yml
eca68a3 
Creating .travis.yml file for Python
@rosariorobinson
Delete .travis.yml
4d78f19
@Nerdylicious
Experimenting with Bootstrap forms
3853476
@Nerdylicious
Moved malaria functionality to its own Django app
ac5cfe5
@Nerdylicious
Added update schema guide
a961c37
@Nerdylicious
Moved malaria api code to its own Django app
182b783
@Nerdylicious
Updated templates to use bootstrap components
4be3e2d
@Nerdylicious
Moved some code from create_post view function to services layer
80d5497
@Nerdylicious
Changed error message text to white and updated Post model regex vali…
f94a5f5 
…dator to allow newlines and some special characters
@Nerdylicious
Fixed width of description post contents and changed the color of som…
6182fd0 
…e buttons
@Nerdylicious
Fixed how post description contents are displayed so that HTML line b…
ce83754 
…reaks are inserted where there are new lines in plaintext
@Nerdylicious
Updated description_post field in the Post model to be a TextField. U…
03f49cb 
…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
Update author name displayed in Revision History so that the username…
0173720 
… is displayed if the first name or the last name in a user’s profile hasnt been set
@Nerdylicious
Updated the update schema guide to remind the user to update the api …
7c27890 
…serializers if necessary
@Nerdylicious
Fixed header and footer to be responsive to window size changes
6d81ca1
@Nerdylicious
Added profile button in header
da4f7f8
@Nerdylicious
Added logout button to header
93e7546
@Nerdylicious
Updated views so that functionality is only accessible when a user is…
b480a81 
… logged in, otherwise the user is redirected to the login page
@Nerdylicious
Added tests for get_posts_by_id
9a5e5ba
@Nerdylicious
Added unit tests for deleting posts
9ca1645
@Nerdylicious
Added unit tests for create_revpost method
c7dc6a6
@Nerdylicious
Added unit tests for get_revposts_of_owner function
5498b87
@Nerdylicious
Added test cases with an additional owner
109326c
@Nerdylicious
Put import on multiple lines to comply with PEP8
41e7a42
@Nerdylicious
Added .travis.yml file
5b35438
@Nerdylicious
Updated .travis.yml
7c86f0f
@Nerdylicious
Updated .travis.yml
0693cfa
@Nerdylicious
Added Travis CI status image in README.md
248026f
@Nerdylicious
Added Travis CI status image in README.md
98eb4ee
@Nerdylicious
Update .travis.yml file
6ae95a1 
Updated .travis.yml file to make my build pass
Nerdylicious and others added 28 commits August 20, 2015 01:08
@Nerdylicious
Update .travis.yml file so that builds are sent to container-based in…
50f00e0 
…frastructure
@Nerdylicious
Updated .travis.yml file
2c2bb8a
@Nerdylicious
Merge pull request #29 from Nerdylicious/master
66ed26a 
Merge request #2 after updating .travis.yml file
@medhach
PeaceTrack App removed
298b99b
@medhach
Moved registration functionality to own django app
de68179
@Nerdylicious
Merge pull request #53 from medhach/develop
f6662ad 
PeaceTrack App removed
@medhach
Allow ' in Post description
d6d9d07
@medhach
Separated CSS from HTML.
d7e59e5
@medhach
Made necessary changes in signup app
8d1cb0b
@medhach
Profile functionality moved to separate app
ebc1b2b
@Nerdylicious
Merge pull request #55 from medhach/develop
113dc26 
Profile functionality moved to separate Django app
@medhach
Changed app name from malaria to malaria_web
e09e69b
@medhach
Changed Contents to link systers/Installation Guide
a03cdad
@medhach
Removed revpost title_change and description_change fields
c4aa830
@medhach
Travis Build repairs
ce6f49a
@medhach
Travis repair
7d18b72
@Nerdylicious
Merge pull request #56 from medhach/develop
8a76de1 
Solved few issues
@medhach
Added PCSA front-end pages and in-app functionality
d2aac5f
@AngieSky
Merge pull request #57 from medhach/develop
67b85cb 
Added PCSA front-end pages and in-app functionality
@medhach
serializers.py added to Pcsa
64c606c
@Nerdylicious
Merge pull request #60 from medhach/develop
6c99c17 
serializers.py added to Pcsa
@medhach
Implemented model and serializer for Malaria users
81f4342
@medhach
Added id attribute to pcsa serializer
faa3d0c
@AngieSky
Merge pull request #62 from medhach/develop
7bdf097 
New Functionality for Malaria app
@Tahirih-Natang
Merge branch 'master' of https://github.com/Tahirih-Natang/app-web-se…
f6abbb2 
…rver into develop
@Tahirih-Natang
Merge pull request #1 from systers/develop
55f8df8 
merge all updates
@krysnuvadga
updates
aff4df1
@Tahirih-Natang
Merge branch 'develop' of https://github.com/Tahirih-Natang/app-web-s…
0cae462 
…erver into develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@krysnuvadga @rosariorobinson @Nerdylicious @medhach @AngieSky @Tahirih-Natang