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
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
346547a
Update ReadMe with the FloodMap Repo Link
aswinmohanme Aug 16, 2018
f694752
Optmized RequestAdmin actions:
Aug 17, 2018
8fb1102
Updated dmoinfo view to lower DB hits per request from 5 to 3.
Aug 17, 2018
a40e1bf
Merge remote-tracking branch 'upstream/master'
Aug 17, 2018
85b4886
Merge remote-tracking branch 'upstream/master'
Aug 17, 2018
8082938
Update models.py
gautam1858 Aug 17, 2018
ea7e3d0
Update models.py
gautam1858 Aug 17, 2018
85d0f00
Implemented placepicker using Modals
irshadshalu Aug 19, 2018
ed6ac1d
Fixed map scroll issue, modal close issue, added single touch scroll,…
irshadshalu Aug 19, 2018
bf7819b
map-view icons made distinct
cyriac Aug 19, 2018
1be8741
Merge remote-tracking branch 'upstream/master'
Aug 20, 2018
82a53d6
Fixed a typo: QuerySet typed as Queryset.
Aug 20, 2018
8a9618f
Added change for elapsed time
Aug 20, 2018
c619609
Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuek…
Aug 20, 2018
eb6ebfe
css: reduce font-size of title to avoid vertical scroll
Aug 21, 2018
0c4a7ee
Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuek…
Aug 22, 2018
5f15379
Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuek…
Aug 22, 2018
0220ff2
Merge branch 'master' of https://github.com/IEEEKeralaSection/rescuek…
Aug 28, 2018
b1b2639
കഴിഞ്ഞു പോയ സമയം updated
Aug 28, 2018
a6f4aa1
better placepicker and pop up msg
biswaz Aug 28, 2018
51838c5
Merge branch 'salmanulfarzy-irshadshalu-master'
biswaz Aug 28, 2018
f8c514c
removed help_text for request for others, to reflect new changes
biswaz Aug 28, 2018
198dfb1
added camp search on csvupload admin
biswaz Aug 28, 2018
1b55171
Added more search fields to person admin
biswaz Aug 28, 2018
7ee35bd
Merge pull request #978 from raeeska/master
biswaz Aug 29, 2018
7910b39
Fixed error on searching csvbulkupload admin
biswaz Aug 29, 2018
8dd4d0c
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
biswaz Aug 29, 2018
cc9d5af
Merge branch 'master' into patch-1
biswaz Aug 29, 2018
1678a34
Merge pull request #215 from aswinmohanme/patch-1
biswaz Aug 29, 2018
57115bb
Merge pull request #448 from gautam1858/patch-2
biswaz Aug 29, 2018
6e02964
Merge pull request #853 from thelostone-mc/css
biswaz Aug 29, 2018
8da5075
Merge remote-tracking branch 'upstream/master'
Aug 29, 2018
d1a831b
Merge remote-tracking branch 'upstream/master'
Aug 29, 2018
2838178
Refactored mainapp.views.dmotal view also.
Aug 29, 2018
d417815
Added place search autocomplete field in request_form
irshadshalu Aug 30, 2018
d5615b3
Solved only cities appearing in search results
irshadshalu Aug 30, 2018
cea9914
Updated hardcoded urls to url names from urls.py
Aug 30, 2018
3477f74
Merge pull request #716 from cyriac/patch-5
vigneshhari Aug 31, 2018
3c8b3e7
In OS-X, docker do not start Postgres instance even on default port i…
pkrajanand Sep 1, 2018
16cb7c1
Merge pull request #982 from diptanshu-sopho/issue#980
biswaz Sep 1, 2018
2a3986e
Merge pull request #986 from pkrajanand/issue_985
biswaz Sep 1, 2018
ad6405d
Merge pull request #981 from irshadshalu/master
biswaz Sep 2, 2018
4e063b9
Fixed CSV Importer
vigneshhari Sep 2, 2018
fee9d3d
Merge pull request #987 from vigneshhari/master
vigneshhari Sep 2, 2018
e50b165
Altered Max Length of person
vigneshhari Sep 2, 2018
fd8e09f
Merge pull request #988 from vigneshhari/master
vigneshhari Sep 2, 2018
11d8b3d
Comment out the USE_S3 to avoid local testing errors
vigneshhari Sep 2, 2018
5f073b3
Fixed Issue with AWS in local testing
vigneshhari Sep 2, 2018
6dd05a9
Merge pull request #989 from vigneshhari/master
vigneshhari Sep 2, 2018
00e1907
Fixed Possible bug in Production
vigneshhari Sep 2, 2018
3085c93
Merge pull request #990 from vigneshhari/master
vigneshhari Sep 2, 2018
9857ad2
Removed afterflood link
biswaz Sep 2, 2018
126154a
Moved info on "docker setup" to wiki and linked from Readme
pkrajanand Sep 2, 2018
8475c09
Recovery script for reruning failed csv imports
biswaz Sep 2, 2018
6a9a226
Fixed Phone bug in CSV importer
vigneshhari Sep 2, 2018
29f3988
Merge pull request #992 from vigneshhari/master
vigneshhari Sep 2, 2018
a49833b
Checks whether district exists in csv
biswaz Sep 2, 2018
88c6ef5
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
biswaz Sep 2, 2018
5df7e9f
Update README.md
biswaz Sep 2, 2018
866e7c6
Merge pull request #991 from pkrajanand/update_wiki_issue_985
vigneshhari Sep 2, 2018
124eff9
Merge pull request #788 from saba83rish/issue-785
biswaz Sep 4, 2018
e3e8d80
Update Map URL Name
vigneshhari Sep 10, 2018
d757252
Merge pull request #356 from rajeeshr-punathil/master
biswaz Sep 13, 2018
cda1ab3
Update home.html
remedcu Sep 14, 2018
8672fbd
Merge pull request #1000 from remedcu/patch-1
biswaz Sep 15, 2018
ec42644
updated django
dauntlessnomad Oct 5, 2018
59bebc7
Merge pull request #1001 from IEEEKeralaSection/syam3526-patch-1
dauntlessnomad Oct 5, 2018
84d532c
Removed datadog
Aug 8, 2019
3ad6df6
empty commit
Aug 8, 2019
2625ddc
ushahidi
Aug 8, 2019
ce8f03e
empty commit
Aug 8, 2019
7501391
Commented out toll free number
Aug 8, 2019
4e36c29
Updated mapview.html to replace old link
theshahulhameed Aug 8, 2019
9930c0b
Merge pull request #1 from shahulhameed00/shahulhameed00-patch-1
theshahulhameed Aug 8, 2019
da4ca7a
Merge pull request #1007 from shahulhameed00/master
dauntlessnomad Aug 8, 2019
a175090
Merge pull request #1006 from drtechie/dhs-number-remove
dauntlessnomad Aug 8, 2019
7fa4d60
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
Aug 9, 2019
80cb459
chnage text
biswaz Aug 9, 2019
2f68b7a
Helpline number added
rejuls Aug 9, 2019
508bd06
Hospital model, local dev dependency fix
biswaz Aug 9, 2019
9115708
Merge pull request #1008 from rejuls/patch-1
biswaz Aug 9, 2019
07bc02e
Hos[italView
biswaz Aug 9, 2019
31005a0
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
biswaz Aug 9, 2019
aff1ed2
Added Card for hospitals
shameelsadaka Aug 9, 2019
2b0facb
Merge pull request #1011 from shameelsadaka/master
biswaz Aug 9, 2019
bc83b2f
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
biswaz Aug 9, 2019
8f6d419
Hospitalview
biswaz Aug 9, 2019
992a4d6
Update volunteerview.html
R-Aravind Aug 9, 2019
10179d3
Update README.md
ReonSaji Aug 9, 2019
6e523c4
Added state control room number. Changes in text.
rejuls Aug 9, 2019
16d6835
Merge pull request #1015 from rejuls/patch-2
dauntlessnomad Aug 9, 2019
6bc3898
removed cm's msg
biswaz Aug 9, 2019
93dacf6
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
biswaz Aug 9, 2019
3d64e0d
Merge pull request #1013 from R-Aravind/patch-1
riginoommen Aug 9, 2019
52837a9
resources form link
biswaz Aug 9, 2019
4beaa23
Urlize the links in announcements
subins2000 Aug 9, 2019
c29e830
Merge pull request #1018 from subins2000/urlize
riginoommen Aug 9, 2019
fb8be05
Hospitat search and pagination
biswaz Aug 9, 2019
ca414c1
Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala
biswaz Aug 9, 2019
906c1bc
Annoucements moved to top
biswaz Aug 9, 2019
721a770
Easified announcements priority display
subins2000 Aug 9, 2019
7aeaeba
Merge pull request #1023 from subins2000/issue1017
dauntlessnomad Aug 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master'
Rajeesh Punathil committed Aug 17, 2018
commit a40e1bf438a85d2b12cb576f8db551087ba7672b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.