OpenSource/sms-lapli
1
0 Fork 0
mirror of https://github.com/GFDRR/sms-lapli.git synced 2026-10-28 02:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
215 Commits 2 Branches 0 Tags
develop
Commit Graph
215 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeas Benjamin Jeanniton 1c67e23dc6 Merge pull request #67 from jbjeanniton/develop 
Improves the Admin section and the Data model
 2016-03-17 03:04:34 -04:00
Jeas Benjamin Jeanniton a2d654e9d5 Improves the Admin section and the Data model 
Add the market place application
Start Improving the dashboard
Edit the data model to make it more suited to the reality of the CNSA
Add Support for Alert and notification
Add Import-Export functionality
Achieve many minor changes to make the application more ergonomic
 2016-03-17 03:00:03 -04:00
Jeas Benjamin Jeanniton 559d713c5e Merge remote-tracking branch 'GFDRR/develop' into develop 2016-03-17 01:00:59 -04:00
Jeas Benjamin Jeanniton 33ee2ed963 Merge pull request #65 from jbjeanniton/develop 
Improves admin and public section. Update the Readme
 2015-11-13 10:08:13 -05:00
Jeas Benjamin Jeanniton 449a0afa71 Improves admin and public section. Update the Readme 2015-11-13 10:06:53 -05:00
Jeas Benjamin Jeanniton a9cb58fdb1 Merge pull request #64 from jbjeanniton/develop 
Improve public section
 2015-11-10 22:31:52 -05:00
Jeas Benjamin Jeanniton 2ba7428ee3 Improve public section 2015-11-10 22:30:25 -05:00
Jeas Benjamin Jeanniton 6a05f4b4db Merge pull request #63 from jbjeanniton/develop 
Refactor models and standardize the code (#1)
 2015-11-09 22:47:06 -05:00
Jeas Benjamin Jeanniton 7bc39fc548 Refactor models and optimisations 2015-11-09 22:41:34 -05:00
Jeas Benjamin Jeanniton 6405b551e8 Merge remote-tracking branch 'GFDRR/master' 2015-11-05 02:30:50 -05:00
Esdras1995 3aed01266c Merge pull request #62 from Esdras1995/master 
Version beta apres la presentation CNSA
 2015-10-29 23:22:47 -04:00
Esdras1995 6a5beed032 Version beta apres la presentation CNSA 2015-10-29 22:42:22 -04:00
Esdras1995 9da500f311 Merge pull request #61 from Esdras1995/master 
Base Extras debuged
 2015-10-28 23:06:12 -04:00
Esdras1995 59a34490ce Base Extras debuged 2015-10-28 23:03:59 -04:00
Hollyn 5659bd8fc4 Merge pull request #58 from Hollyn/master 
fix all conflicts
 2015-10-28 20:08:54 -04:00
Hollyn d8a4913840 Merge branch 'master' of https://github.com/Hollyn/sms-lapli 2015-10-28 20:01:53 -04:00
Hollyn 4d10c6c666 Merge branch 'test' 2015-10-28 19:58:32 -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 260c097eee Merge pull request #60 from rpalexis/develop 
Generating reports in public OK
 2015-10-27 23:01:02 -04:00
Rulx Philome Alexis 7b60572592 Fix:Table in first Reports Example 2015-10-27 22:55:22 -04:00
Rulx Philome Alexis 15e7065044 Fix : Adding graph colors for comparison 2015-10-27 22:36:21 -04:00
Esdras1995 e703d5539b Merge pull request #59 from Esdras1995/master 
No conflict
 2015-10-27 21:53:13 -04:00
Esdras1995 6331618c01 Beta admin auth style modified 2015-10-27 21:50:26 -04:00
Rulx Philome Alexis 041cf98f87 Feat: JSonGraph by Week created 2015-10-27 21:34:34 -04:00
Esdras1995 3300177f4b merged local version with master 2015-10-27 21:29:43 -04:00
Rulx Philome Alexis abd95d609b Last modif 2015-10-27 12:11:29 -04:00
Hollyn 1f6bc7b88e Update app.py 2015-10-26 19:51:12 -04:00
Rulx Philome Alexis f0374adc51 Fix : Improve docs's style(bis) 2015-10-25 03:21:43 -04:00
Rulx Philome Alexis f0db63b8b0 Fix: Improve doc's style 2015-10-25 03:20:11 -04:00
Rulx Philome Alexis f3e19d0abe Merge pull request #57 from rpalexis/develop 
Fixing database integrity for testing use.
 2015-10-25 02:22:22 -04:00
Rulx Philome Alexis b608aaf2e3 Fix: 2015-10-25 02:13:22 -04:00
Rulx Philome Alexis dbba477f14 Fix : Change expression in admin 
Aller a l'espace public
 2015-10-25 02:05:39 -04:00
Rulx Philome Alexis bdfdbfcd9e Fix: Context_processors unused imports fixed 2015-10-25 01:52:44 -04:00
Rulx Philome Alexis 44081d1a42 Fix : Correcting database integrity 2015-10-25 01:50:48 -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 3386d21f2c Merge pull request #55 from rpalexis/develop 
Fixing Merge Conflict #53
 2015-10-22 07:32:26 -04:00
Rulx Philome Alexis 512d1304e9 Merge branch 'fixing-conflict' into develop 2015-10-22 07:23:22 -04:00
Rulx Philome Alexis ea71c5b181 Fix: Merge Pull Request conflict #53 2015-10-22 07:22:51 -04:00
Rulx Philome Alexis 39b93d70a4 Merge pull request #54 from rpalexis/develop 
Feat: Adding Public's Fonctionnalities
 2015-10-22 04:40:31 -04:00
Rulx Philome Alexis a44f4cce28 Feat: Comparaison module in reports 2015-10-22 04:32:37 -04:00
Rulx Philome Alexis a1eae6ac19 Fix: Overview in public 2015-10-22 04:02:20 -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 96fac70d0f Merge remote-tracking branch 'GFDRR/master' 2015-10-20 21:22:22 -04:00
Jeas Benjamin Jeanniton 6a526acc94 Merge pull request #52 from jbjeanniton/master 
Fixed Conflicts
 2015-10-19 11:58:40 -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
Jeas Benjamin Jeanniton c9461ee6d6 Fix conflicts 2015-10-19 10:50:36 -04:00
Esdras1995 dfe604ef50 Test okay. 2015-10-18 23:41:07 -04:00