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

Sync #3

Merged
merged 114 commits into from
Aug 23, 2018
Merged

Sync #3

merged 114 commits into from
Aug 23, 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

namboodiri and others added 30 commits August 17, 2018 22:03
@namboodiri
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
7586cbe
@namboodiri
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
0665b20
@namboodiri
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
0a4bd80
Implemented Breadcrumbs for Quick Navigation.
655fe55
Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuek…
1961c9c 
…erala
@s-n-d-p
script to send sms
c13be5a
@s-n-d-p
script to send sms, minor fixes
7ee6575
@s-n-d-p
fixed dependencies
025605e
@dsamanmishra
Fixed issue 840. Introduced standard design of website for private re…
20dd1b2 
…lief center box
@xaneem
Showing added_at for refugees in admin
35f2980
@xaneem
Added checkin and checkout dates, status for persons; related migrati…
bde2bf1 
…ons and UI updates
@xaneem
Added pagination in find_people
06dffbc
@xaneem
Cleanup migration
d9d19b6
@biswaz
added csvbulkupload model
511899e
@biswaz
Merge pull request #849 from xaneem/master
6b25d15 
Relief Camp - Added check-in, check-out dates and status, etc.
@biswaz
migration fix for pr #849
beccda2
#723:
ca7285c 
1. select dropdown options for lsg name based on district
2. select dropdown options for ward name based on lsg name
@xaneem
Date format to dd-mm-yyyy
4bc26e3
@biswaz
Merge pull request #856 from xaneem/master
203ec05 
Date format to dd-mm-yyyy in add person
723: added management command to get kerala local bodies
08decdf
#723: add search option in collection center list page
8d6bfde
@vigneshhari
Added CSV Upload Script
7fa981f
@vigneshhari
Merge pull request #859 from vigneshhari/master
3a36301 
Added CSV Upload Script
@bjacobt
add csv uploader
a009a4e
@shajith
Added validation, using DB to check for dupes
36c4368
@shajith
Add bulkcsvjob to the list of queues
370b455
@shajith
Fixed CSV validation
2f698ce
@shajith
Standalone job starting without errors
3db6fcd
added malyalam text
d250717
@bjacobt
fix duplicate issue && ignore invalid records
62bd849
biswaz and others added 29 commits August 22, 2018 20:56
@biswaz
Merge pull request #884 from TribeAsteraea/patch-3
b9c00e7 
Update request_update_success.html
@biswaz
Merge pull request #842 from dsamanmishra/issues/840
adb92dd 
Fixed issue 840. Introduced standard design of website for private re…
#723:
8d87ad8 
1. remove lsg_type from collection center registration form
2. add collection center id in the collection center listing page
@biswaz
Merge pull request #886 from jineshpaloor/jinesh/collection-center
8c3f4be 
#723: collection center
@biswaz
Merge branch 'master' into sndp487/sms_responder
a4cc4e4
@biswaz
Merge pull request #792 from sndp487/sndp487/sms_responder
fa4b341 
Sndp487/sms responder
changed
812ce67
@shajith
Merge pull request #864 from arpit7714/master
6e224af 
added malyalam text
@biswaz
Merge pull request #874 from Amalkarunakaran/patch-1
c2a7e7a 
Update home.html
@jinojossy93
added new icon and added it to the base template
3aae4b2
@Amalkarunakaran
Update 404.html
ad9ea20
@Amalkarunakaran
Update 404.html
07cff21
@Amalkarunakaran
Update 404.html
4be8cb9
@Amalkarunakaran
Update 404.html
3cc7358
@Amalkarunakaran
Update 404.html
a6698d0
@Amalkarunakaran
Update 404.html
69666b1
@Amalkarunakaran
Update 404.html
9917dfd
@biswaz
rearranged imports
471762b
@namboodiri
seperate page for collection centers inside and outside kerala
550e65c
@biswaz
Merge pull request #893 from jinojossy93/add_favicon
0e3d3d6 
added favicon icon and updated it in base template
@kurianbenoy
Add pagination for relief camps list view
8ea53f2
@kurianbenoy
Add camp ID and phone no on relief camps
57703e4
added: person finder
45f0b0d
@biswaz
Merge pull request #896 from namboodiri/master
d2da77b 
seperate page for collection centers inside and outside kerala
@biswaz
Merge pull request #897 from kurianbenoy/master
cd7c642 
Add mobile no for private camps and pagination for relief camps list view
@biswaz
Merge pull request #899 from ad6190/feature/add_persons_card_on_camp_…
3500f08 
…page

added: person finder
@biswaz
Merge pull request #894 from Amalkarunakaran/patch-3
0e82f9a 
Update 404.html
@biswaz
Revert "Update 404.html"
3ff6f93
@biswaz
Merge pull request #900 from IEEEKeralaSection/revert-894-patch-3
d099c4c 
Revert "Update 404.html"
@shashwat1002 shashwat1002 merged commit e513272 into shashwat1002:master Aug 23, 2018
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.