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

Bringing fork upto date #1

Merged
merged 102 commits into from
Aug 10, 2019
Merged

Bringing fork upto date #1

merged 102 commits into from
Aug 10, 2019

Conversation

raeeska
Copy link
Owner

@raeeska raeeska commented Aug 10, 2019

Bringing fork upto date

aswinmohanme and others added 30 commits August 17, 2018 00:13
* 3 admin actions were looping over chosen queryset and hitting the DB
  for each of the objects in it. Replaced the code with a single
  queryset update.
Adding need rescue in summarise function
Adding rescue action in summarise
fixed a typo on html as well
…erala into issue-785

# Conflicts:
#	mainapp/templates/mainapp/request_list.html
Added requirements_debug.txt to Dockerfile
Update ReadMe with the FloodMap Repo Link
dauntlessnomad and others added 27 commits August 9, 2019 01:15
Added state control room number. Changes in text.
Urlize the links in announcements
Easified announcements priority display
@raeeska raeeska merged commit dafb5cc into raeeska:master Aug 10, 2019
raeeska pushed a commit that referenced this pull request Aug 13, 2019
raeeska pushed a commit that referenced this pull request Aug 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.