Commit Graph

Select branches

Hide Pull Requests

develop

master

#23

#24

#25

#26

#27

#28

#29

#30

#34

#35

#37

#38

#39

#4

#40

#44

#45

#46

#47

#48

#49

#51

#52

#53

#54

#55

#57

#58

#59

#60

#61

#62

#63

#64

#65

#66

#66/merge

#67

Mono Color

• 1c67e23dc6 Merge pull request #67 from jbjeanniton/develop develop Jeas Benjamin Jeanniton 2016-03-17 03:04:34 -04:00
• a2d654e9d5 Improves the Admin section and the Data model Jeas Benjamin Jeanniton 2016-03-17 03:00:03 -04:00
• 559d713c5e Merge remote-tracking branch 'GFDRR/develop' into develop Jeas Benjamin Jeanniton 2016-03-17 01:00:59 -04:00
• 33ee2ed963 Merge pull request #65 from jbjeanniton/develop Jeas Benjamin Jeanniton 2015-11-13 10:08:13 -05:00
• 449a0afa71 Improves admin and public section. Update the Readme Jeas Benjamin Jeanniton 2015-11-13 10:06:53 -05:00
• a9cb58fdb1 Merge pull request #64 from jbjeanniton/develop Jeas Benjamin Jeanniton 2015-11-10 22:31:52 -05:00
• 2ba7428ee3 Improve public section Jeas Benjamin Jeanniton 2015-11-10 22:30:25 -05:00
• 6a05f4b4db Merge pull request #63 from jbjeanniton/develop Jeas Benjamin Jeanniton 2015-11-09 22:47:06 -05:00
• 7bc39fc548 Refactor models and optimisations Jeas Benjamin Jeanniton 2015-11-09 22:41:34 -05:00
• 6405b551e8 Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-11-05 02:30:50 -05:00
• 3aed01266c Merge pull request #62 from Esdras1995/master master Esdras1995 2015-10-29 23:22:47 -04:00
• 6a5beed032 Version beta apres la presentation CNSA Esdras1995 2015-10-29 22:42:22 -04:00
• 9da500f311 Merge pull request #61 from Esdras1995/master Esdras1995 2015-10-28 23:06:12 -04:00
• 59a34490ce Base Extras debuged Esdras1995 2015-10-28 23:03:59 -04:00
• 5659bd8fc4 Merge pull request #58 from Hollyn/master Hollyn 2015-10-28 20:08:54 -04:00
• d8a4913840 Merge branch 'master' of https://github.com/Hollyn/sms-lapli Hollyn 2015-10-28 20:01:53 -04:00
• 4d10c6c666 Merge branch 'test' Hollyn 2015-10-28 19:58:32 -04:00
• 119296d405 Merge https://github.com/GFDRR/sms-lapli into test Hollyn 2015-10-28 19:56:21 -04:00
• 260c097eee Merge pull request #60 from rpalexis/develop Rulx Philome Alexis 2015-10-27 23:01:02 -04:00
• 7b60572592 Fix:Table in first Reports Example Rulx Philome Alexis 2015-10-27 22:55:22 -04:00
• 15e7065044 Fix : Adding graph colors for comparison Rulx Philome Alexis 2015-10-27 22:36:21 -04:00
• e703d5539b Merge pull request #59 from Esdras1995/master Esdras1995 2015-10-27 21:53:13 -04:00
• 6331618c01 Beta admin auth style modified Esdras1995 2015-10-27 21:50:26 -04:00
• 041cf98f87 Feat: JSonGraph by Week created Rulx Philome Alexis 2015-10-27 21:34:34 -04:00
• 3300177f4b merged local version with master Esdras1995 2015-10-27 21:29:43 -04:00
• abd95d609b Last modif Rulx Philome Alexis 2015-10-27 12:11:29 -04:00
• 1f6bc7b88e Update app.py Hollyn 2015-10-26 19:51:12 -04:00
• f0374adc51 Fix : Improve docs's style(bis) Rulx Philome Alexis 2015-10-25 03:21:43 -04:00
• f0db63b8b0 Fix: Improve doc's style Rulx Philome Alexis 2015-10-25 03:20:11 -04:00
• f3e19d0abe Merge pull request #57 from rpalexis/develop Rulx Philome Alexis 2015-10-25 02:22:22 -04:00
• b608aaf2e3 Fix: Rulx Philome Alexis 2015-10-25 02:13:22 -04:00
• dbba477f14 Fix : Change expression in admin Rulx Philome Alexis 2015-10-25 02:05:39 -04:00
• bdfdbfcd9e Fix: Context_processors unused imports fixed Rulx Philome Alexis 2015-10-25 01:52:44 -04:00
• 44081d1a42 Fix : Correcting database integrity Rulx Philome Alexis 2015-10-25 01:50:48 -04:00
• 173e3b598a Fix alexingfds 2015-10-22 15:00:41 -04:00
• f2c66c6ab9 Fix : Bugs in graph before presentation alexingfds 2015-10-22 14:58:38 -04:00
• 3386d21f2c Merge pull request #55 from rpalexis/develop Rulx Philome Alexis 2015-10-22 07:32:26 -04:00
• 512d1304e9 Merge branch 'fixing-conflict' into develop Rulx Philome Alexis 2015-10-22 07:23:22 -04:00
• ea71c5b181 Fix: Merge Pull Request conflict #53 Rulx Philome Alexis 2015-10-22 07:22:51 -04:00
• 39b93d70a4 Merge pull request #54 from rpalexis/develop Rulx Philome Alexis 2015-10-22 04:40:31 -04:00
• a44f4cce28 Feat: Comparaison module in reports Rulx Philome Alexis 2015-10-22 04:32:37 -04:00
• a1eae6ac19 Fix: Overview in public Rulx Philome Alexis 2015-10-22 04:02:20 -04:00
• a4083a261e fix sms sending and receiving, according to the station convert to mm, log Hollyn 2015-10-21 20:08:16 -04:00
• cb56447111 Map added in the dash Esdras1995 2015-10-21 19:43:47 -04:00
• cf619dc596 Dynamic applist (menu)(name problem) alexingfds 2015-10-21 01:48:23 -04:00
• 96fac70d0f Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-20 21:22:22 -04:00
• 6a526acc94 Merge pull request #52 from jbjeanniton/master Jeas Benjamin Jeanniton 2015-10-19 11:58:40 -04:00
• a27a7f8889 Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-19 11:56:05 -04:00
• c9461ee6d6 Fix conflicts Jeas Benjamin Jeanniton 2015-10-19 10:50:36 -04:00
• dfe604ef50 Test okay. Esdras1995 2015-10-18 23:41:07 -04:00
• dc9b6a4812 added style for Logout, change password, delete ... Esdras1995 2015-10-18 21:29:03 -04:00
• eb2ee8c211 Fixed Conflicts Jeas Benjamin Jeanniton 2015-10-18 21:00:09 -04:00
• 117ba1877f Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-18 16:47:39 -04:00
• 2918e54604 Merge https://github.com/GFDRR/sms-lapli Hollyn 2015-10-16 14:26:59 -04:00
• 279bda28c1 fix log Hollyn 2015-10-16 14:25:57 -04:00
• be98b5d7e3 Merged master fixed conflict Esdras1995 2015-10-16 14:10:43 -04:00
• 0228edbff3 merged Esdras1995 2015-10-16 14:07:03 -04:00
• 96badc71c5 Merge pull request #51 from rpalexis/develop Rulx Philome Alexis 2015-10-15 02:09:02 -04:00
• 65f0057b9e feat: Improving public interface Rulx Philome Alexis 2015-10-15 02:00:44 -04:00
• 5fbea15056 Fix : Re-Ordering Reports's Overview Rulx Philome Alexis 2015-10-14 23:14:24 -04:00
• 695a9a1f35 fixing log for sms Hollyn 2015-10-13 16:51:18 -04:00
• aa9e9a6607 Merge branch 'master' of https://github.com/GFDRR/sms-lapli into develop Hollyn 2015-10-13 13:42:47 -04:00
• ab2493b302 Merge pull request #48 from Hollyn/master Hollyn 2015-10-13 13:40:34 -04:00
• 5fc4ef448c Merge pull request #47 from GiovannaB22/master GiovannaB22 2015-10-13 13:38:43 -04:00
• 53803e7fdd Merge https://github.com/GFDRR/sms-lapli Hollyn 2015-10-13 13:37:28 -04:00
• dbcf789ea8 fix comflict with retrieving data with specific keywords Hollyn 2015-10-13 13:36:01 -04:00
• 8e9955f069 Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-13 13:33:50 -04:00
• cf0fd66077 Merge pull request #49 from GFDRR/revert-45-master Jeas Benjamin Jeanniton 2015-10-13 13:33:12 -04:00
• 3cf10e1356 Revert "Create log that provides a history of all SMS received" Jeas Benjamin Jeanniton 2015-10-13 13:32:34 -04:00
• 5cca42874f correction et ajout du guide d'utilisation doc sphinx GiovannaB22 2015-10-13 12:56:11 -04:00
• 5f8bd072d7 Merge pull request #46 from rpalexis/develop Rulx Philome Alexis 2015-10-13 12:47:32 -04:00
• d206bf1883 Fixing Graph & Table Internal Error Rulx Philome Alexis 2015-10-13 12:25:22 -04:00
• 826c70e14e correction et ajout du guide d'utilisation GiovannaB22 2015-10-13 12:00:26 -04:00
• b2321fb4a7 Merge pull request #45 from jbjeanniton/master Jeas Benjamin Jeanniton 2015-10-13 01:06:12 -04:00
• 22f4891666 Create log that provides a history of all SMS received Jeas Benjamin Jeanniton 2015-10-13 01:04:13 -04:00
• 1495b48821 Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-12 21:11:48 -04:00
• d0d1429e9c Incorporing Upstream's changes Hollyn 2015-10-12 16:26:55 -04:00
• f8ca572409 Fixing Conflicts Hollyn 2015-10-12 15:49:42 -04:00
• 0785ba4751 list of Departements , no need to type departement alexingfds 2015-10-12 15:46:47 -04:00
• d734486400 validation added for superuser alexingfds 2015-10-12 14:27:37 -04:00
• 04009cdf79 Delete style added Esdras1995 2015-10-12 13:17:48 -04:00
• 52509e2d09 Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-09 16:45:35 -04:00
• 9e67cf12bd Merge pull request #44 from rpalexis/develop Rulx Philome Alexis 2015-10-09 13:53:43 -04:00
• 907630ae1f Adding automatic's datas in base for Testing Rulx Philome Alexis 2015-10-09 01:24:24 -04:00
• 37e394befc Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-08 23:01:31 -04:00
• ca79043949 Merge branch 'master' of github.com:GFDRR/sms-lapli into develop Rulx Philome Alexis 2015-10-08 20:43:21 -04:00
• 99c42e0332 more work on outline Jeffrey Johnson 2015-10-08 17:38:02 -07:00
• a24e2430cf fix formatting in technical doc Jeffrey Johnson 2015-10-08 17:33:27 -07:00
• 55c857c2d0 more outline in technical doc Jeffrey Johnson 2015-10-08 17:32:32 -07:00
• 66e2a99281 Add more outline to the technical doc Jeffrey Johnson 2015-10-08 17:24:05 -07:00
• 3587183a3a Update README.rst (and test slack hook) Jeffrey Johnson 2015-10-08 16:54:03 -07:00
• b101ae87e6 Fix encoding and fixtures PK issue Jeffrey Johnson 2015-10-08 16:50:29 -07:00
• f95e794ec5 Graphe and map added in the dashboard but don't show Esdras1995 2015-10-08 18:33:50 -04:00
• 3a9fc79838 fix retrieving data from database with specific keywords closes #12 Hollyn 2015-10-08 15:44:48 -04:00
• 94c0dc379a Merge branch 'master' of https://github.com/GFDRR/sms-lapli Esdras1995 2015-10-08 15:43:12 -04:00
• 1a1418b0dd Merge remote-tracking branch 'GFDRR/master' Jeas Benjamin Jeanniton 2015-10-08 13:11:09 -04:00
• 8161895474 Merge pull request #39 from jj0hns0n/docs-structure Jeffrey Johnson 2015-10-08 10:05:41 -07:00
• a2b3a68100 Merge pull request #40 from jbjeanniton/master Jeas Benjamin Jeanniton 2015-10-08 12:57:37 -04:00
• 72be0738ed Add structure to technical doc Jeffrey Johnson 2015-10-08 09:35:19 -07:00
• 95bfdcf963 Add a new dataset and the validate functionality Jeas Benjamin Jeanniton 2015-10-08 12:29:51 -04:00