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

Syncing with the original repo #1

Merged
merged 68 commits into from
Aug 20, 2018
Merged

Syncing with the original repo #1

merged 68 commits into from
Aug 20, 2018

Conversation

shashwat1002
Copy link
Owner

Issue Reference

This PR addresses the Issue : Fixes #

Summarize

Please, describe what the PR does, the changes you have made.

Also, mention the key points if any to look into while code reviews

sayantanHack and others added 30 commits August 19, 2018 12:48
@sayantanHack
alignment
3b52002
@sayantanHack
Update README.md
ccd92cc
@arunkrishnan
Add data collection model to upload data files
bd8f20c 
Remove Add RelifCampData endpoints
@arunkrishnan
Move relief camp tab to 2nd position
f845012
@biswaz
Merge pull request #701 from arunkrishnan/maps
5838863 
Move relief camp tab to 2nd position
@biswaz
removed req map, added better google map
6132fcf
@biswaz
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
695da46
@biswaz
change all phones to 11 digits
a99620f
@biswaz
Merge pull request #700 from arunkrishnan/reliefcamp
de33dbb 
Add data collection model to upload data files
@biswaz
migration fix for pr #700
432aeb2
@vigneshhari
Merge branch 'master' into master
9fc19eb
@vigneshhari
Merge pull request #669 from sayantanHack/master
769cef1 
Added Styles for Readme
@biswaz
fixed NGO scv download
79f7e76
@biswaz
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
5152a75
@biswaz
select all for downloading all - in NGO admin
f15c52d
@cyriac
made OK button on Allow location modal more prominent
f023b06
@Kavit900
patch for phone number fix
c03f2e5
@Kavit900
migration for models
a683d82
@shajith
Merge pull request #724 from Kavit900/phone_number_fix_patch
533de7c 
patch for phone number fix
Adding relief_camps/data paginated endpoint
c89ac93
Merge pull request #733 from cibingeorge/relief_camp_data
de3dfd8 
Adding relief_camps/data paginated endpoint
@dsamanmishra @biswaz
Place icon being shown even when no place is selected issue fixed. Is…
3c0d0bd 
…sue No: 694
@vigneshhari
Update home.html
9d79917
@biswaz
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
7ea4016
@vigneshhari
Updated Admin Relief Camp csv download
01d2727
@xaneem
Added duplicate status for camps; search with village/taluk
cad1419
@biswaz
Merge pull request #735 from xaneem/master
12089f4 
[URGENT] Added duplicate status for camps; search with village/taluk
@biswaz
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
b1286fa
@biswaz
removed redundant search bars
569dfec
@biswaz
only show active camps on camplist
422a965
biswaz and others added 27 commits August 20, 2018 13:53
@biswaz
Merge pull request #742 from gauthams09/patch-1
7a39369 
Fix typo "Download" in Announcements page
@shajith
Merge pull request #739 from IEEEKeralaSection/shajith/request-id
f38f41b 
Added request ID to the request listing and details pages
@shajith
Added request filters for needs
05440a0
@vigneshhari
Added new stats for DMO
3cccd16
@biswaz
Merge pull request #744 from IEEEKeralaSection/shajith/needs-filters
758c449 
Added request filters for needs
@vigneshhari
Added csv option for dmo stats
f837937
@vigneshhari
Merge pull request #746 from vigneshhari/master
ddd690e 
Added new stats for DMO
@vigneshhari
Fix Dmo issue
a5ee7fa
@vigneshhari
Merge pull request #749 from vigneshhari/master
62c0817 
Fix Dmo issue
@vigneshhari
Updated Dmodash to include all features
f055d6f
@vigneshhari
Added Dist level stats as table
c864a98
@vigneshhari
Added Taluk wise statistics in DMO Portal
dae90d5
@vigneshhari
Merge pull request #761 from vigneshhari/master
e820b66 
Added DMO Advanced Stats
@vigneshhari
Added Volunteer List View
cae4ad1
@vigneshhari
Merge pull request #762 from vigneshhari/master
3f22966 
Added Volunteer List View
@biswaz
added ngo list
6fa8fcc
@biswaz
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
75fd07b
@biswaz
exclude soem fields on ngoview
3834127
@vigneshhari
Fixed Bugs and Edited Home Page
32a3cfc
@biswaz
district only filter for ngoview
ec0734f
@vigneshhari
Merge pull request #764 from vigneshhari/master
932f867 
Fixed Bugs and Edited Home Page
@biswaz
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
fa8de77
@vigneshhari
Edited Typo in home
6a34fd4
Fix 'Create migration file's ^toc link.
c153aee
@vigneshhari
Made taluk stat filter with dist
310947d
@vigneshhari
Merge pull request #766 from vigneshhari/master
6f43eef 
Made taluk stat filter with dist
@dauntlessnomad
Merge pull request #765 from Ketcomp/patch-1
c435c11 
Fix 'Create migration file's ^toc link.
@shashwat1002 shashwat1002 merged commit e306589 into shashwat1002:master Aug 20, 2018
shashwat1002 pushed a commit that referenced this pull request Aug 21, 2018
@jineshpaloor
Merge pull request #1 from IEEEKeralaSection/master
b9bf116 
Getting updates from upstream
shashwat1002 pushed a commit that referenced this pull request Aug 21, 2018
@dsamanmishra
Merge pull request #1 from IEEEKeralaSection/master
f8b8c70 
Updating Fork
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.