41 Commits
Author SHA1 Message Date
Esdras1995 6a5beed032 Version beta apres la presentation CNSA 2015-10-29 22:42:22 -04:00
Esdras1995 59a34490ce Base Extras debuged 2015-10-28 23:03:59 -04:00
Hollyn 119296d405 Merge https://github.com/GFDRR/sms-lapli into test
Conflicts:
	base/migrations/0001_initial.py
	hydromet/migrations/0001_initial.py
	hydromet/models.py
	smslapli/templates/admin/index.html
2015-10-28 19:56:21 -04:00
Rulx Philome Alexis f0374adc51 Fix : Improve docs's style(bis) 2015-10-25 03:21:43 -04:00
alexingfds 173e3b598a Fix 2015-10-22 15:00:41 -04:00
alexingfds f2c66c6ab9 Fix : Bugs in graph before presentation 2015-10-22 14:58:38 -04:00
Rulx Philome Alexis ea71c5b181 Fix: Merge Pull Request conflict #53 2015-10-22 07:22:51 -04:00
Hollyn a4083a261e fix sms sending and receiving, according to the station convert to mm, log 2015-10-21 20:08:16 -04:00
Esdras1995 cb56447111 Map added in the dash 2015-10-21 19:43:47 -04:00
alexingfds cf619dc596 Dynamic applist (menu)(name problem) 2015-10-21 01:48:23 -04:00
Jeas Benjamin Jeanniton a27a7f8889 Merge remote-tracking branch 'GFDRR/master'
Conflicts:
	base/migrations/0001_initial.py
	hydromet/migrations/0001_initial.py
	hydromet/models.py
2015-10-19 11:56:05 -04:00
Esdras1995 dfe604ef50 Test okay. 2015-10-18 23:41:07 -04:00
Esdras1995 dc9b6a4812 added style for Logout, change password, delete ... 2015-10-18 21:29:03 -04:00
Jeas Benjamin Jeanniton eb2ee8c211 Fixed Conflicts 2015-10-18 21:00:09 -04:00
Esdras1995 be98b5d7e3 Merged master fixed conflict 2015-10-16 14:10:43 -04:00
Esdras1995 0228edbff3 merged 2015-10-16 14:07:03 -04:00
Rulx Philome Alexis 65f0057b9e feat: Improving public interface 2015-10-15 02:00:44 -04:00
Rulx Philome Alexis 5fbea15056 Fix : Re-Ordering Reports's Overview 2015-10-14 23:14:24 -04:00
Hollyn 695a9a1f35 fixing log for sms 2015-10-13 16:51:18 -04:00
GiovannaB22 5fc4ef448c Merge pull request #47 from GiovannaB22/master
Conflict when adding updates to docs
2015-10-13 13:38:43 -04:00
Jeas Benjamin Jeanniton 3cf10e1356 Revert "Create log that provides a history of all SMS received" 2015-10-13 13:32:34 -04:00
GiovannaB22 826c70e14e correction et ajout du guide d'utilisation 2015-10-13 12:00:26 -04:00
Jeas Benjamin Jeanniton 22f4891666 Create log that provides a history of all SMS received
close #16
2015-10-13 01:04:13 -04:00
alexingfds 0785ba4751 list of Departements , no need to type departement 2015-10-12 15:46:47 -04:00
alexingfds d734486400 validation added for superuser 2015-10-12 14:27:37 -04:00
Esdras1995 04009cdf79 Delete style added 2015-10-12 13:17:48 -04:00
Rulx Philome Alexis 907630ae1f Adding automatic's datas in base for Testing
Run exec(open('scripts/load_stations.py').read()) in a django shell
2015-10-09 01:24:24 -04:00
Jeffrey Johnson b101ae87e6 Fix encoding and fixtures PK issue 2015-10-08 16:50:29 -07:00
Esdras1995 f95e794ec5 Graphe and map added in the dashboard but don't show 2015-10-08 18:33:50 -04:00
Jeas Benjamin Jeanniton 95bfdcf963 Add a new dataset and the validate functionality
Add a new valide dataset for Observation
Add the possibility to validate the Observation
2015-10-08 12:29:51 -04:00
Jeas Benjamin Jeanniton 155cd2f4dd Improving the map functionality 2015-10-07 00:59:32 -04:00
Esdras1995 9c34154d0a Admin error corrected 2015-10-06 13:55:20 -04:00
alexingfds 5c335545ff Merge branch 'master' of https://github.com/GFDRR/sms-lapli
Conflicts:
	hydromet/admin.py
2015-10-04 17:25:31 -04:00
alexingfds fe190ae5e8 added filters not enough style 2015-10-04 16:08:57 -04:00
Jeffrey Johnson 2e77d1f6a7 Fix storing of observations after updating the data model 2015-10-04 13:18:31 -04:00
alexingfds 7ffbeecafc templates error corrected 2015-10-04 11:31:20 -04:00
Jeffrey Johnson 6d41d5b172 Refactor hydromet models 2015-10-04 10:21:42 -04:00
Esdras1995 435e253b47 unite de mesure ajoute 2015-10-03 21:35:51 -04:00
alexingfds 66542bb2f2 unite added 2015-10-03 19:19:57 -04:00
Jeffrey Johnson 517e57e5a8 Add initial data and some model changes to support it 2015-10-03 14:45:45 -04:00
Jeffrey Johnson fb7c8fa0c8 Change to simple app names 2015-10-03 12:02:03 -04:00