Code

Bringing fork upto date#1

Code

Merged

raeeska merged 102 commits intoraeeska:masterraeeska/rescuekerala:masterfrom raksha-life:masterraksha-life/rescuekerala:masterCopy head branch name to clipboardAug 10, 2019

Commits

Commits on Aug 16, 2018

• Update ReadMe with the FloodMap Repo Link

  aswinmohanme

  authored
  346547a

  Copy full SHA for 346547a

Commits on Aug 17, 2018

• Optmized RequestAdmin actions:

  Show description for f694752
  

  Rajeesh Punathil

  committed
  f694752

  Copy full SHA for f694752

• Updated dmoinfo view to lower DB hits per request from 5 to 3.

  

  Rajeesh Punathil

  committed
  8fb1102

  Copy full SHA for 8fb1102

• Merge remote-tracking branch 'upstream/master'

  

  Rajeesh Punathil

  committed
  a40e1bf

  Copy full SHA for a40e1bf

• Merge remote-tracking branch 'upstream/master'

  

  Rajeesh Punathil

  committed
  85b4886

  Copy full SHA for 85b4886

• Update models.py

  Show description for 8082938
  gautam1858

  authored
  8082938

  Copy full SHA for 8082938

• Update models.py

  Show description for ea7e3d0
  gautam1858

  authored
  ea7e3d0

  Copy full SHA for ea7e3d0

Commits on Aug 19, 2018

• Implemented placepicker using Modals

  

  irshadshalu

  authored and

  salmanulfarzy

  committed
  85d0f00

  Copy full SHA for 85d0f00

• Fixed map scroll issue, modal close issue, added single touch scroll, unified indentation

  

  irshadshalu

  authored and

  salmanulfarzy

  committed
  ed6ac1d

  Copy full SHA for ed6ac1d

• map-view icons made distinct

  cyriac

  committed
  bf7819b

  Copy full SHA for bf7819b

Commits on Aug 20, 2018

• Merge remote-tracking branch 'upstream/master'

  

  Rajeesh Punathil

  committed
  1be8741

  Copy full SHA for 1be8741

• Fixed a typo: QuerySet typed as Queryset.

  

  Rajeesh Punathil

  committed
  82a53d6

  Copy full SHA for 82a53d6

• Added change for elapsed time

  Show description for 8a9618f
  

  Sabarish Chandrasekharan

  authored and

  Sabarish Chandrasekharan

  committed
  8a9618f

  Copy full SHA for 8a9618f

• Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuekerala into issue-785

  

  Sabarish Chandrasekharan

  authored and

  Sabarish Chandrasekharan

  committed
  c619609

  Copy full SHA for c619609

Commits on Aug 21, 2018

• css: reduce font-size of title to avoid vertical scroll

  Show description for eb6ebfe
  

  Aditya Anand

  committed
  eb6ebfe

  Copy full SHA for eb6ebfe

Commits on Aug 22, 2018

• Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuekerala into issue-785

  Show description for 0c4a7ee
  

  Sabarish Chandrasekharan

  authored and

  Sabarish Chandrasekharan

  committed
  0c4a7ee

  Copy full SHA for 0c4a7ee

• Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuekerala into issue-785

  

  Sabarish Chandrasekharan

  authored and

  Sabarish Chandrasekharan

  committed
  5f15379

  Copy full SHA for 5f15379

Commits on Aug 28, 2018

• Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuekerala into issue-785

  

  Sabarish Chandrasekharan

  authored and

  Sabarish Chandrasekharan

  committed
  0220ff2

  Copy full SHA for 0220ff2

• കഴിഞ്ഞു പോയ സമയം updated

  

  Sabarish Chandrasekharan

  authored and

  Sabarish Chandrasekharan

  committed
  b1b2639

  Copy full SHA for b1b2639

• better placepicker and pop up msg

  biswaz

  committed
  a6f4aa1

  Copy full SHA for a6f4aa1

• Merge branch 'salmanulfarzy-irshadshalu-master'

  biswaz

  committed
  51838c5

  Copy full SHA for 51838c5

• removed help_text for request for others, to reflect new changes

  biswaz

  committed
  f8c514c

  Copy full SHA for f8c514c

• added camp search on csvupload admin

  biswaz

  committed
  198dfb1

  Copy full SHA for 198dfb1

• Added more search fields to person admin

  biswaz

  committed
  1b55171

  Copy full SHA for 1b55171

Commits on Aug 29, 2018

• Merge pull request #978 from raeeska/master

  Show description for 7ee35bd
  biswaz

  authored
  7ee35bd

  Copy full SHA for 7ee35bd

• Fixed error on searching csvbulkupload admin

  biswaz

  committed
  7910b39

  Copy full SHA for 7910b39

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  biswaz

  committed
  8dd4d0c

  Copy full SHA for 8dd4d0c

• Merge branch 'master' into patch-1

  biswaz

  authored
  cc9d5af

  Copy full SHA for cc9d5af

• Merge pull request #215 from aswinmohanme/patch-1

  Show description for 1678a34
  biswaz

  authored
  1678a34

  Copy full SHA for 1678a34

• Merge pull request #448 from gautam1858/patch-2

  Show description for 57115bb
  biswaz

  authored
  57115bb

  Copy full SHA for 57115bb

• Merge pull request #853 from thelostone-mc/css

  Show description for 6e02964
  biswaz

  authored
  6e02964

  Copy full SHA for 6e02964

• Merge remote-tracking branch 'upstream/master'

  

  Rajeesh Punathil

  committed
  8da5075

  Copy full SHA for 8da5075

• Merge remote-tracking branch 'upstream/master'

  

  Rajeesh Punathil

  committed
  d1a831b

  Copy full SHA for d1a831b

• Refactored mainapp.views.dmotal view also.

  Show description for 2838178
  

  Rajeesh Punathil

  committed
  2838178

  Copy full SHA for 2838178

Commits on Aug 30, 2018

• Added place search autocomplete field in request_form

  irshadshalu

  committed
  d417815

  Copy full SHA for d417815

• Solved only cities appearing in search results

  irshadshalu

  committed
  d5615b3

  Copy full SHA for d5615b3

• Updated hardcoded urls to url names from urls.py

  

  pirate

  committed
  cea9914

  Copy full SHA for cea9914

Commits on Aug 31, 2018

• Merge pull request #716 from cyriac/patch-5

  Show description for 3477f74
  vigneshhari

  authored
  3477f74

  Copy full SHA for 3477f74

Commits on Sep 1, 2018

• In OS-X, docker do not start Postgres instance even on default port if not specified explicitly

  pkrajanand

  committed
  3c8b3e7

  Copy full SHA for 3c8b3e7

• Merge pull request #982 from diptanshu-sopho/issue#980

  Show description for 16cb7c1
  biswaz

  authored
  16cb7c1

  Copy full SHA for 16cb7c1

• Merge pull request #986 from pkrajanand/issue_985

  Show description for 2a3986e
  biswaz

  authored
  2a3986e

  Copy full SHA for 2a3986e

Commits on Sep 2, 2018

• Merge pull request #981 from irshadshalu/master

  Show description for ad6405d
  biswaz

  authored
  ad6405d

  Copy full SHA for ad6405d

• Fixed CSV Importer

  vigneshhari

  committed
  4e063b9

  Copy full SHA for 4e063b9

• Merge pull request #987 from vigneshhari/master

  Show description for fee9d3d
  vigneshhari

  authored
  fee9d3d

  Copy full SHA for fee9d3d

• Altered Max Length of person

  vigneshhari

  committed
  e50b165

  Copy full SHA for e50b165

• Merge pull request #988 from vigneshhari/master

  Show description for fd8e09f
  vigneshhari

  authored
  fd8e09f

  Copy full SHA for fd8e09f

• Comment out the USE_S3 to avoid local testing errors

  vigneshhari

  committed
  11d8b3d

  Copy full SHA for 11d8b3d

• Fixed Issue with AWS in local testing

  vigneshhari

  committed
  5f073b3

  Copy full SHA for 5f073b3

• Merge pull request #989 from vigneshhari/master

  Show description for 6dd05a9
  vigneshhari

  authored
  6dd05a9

  Copy full SHA for 6dd05a9

• Fixed Possible bug in Production

  vigneshhari

  committed
  00e1907

  Copy full SHA for 00e1907

• Merge pull request #990 from vigneshhari/master

  Show description for 3085c93
  vigneshhari

  authored
  3085c93

  Copy full SHA for 3085c93

• Removed afterflood link

  biswaz

  committed
  9857ad2

  Copy full SHA for 9857ad2

• Moved info on "docker setup" to wiki and linked from Readme

  pkrajanand

  committed
  126154a

  Copy full SHA for 126154a

• Recovery script for reruning failed csv imports

  biswaz

  committed
  8475c09

  Copy full SHA for 8475c09

• Fixed Phone bug in CSV importer

  vigneshhari

  committed
  6a9a226

  Copy full SHA for 6a9a226

• Merge pull request #992 from vigneshhari/master

  Show description for 29f3988
  vigneshhari

  authored
  29f3988

  Copy full SHA for 29f3988

• Checks whether district exists in csv

  biswaz

  committed
  a49833b

  Copy full SHA for a49833b

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  biswaz

  committed
  88c6ef5

  Copy full SHA for 88c6ef5

• Update README.md

  biswaz

  authored
  5df7e9f

  Copy full SHA for 5df7e9f

• Merge pull request #991 from pkrajanand/update_wiki_issue_985

  Show description for 866e7c6
  vigneshhari

  authored
  866e7c6

  Copy full SHA for 866e7c6

Commits on Sep 4, 2018

• Merge pull request #788 from saba83rish/issue-785

  Show description for 124eff9
  biswaz

  authored
  124eff9

  Copy full SHA for 124eff9

Commits on Sep 10, 2018

• Update Map URL Name

  vigneshhari

  authored
  e3e8d80

  Copy full SHA for e3e8d80

Commits on Sep 13, 2018

• Merge pull request #356 from rajeeshr-punathil/master

  Show description for d757252
  biswaz

  authored
  d757252

  Copy full SHA for d757252

Commits on Sep 14, 2018

• Update home.html

  remedcu

  authored
  cda1ab3

  Copy full SHA for cda1ab3

Commits on Sep 15, 2018

• Merge pull request #1000 from remedcu/patch-1

  Show description for 8672fbd
  biswaz

  authored
  8672fbd

  Copy full SHA for 8672fbd

Commits on Oct 5, 2018

• updated django

  Show description for ec42644
  dauntlessnomad

  authored
  ec42644

  Copy full SHA for ec42644

• Merge pull request #1001 from IEEEKeralaSection/syam3526-patch-1

  Show description for 59bebc7
  dauntlessnomad

  authored
  59bebc7

  Copy full SHA for 59bebc7

Commits on Aug 8, 2019

• Removed datadog

  

  biswas

  committed
  84d532c

  Copy full SHA for 84d532c

• empty commit

  

  biswas

  committed
  3ad6df6

  Copy full SHA for 3ad6df6

• ushahidi

  

  biswas

  committed
  2625ddc

  Copy full SHA for 2625ddc

• empty commit

  

  biswas

  committed
  ce8f03e

  Copy full SHA for ce8f03e

• Commented out toll free number

  

  Mithun James

  committed
  7501391

  Copy full SHA for 7501391

• Updated mapview.html to replace old link

  Show description for 4e36c29
  theshahulhameed

  authored
  4e36c29

  Copy full SHA for 4e36c29

• Merge pull request #1 from shahulhameed00/shahulhameed00-patch-1

  Show description for 9930c0b
  theshahulhameed

  authored
  9930c0b

  Copy full SHA for 9930c0b

• Merge pull request #1007 from shahulhameed00/master

  Show description for da4ca7a
  dauntlessnomad

  authored
  da4ca7a

  Copy full SHA for da4ca7a

• Merge pull request #1006 from drtechie/dhs-number-remove

  Show description for a175090
  dauntlessnomad

  authored
  a175090

  Copy full SHA for a175090

Commits on Aug 9, 2019

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  

  biswas

  committed
  7fa4d60

  Copy full SHA for 7fa4d60

• chnage text

  biswaz

  committed
  80cb459

  Copy full SHA for 80cb459

• Helpline number added

  rejuls

  authored
  2f68b7a

  Copy full SHA for 2f68b7a

• Hospital model, local dev dependency fix

  biswaz

  committed
  508bd06

  Copy full SHA for 508bd06

• Merge pull request #1008 from rejuls/patch-1

  Show description for 9115708
  biswaz

  authored
  9115708

  Copy full SHA for 9115708

• Hos[italView

  biswaz

  committed
  07bc02e

  Copy full SHA for 07bc02e

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  biswaz

  committed
  31005a0

  Copy full SHA for 31005a0

• Added Card for hospitals

  shameelsadaka

  authored
  aff1ed2

  Copy full SHA for aff1ed2

• Merge pull request #1011 from shameelsadaka/master

  Show description for 2b0facb
  biswaz

  authored
  2b0facb

  Copy full SHA for 2b0facb

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  biswaz

  committed
  bc83b2f

  Copy full SHA for bc83b2f

• Hospitalview

  biswaz

  committed
  8f6d419

  Copy full SHA for 8f6d419

• Update volunteerview.html

  R-Aravind

  authored
  992a4d6

  Copy full SHA for 992a4d6

• Update README.md

  ReonSaji

  authored
  10179d3

  Copy full SHA for 10179d3

• Added state control room number. Changes in text.

  rejuls

  authored
  6e523c4

  Copy full SHA for 6e523c4

• Merge pull request #1015 from rejuls/patch-2

  Show description for 16d6835
  dauntlessnomad

  authored
  16d6835

  Copy full SHA for 16d6835

• removed cm's msg

  biswaz

  committed
  6bc3898

  Copy full SHA for 6bc3898

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  biswaz

  committed
  93dacf6

  Copy full SHA for 93dacf6

• Merge pull request #1013 from R-Aravind/patch-1

  Show description for 3d64e0d
  riginoommen

  authored
  3d64e0d

  Copy full SHA for 3d64e0d

• resources form link

  biswaz

  committed
  52837a9

  Copy full SHA for 52837a9

• Urlize the links in announcements

  subins2000

  committed
  4beaa23

  Copy full SHA for 4beaa23

• Merge pull request #1018 from subins2000/urlize

  Show description for c29e830
  riginoommen

  authored
  c29e830

  Copy full SHA for c29e830

• Hospitat search and pagination

  biswaz

  committed
  fb8be05

  Copy full SHA for fb8be05

• Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

  biswaz

  committed
  ca414c1

  Copy full SHA for ca414c1

• Annoucements moved to top

  biswaz

  committed
  906c1bc

  Copy full SHA for 906c1bc

• Easified announcements priority display

  subins2000

  committed
  721a770

  Copy full SHA for 721a770

• Merge pull request #1023 from subins2000/issue1017

  Show description for 7aeaeba
  dauntlessnomad

  authored
  7aeaeba

  Copy full SHA for 7aeaeba