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

gci #10

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

gci #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
357 commits
Select commit Hold shift + click to select a range
c5f565b
button navy blue
muddlebee Feb 28, 2017
04b5e64
fixed views so that user is unable to access session after logout
mish24 Mar 1, 2017
9523fc6
fixed views and templates to edit contacts
mish24 Mar 1, 2017
268160d
Merge pull request #163 from mish24/new_utils
medhach Mar 1, 2017
4488f0b
Merge pull request #164 from yatna/cheat
medhach Mar 1, 2017
864303b
Merge pull request #166 from yatna/glyphicons
medhach Mar 1, 2017
1ab189b
Add missing info and sectionalize Contribution.md
yatna Mar 1, 2017
c1d8064
Moved 'New Contact' Button to the right
yatna Mar 1, 2017
4093ab8
added tests and updated services for pcsa_GHN
mish24 Mar 2, 2017
2d38384
Modified home to display description too
mish24 Mar 2, 2017
8c22117
Added labels in edit profile and removed picture division
mish24 Mar 2, 2017
24d017e
feat(Incorrect links fixed)
aradhyamathur Mar 6, 2017
e95cd45
Merge pull request #194 from mish24/remove_pc
medhach Mar 8, 2017
d6381ef
Merge pull request #179 from mish24/add-contact
medhach Mar 8, 2017
a88bdcf
Merge pull request #154 from anweshknayak/buttons
medhach Mar 8, 2017
27a25d3
Merge pull request #177 from mish24/logout-fix
medhach Mar 8, 2017
ef61118
Merge pull request #192 from mish24/test-contact
medhach Mar 8, 2017
936cf2d
Merge pull request #165 from yatna/patch-4
medhach Mar 8, 2017
c98c7e3
Merge pull request #190 from yatna/move_btn
medhach Mar 9, 2017
70bbd2a
fixed merge conflicts
mish24 Mar 9, 2017
b53d1ad
Update config for autoenv
muddlebee Mar 9, 2017
8ab0c50
customized admin to show various models and made email and name manda…
mish24 Mar 9, 2017
3b2f71b
fixed views so that users cannot access each other's info through urls
mish24 Mar 9, 2017
c07f9d5
Merge pull request #193 from mish24/description
medhach Mar 10, 2017
02182d1
Merge pull request #200 from mish24/admin
medhach Mar 10, 2017
a58a154
Merge pull request #201 from mish24/authorize
medhach Mar 10, 2017
06a8bd8
Merge pull request #198 from aradhyamathur/develop
medhach Mar 10, 2017
96b9d6e
Merge pull request #203 from anweshknayak/patch-2
medhach Mar 10, 2017
637d259
restricted users from entering whitespace as data in posts and contacts
mish24 Mar 11, 2017
69e725e
prevented the autofilling of posts and contacts on clicking the back …
mish24 Mar 11, 2017
6a48779
Fixed confusing message
Raxerz Mar 12, 2017
6780070
Fixed bug in buttons and typo
yatna Mar 12, 2017
a47802a
Edit profile displays correct gender
yatna Mar 1, 2017
2334ffd
Revert "fixed unresponsive button"
muddlebee Mar 12, 2017
859bd4b
modified the installation guide and readme with new links
mish24 Mar 13, 2017
2e9d12b
Small fix
muddlebee Mar 21, 2017
da8ac7d
Merge pull request #205 from mish24/whitespace
medhach Mar 23, 2017
0bba390
Merge pull request #210 from mish24/dont-refill
medhach Mar 23, 2017
fd6d0ae
Merge pull request #213 from Raxerz/develop
medhach Mar 23, 2017
95fe3c1
Merge pull request #191 from yatna/hyp_btn
medhach Mar 23, 2017
8053771
Merge pull request #189 from yatna/fix_gender
medhach Mar 23, 2017
e66829f
Merge pull request #215 from mish24/ins
medhach Mar 23, 2017
1f8aa1d
Merge pull request #216 from anweshknayak/revert-145-ash-button
medhach Mar 23, 2017
f90b870
Merge pull request #233 from anweshknayak/patch-3
medhach Mar 23, 2017
3c17b07
Render same page on error and login UI change
GunpreetAhuja Mar 27, 2017
b69c492
Set minimum post length
GunpreetAhuja Mar 28, 2017
e20a17d
Made the required fields mandatory in Edit Profile page
HarinderKaur11 Mar 28, 2017
d1b3fb9
Removing sticky header feature
mikael19 Mar 30, 2017
1002d03
Changed names of policies and details
sreejakshetty Apr 1, 2017
3393050
Merge pull request #245 from GunpreetAhuja/develop
medhach Apr 2, 2017
437addd
Merge pull request #253 from GunpreetAhuja/post_lengths
medhach Apr 2, 2017
e71f707
Merge pull request #254 from HarinderGithub/edit
medhach Apr 2, 2017
86406c2
Merge pull request #256 from kera99/header_correction
medhach Apr 2, 2017
c598c61
Merge pull request #257 from kamishettysreeja25/changetitle
medhach Apr 2, 2017
76a6765
Editing lines 258 to 262 for better understanding
GunpreetAhuja Apr 2, 2017
382f5a6
Merge pull request #259 from GunpreetAhuja/guide
medhach Apr 2, 2017
7065aa3
only alphanumeric characters allowed for username
GunpreetAhuja May 17, 2017
2d3bd03
Merge pull request #297 from GunpreetAhuja/alphanumeric
medhach May 20, 2017
493766b
uniform header
GunpreetAhuja May 22, 2017
3359640
Merge pull request #301 from GunpreetAhuja/uniform_header
medhach May 23, 2017
ab2a77c
uniform header
GunpreetAhuja May 24, 2017
f38b529
Merge pull request #302 from GunpreetAhuja/uniform_header
medhach Jun 4, 2017
bc4b379
Fixed error on signup page
Jun 7, 2017
58f7bbc
Merge pull request #304 from yatna/develop
medhach Jun 7, 2017
9d66cc2
UI Improvements (#306)
GunpreetAhuja Jun 11, 2017
eacbf48
Upgradation: Error Resolution
Jun 19, 2017
4149640
Upgradation: Error Resolution 2
Jun 19, 2017
4d8554a
Final upgrade errors
Jun 22, 2017
7c3383b
Updating requirements and travis files
Jun 22, 2017
4470084
Updating travis file according to python3
Jun 22, 2017
92abd65
Updating travis file according to python3
Jun 22, 2017
d21dd08
Update installation guide
GunpreetAhuja Jun 23, 2017
e74bf22
Adding Python 3.6 installation instructions
GunpreetAhuja Jun 23, 2017
93fcebb
Revised Installation process
GunpreetAhuja Jun 24, 2017
2c8dec2
Empty test files and modify travis
GunpreetAhuja Jun 28, 2017
0ad60dd
Update PostgresSQL version
yatna Jun 28, 2017
b243fe7
Merge pull request #309 from yatna/patch-5
medhach Jun 28, 2017
88339ca
Added 'About' 'HelpPC' 'Policies' and 'Detail' pages to footer
yatna Jun 28, 2017
82dc5ab
Merge branch 'develop' into upgrade
GunpreetAhuja Jun 28, 2017
adcc2c8
Merge pull request #310 from yatna/add_pages
medhach Jun 29, 2017
4c9c113
Models code improvement
GunpreetAhuja Jun 29, 2017
a09ab54
Merge pull request #307 from GunpreetAhuja/upgrade
medhach Jul 2, 2017
cd983d1
Added Social Signup/Login
yatna Jul 3, 2017
ed48c90
Update settings.py
yatna Jul 3, 2017
a889c34
class based views
GunpreetAhuja Jul 5, 2017
5f990b5
Merge remote-tracking branch 'upstream/develop' into code_improvement
GunpreetAhuja Jul 5, 2017
58c378f
templates improved
GunpreetAhuja Jul 5, 2017
47f34d5
django allauth
GunpreetAhuja Jul 6, 2017
c2b6541
Update Installation Guide.md
yatna Jul 8, 2017
3e26243
Merge pull request #312 from yatna/myupgrade
medhach Jul 8, 2017
dc5858e
Merge pull request #313 from yatna/patch-6
medhach Jul 8, 2017
f9c9e46
django allauth implemented
GunpreetAhuja Jul 9, 2017
b4f58b6
conflict resolution
GunpreetAhuja Jul 9, 2017
14824c5
resolving travis error
GunpreetAhuja Jul 9, 2017
0f6b279
template modifications
GunpreetAhuja Jul 9, 2017
88b9966
Merge pull request #315 from GunpreetAhuja/test
medhach Jul 11, 2017
915fd4e
common templates and static folder
GunpreetAhuja Jul 13, 2017
2be8275
css changes
GunpreetAhuja Jul 13, 2017
ed7940c
Added sphinx documentation
yatna Jul 14, 2017
8427822
Remove contact number as imput field
GunpreetAhuja Jul 14, 2017
8239b47
Allow all characters for Post description
GunpreetAhuja Jul 15, 2017
0c35023
Extended Info Hub posts to support Images and External Links
yatna Jul 3, 2017
93c7b84
Changed photo field to image
yatna Jul 10, 2017
d417f87
Final modifications
yatna Jul 15, 2017
9910274
Added User's Display Picture in profile
yatna Jul 8, 2017
0621590
UI modifications
yatna Jul 15, 2017
1035e8d
Merge pull request #308 from yatna/extend
medhach Jul 15, 2017
042ded2
Merge pull request #314 from yatna/dp
medhach Jul 15, 2017
58ac709
Merge pull request #319 from yatna/sphinx_doc
medhach Jul 15, 2017
3724b06
Removed debug text from signup.html
yatna Jul 15, 2017
7bba8d9
Conflict resolution
GunpreetAhuja Jul 15, 2017
b47ee92
Merge branch 'develop' into post_description
GunpreetAhuja Jul 15, 2017
cde3984
Added documentation link to README.md
yatna Jul 15, 2017
3e919d9
Merge pull request #322 from yatna/gsoc_test
medhach Jul 16, 2017
5b14c1d
Merge branch 'develop' into code_improvement
medhach Jul 16, 2017
4e71062
Merge pull request #318 from GunpreetAhuja/code_improvement
medhach Jul 16, 2017
c99ea45
Merge pull request #321 from GunpreetAhuja/post_description
medhach Jul 16, 2017
a9382cf
Update README.md, Added Travis Status
medhach Jul 21, 2017
48e8e46
UI changes
GunpreetAhuja Jul 22, 2017
8a00d6f
resolve conflicts
GunpreetAhuja Jul 22, 2017
d6abebf
Bootstrap Integration
GunpreetAhuja Jul 22, 2017
f957a00
Merge branch 'develop' of https://github.com/systers/macc into bootstrap
GunpreetAhuja Jul 22, 2017
c5de143
responsive pages
GunpreetAhuja Jul 23, 2017
4887978
Bootstrap issues resolved
GunpreetAhuja Jul 23, 2017
117874d
search implemented
GunpreetAhuja Jul 25, 2017
884596e
search improved
GunpreetAhuja Jul 26, 2017
655dee4
sort malaria posts
GunpreetAhuja Jul 26, 2017
880e306
Merge pull request #324 from GunpreetAhuja/bootstrap
medhach Jul 27, 2017
350e7b9
Merge pull request #320 from GunpreetAhuja/contact
medhach Jul 27, 2017
0b1520d
Added models for firstaide API
yatna Jul 26, 2017
a9b9305
created models and UI for all API using common resources
yatna Jul 27, 2017
3f8bed3
pcsa post and contact sort
GunpreetAhuja Jul 27, 2017
e8c5017
Merge pull request #326 from yatna/gsoc_test
medhach Jul 28, 2017
421155c
Changes Post Type label to Post Category
medhach Jul 28, 2017
4fc4163
pcsa safety tools sort
GunpreetAhuja Jul 28, 2017
552eb7b
Merge branch 'develop' of https://github.com/systers/macc into search
GunpreetAhuja Jul 28, 2017
245fe6d
All 21 apis implemented usingeneric serializer and view
yatna Jul 31, 2017
0d748e0
Improved search and added timestamp to posts
GunpreetAhuja Jul 31, 2017
f907353
Merge pull request #327 from GunpreetAhuja/search
medhach Jul 31, 2017
d3a2e1b
Changed 'PCSA' to 'FirstAide'
yatna Aug 3, 2017
a831f48
Implement revision history
GunpreetAhuja Aug 4, 2017
d138f5f
merge
GunpreetAhuja Aug 4, 2017
a1a37ea
Only date for list post
GunpreetAhuja Aug 6, 2017
d5c232b
Remove contact number as input field
GunpreetAhuja Aug 7, 2017
0fc9ab0
Change button radius
GunpreetAhuja Aug 8, 2017
b428905
added link and image link to revision history
GunpreetAhuja Aug 7, 2017
2d7fd2e
Fixed image upload in posts
yatna Aug 7, 2017
f2f0b42
Merge pull request #328 from yatna/gsoc_test
medhach Aug 9, 2017
685a857
Merge branch 'develop' of https://github.com/systers/macc into improv…
GunpreetAhuja Aug 9, 2017
e8ba1be
Pull
medhach Aug 9, 2017
a3fed71
Merge pull request #330 from GunpreetAhuja/improvement
medhach Aug 10, 2017
03a26ef
delete confirmation modal
GunpreetAhuja Aug 10, 2017
e895544
Merge branch 'develop' of https://github.com/systers/macc into improv…
GunpreetAhuja Aug 10, 2017
c0d7c3a
delete modal confirmation corrected
GunpreetAhuja Aug 10, 2017
7f132f1
added favicon
GunpreetAhuja Aug 12, 2017
c2bf440
Feature to sync Malaria App User's data to MACC DB
yatna Aug 13, 2017
fbb037f
Fixed layout on PCSA API list page
yatna Aug 13, 2017
2978154
Merge branch 'develop' of https://github.com/systers/macc into gsoc_test
yatna Aug 13, 2017
31de002
Signup / login page span small-caps fault
GunpreetAhuja Aug 14, 2017
82252dd
Added inline comments
yatna Aug 17, 2017
515a8a5
Added inline comments
GunpreetAhuja Aug 18, 2017
48baa34
Merge pull request #329 from GunpreetAhuja/revpost
medhach Aug 19, 2017
dedc618
Merge branch 'develop' into improvement
medhach Aug 19, 2017
c6c77f6
Merge pull request #331 from GunpreetAhuja/improvement
medhach Aug 19, 2017
bafe56a
Merge pull request #332 from GunpreetAhuja/favicon
medhach Aug 19, 2017
990df07
Merge branch 'develop' into gsoc_test
medhach Aug 19, 2017
7ca7f99
Merge pull request #333 from yatna/gsoc_test
medhach Aug 19, 2017
4dcc47a
Merge pull request #334 from GunpreetAhuja/correction
medhach Aug 19, 2017
e5109ef
Update Views.py
medhach Aug 19, 2017
e66da0b
Update models.py
medhach Aug 19, 2017
940bb2b
Merge branch 'develop' into documentation
medhach Aug 19, 2017
bcac5d0
Update models.py
medhach Aug 19, 2017
6fac967
Merge pull request #335 from GunpreetAhuja/documentation
medhach Aug 19, 2017
b5c5826
Functionality to change username
GunpreetAhuja Aug 19, 2017
fadbad2
Merge branch 'develop' of https://github.com/systers/macc into username
GunpreetAhuja Aug 19, 2017
da23603
Username field required
GunpreetAhuja Aug 19, 2017
9ecad56
Inline comments
GunpreetAhuja Aug 19, 2017
a901573
Update settings.py
medhach Aug 19, 2017
f1f0732
Update models.py
medhach Aug 19, 2017
e54667b
Update models.py
medhach Aug 19, 2017
d9da77f
Update models.py
medhach Aug 19, 2017
1b7fa7c
Update models.py
medhach Aug 19, 2017
6ee5eaf
Merge pull request #337 from GunpreetAhuja/documentation
medhach Aug 19, 2017
027cfb6
Sphinx Documentation Updated
yatna Aug 17, 2017
6e39137
Fixed social login issue
yatna Aug 20, 2017
0c28194
Merge pull request #338 from yatna/gsoc_test
medhach Aug 20, 2017
ee455e6
Fixed bug in ListAppUsersView
yatna Aug 20, 2017
3f55733
Update settings.py
yatna Aug 20, 2017
654e33f
Documentation standards reviewed
GunpreetAhuja Aug 22, 2017
9f6b4a4
RevPost error resolved
GunpreetAhuja Aug 22, 2017
eda747b
Made search case-insensitive and improved it
GunpreetAhuja Aug 23, 2017
5b8f7ca
Merge pull request #340 from GunpreetAhuja/safe
medhach Aug 24, 2017
a75bb11
Merge pull request #336 from GunpreetAhuja/username
medhach Aug 24, 2017
61b6748
Merge pull request #341 from GunpreetAhuja/search_improvement
medhach Aug 24, 2017
49ec65f
profile page scroll removed
GunpreetAhuja Aug 28, 2017
a1f56d6
search labels pcsa to firstaide
GunpreetAhuja Aug 28, 2017
31975a8
mobile view login page correction
GunpreetAhuja Sep 5, 2017
cd1935c
Merge pull request #342 from GunpreetAhuja/safe
medhach Sep 8, 2017
a8bf1b8
Merge branch 'develop' into gsoc_test
yatna Sep 10, 2017
4cfb2fe
Added Youtube Demo links for MACC
yatna Sep 10, 2017
e4d48eb
Merge pull request #339 from yatna/gsoc_test
medhach Sep 10, 2017
1955be2
Merge pull request #343 from yatna/patch-8
medhach Sep 10, 2017
fd6cb66
Create code_of_conduct.md
Nov 8, 2017
6862237
Create reporting_guidelines.md
Nov 8, 2017
2b8ef03
Create CONTRIBUTING.md
janiceilene Jan 25, 2018
ccdbf91
Create ISSUE_TEMPLATE.md
janiceilene Jan 25, 2018
ddd5c78
Create PULL_REQUEST_TEMPLATE.md
janiceilene Jan 25, 2018
7d238b2
Merge pull request #344 from systers/Janiceilene-patch-1
Jan 29, 2018
96e4449
Merge pull request #346 from systers/Janiceilene-patch-3
Jan 29, 2018
c78afe7
Merge pull request #345 from systers/Janiceilene-patch-2
Jan 29, 2018
97f2c4f
Added u-test for forms and views in malaria_web
Tahirih-Natang Feb 16, 2018
663f3e9
Added u-test for forms in pcsa_GHN
Tahirih-Natang Feb 16, 2018
236d43a
Fix indentation and remove trailing whitespace
Tahirih-Natang Feb 16, 2018
c386ff8
Fix indentation
Tahirih-Natang Feb 16, 2018
3a43d1d
Enable CKEditor in HTML templates for creating and editing posts. Als…
Tahirih-Natang Feb 16, 2018
bb9e924
Update requirements.txt
Tahirih-Natang Feb 16, 2018
b5bbea6
Update gitignore
Tahirih-Natang Feb 16, 2018
5b3ab8c
Merge branch 'develop' of https://github.com/Tahirih-Natang/macc into…
Tahirih-Natang Feb 16, 2018
53f7691
Merge pull request #1 from systers/develop
Tahirih-Natang Feb 16, 2018
bf7021b
Delete tests.py
Tahirih-Natang Feb 16, 2018
c17e649
Delete tests.py
Tahirih-Natang Feb 16, 2018
2d3da71
Fix searchbox alignment in firefox and chrome browsers
valerycodes Feb 16, 2018
1b4687c
Update tests.py
Tahirih-Natang Feb 17, 2018
7e0cc1a
Update tests.py
Tahirih-Natang Feb 17, 2018
5964463
Update changes
valerycodes Feb 17, 2018
ff252d0
Remove some whitespaces in html templates
Tahirih-Natang Feb 19, 2018
a6c25df
Formated the settings file
Tahirih-Natang Feb 19, 2018
e85314e
Added some code formating and removed whitespaces
Tahirih-Natang Feb 19, 2018
8459320
Remove whitespaces in HTML template
Tahirih-Natang Feb 19, 2018
afe468f
Remove unecessary br tag
Tahirih-Natang Feb 19, 2018
6314cc1
Merge pull request #354 from Tahirih-Natang/develop
medhach Feb 20, 2018
65f4344
Merge pull request #356 from valerycodes/develop
medhach Feb 20, 2018
876bee3
resolve conflict
Tahirih-Natang Feb 20, 2018
dd77779
resolve conflict
Tahirih-Natang Feb 20, 2018
903d07c
resolve conflict
Tahirih-Natang Feb 20, 2018
2262ab1
Merge branch 'systers-develop' into CKEditor
Tahirih-Natang Feb 20, 2018
7b920a5
update settings file
Tahirih-Natang Feb 20, 2018
ac48863
Remove unused packages in requirements.txt
Tahirih-Natang Feb 20, 2018
68ebd43
Merge pull request #355 from Tahirih-Natang/CKEditor
medhach Feb 21, 2018
6db707d
Merge pull request #3 from systers/develop
Tahirih-Natang Feb 22, 2018
a45adeb
remove cluster
Tahirih-Natang Feb 22, 2018
d5de17e
Merge branch 'develop' of https://github.com/Tahirih-Natang/macc into…
Tahirih-Natang Feb 22, 2018
bca1127
Added validation to contact_number filed
Tahirih-Natang Feb 22, 2018
7f10c48
change form input for contact number to phone
Tahirih-Natang Feb 22, 2018
204570d
updated regex, set max-length to 15
Tahirih-Natang Feb 22, 2018
55d97f2
Merge pull request #357 from Tahirih-Natang/phone-number-field
medhach Feb 25, 2018
67a8bd0
Updated to new version of guidelines
janiceilene Feb 26, 2018
dd4465c
Removed trailing p tag
valerycodes Mar 4, 2018
ddcb424
Merge pull request #360 from valerycodes/patch-#349
medhach Mar 6, 2018
235db36
Merge pull request #359 from systers/Janiceilene-patch-1
medhach Mar 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export DJANGO_SETTINGS_MODULE="infohub.settings"
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
*.txt
.vagrant*
submit/
*.DS_Store
*/migrations/
credentials.json
28 changes: 16 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
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
# - "2.6"
# - "2.7"
- "3.6"
install:
- "pip3 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
- export DJANGO_SETTINGS_MODULE="infohub.settings"
script:
- python3 manage.py makemigrations profiles
- python3 manage.py migrate --fake-initial
- python3 manage.py makemigrations infohub malaria_web pcsa pcsa_GHN pcsa_safety_tools
- python3 manage.py migrate --fake-initial
# - python3 manage.py test --settings=infohub.settings
11 changes: 11 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Contributing Guidelines
* You can join our [slack channel](http://systers.io/slack-systers-opensource/). Each active repo has its own channel to direct questions to (for example #powerup or #portal).
* Remember that this is an inclusive community, committed to creating a safe, positive environment. See the full [Code of Conduct](http://www.systers.io/code-of-conduct.html).
## General Guidelines
* If you’re just getting started work on an issue labeled “First Timers Only” in any project. Additional resources are available on our [website](http://www.systers.io).
* In an active repository (not an archived one), choose an open issue from the issue list, claim it in the comments, and a maintainer will assign it to you.
* After approval you must make continuous notes on your progress in the issue while working. If there is not at least one comment every 3 days, the maintainer can reassign the issue.
* When sending a PR have an appropriate title referencing the issue which it solves. Add “fixes #<issue-number>” in the commit body, so that when the PR gets merged, the issue gets closed automatically. Do not do this if the PR solves only a part of the issue. See more information on commit guidelines [here](https://udacity.github.io/git-styleguide/).
* If you’d like to create a new issue, please go through our issue list first (open as well as closed) and make sure the issues you are reporting do not replicate the existing issues.
* Have a short description on what has gone wrong (like a root cause analysis and description of the fix), if that information is not already present in the issue.
* If you have issues on multiple pages, report them separately. Do not combine them into a single issue.
20 changes: 20 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Description
As a [USER],
I need [TO DO THIS],
so that I can [ACCOMPLISH THAT].

## Mocks
[INSERT RELEVANT PNG FILE]

## Acceptance Criteria
### Update [Required]
- [ ] [LIST ITEMS]
### Enhancement to Update [Optional]
- [ ] [LIST ITEMS]

## Definition of Done
- [ ] All of the required items are completed.
- [ ] Approval by 1 mentor.

## Estimation
[INSERT NUMBER HERE] hours
42 changes: 42 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
### Description
Include a summary of the change and relevant motivation/context. List any dependencies that are required for this change.

Fixes # [ISSUE]

### Type of Change:
**Delete irrelevant options.**

- Code
- Quality Assurance
- User Interface
- Outreach
- Documentation


**Code/Quality Assurance Only**
- Bug fix (non-breaking change which fixes an issue)
- This change requires a documentation update (software upgrade on readme file)
- New feature (non-breaking change which adds functionality pre-approved by mentors)



### How Has This Been Tested?
Describe the tests you ran to verify your changes. Provide instructions or GIFs so we can reproduce. List any relevant details for your test.


### Checklist:
**Delete irrelevant options.**

- [ ] My PR follows the style guidelines of this project
- [ ] I have performed a self-review of my own code or materials
- [ ] I have commented my code or provided relevant documentation, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] Any dependent changes have been merged


**Code/Quality Assurance Only**
- [ ] My changes generate no new warnings
- [ ] My PR currently breaks something (fix or feature that would cause existing functionality to not work as expected)
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been published in downstream modules
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

44 changes: 14 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,25 @@
<h1>Malaria App Project</h1>
# Mobile App Control Center (MACC) [![Build Status](https://travis-ci.org/systers/macc.svg?branch=develop)](https://travis-ci.org/systers/macc)

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.
MACC is a backend platform for the Peace Corps mobile applications - Malaria and FirstAide. The Mobile App Control Center allows the volunteers at Peace Corps HQ to send or edit any information in their mobile applications through a set of APIs.

<h3>Link to README Repo:</h3> https://github.com/PeaceCorps/malaria-app-readme

## On Malaria App
MACC works on Malaria Prevention application as infoHub, a portal where posts can be added and notified to the mobile app users(volunteers). Posts on infoHub mainly focus on malaria prevention tips and malaria awareness.

Please keep all discussion regarding features that will be cross-platform on that repository, and code-specific discussion on this one.
## On FirstAide App
MACC works on PCSA mobile and web apps, MACC makes the mobile apps fully dynamic and all the information present in the mobile apps is fetched from MACC through APIs.


Installation Guide - [here](https://github.com/systers/macc/blob/develop/docs/Installation%20Guide.md)

Documentation - [Here](https://drive.google.com/open?id=0B6cRm7QFaag1YWNTZ2stcmdieTQ) *(Extract .zip - > open _build/html/index.html )*

<h2>Application Description</h2>
API Documentation - [here](https://docs.google.com/document/d/1uQ42HQGIEOWoD-PtRRGoKLN15S-EhEkWgsIxiceNMGI/edit?usp=sharing)

Peace Corps is looking to build a mobile app that will aid the Volunteer in sustaining life-saving malaria prevention tactics over their 2+ years of service. Prevention is focused on sustained use of preventive medications, which are taken either daily or weekly, depending on the medicine. The application will feature a reminder system; an ability to indicate that medication was taken on time or missed; the ability for the volunteer to track their usage history; a trip indicator to help remind volunteers to pack certain supplies to prevent malaria if they leave their home village; and an Info Hub that will provide accurate information about Malaria and the medications they are taking.
Contribution Guide - [here](https://github.com/systers/macc/blob/develop/docs/Contribution.md)

Included in this repository are Adobe Illustrator (.ai), and Adobe PDF (.pdf) files that were created by University of Michigan design students to meet the requirements listed above. These resources are intended to be the building blocks of iOS and Android applications.
## Current Status
Final Demos given by 2017 GSoC students on project status -
Yatna's Demo - [Watch Here](https://www.youtube.com/watch?v=f7wgeBlxm1g&t=355s)
Gunpreet's Demo - [Watch Here](https://www.youtube.com/watch?v=r_DrvDd96b8)

Also included in this repository for reference and background are two recent studies conducted by the CDC pertaining to use of preventative tactics by volunteers and their reasons for compliance or non-compliance with taking their medicine.
<h2>Asset Information</h2>
Included in this repository are files to help you get started:
<ul>
<li>Mock Up Version 8 (the latest mock up file) is included in pdf, png, and in the original Adobe Illustrator format.</li>
<li>A research folder containing a map of Malaria Prevalence, and additional information about Malaria from the Centers for Disease Control and Prevention.</li>
</ul>

<h3>Contact Information:</h3>


Patrick Choquette

Director of the Office of Innovation

[email protected]


Matthew McAllister

Special Assistant in the Office of Innovation

[email protected]
Loading