dev-fsociety/CrisisFlag
1
0
Fork 0
Code Releases Activity

Commit Graph

  • fc1fb1de72 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 01:07:24 +01:00
  • f0dee3cbcc changement useless kcohenta 2015-12-04 01:07:20 +01:00
  • f7996ad723 merge Korlan Colas 2015-12-04 01:06:15 +01:00
  • 5bd67ce8f6 merge Korlan Colas 2015-12-04 01:05:41 +01:00
  • 39036d9077 idcrisi HorlogeSkynet 2015-12-04 01:04:33 +01:00
  • 9b3f7ce998 Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 00:55:30 +01:00
  • a7465e6eb6 debut homepage dibi 2015-12-04 00:55:23 +01:00
  • 9ee3702210 traduction... HorlogeSkynet 2015-12-04 00:54:33 +01:00
  • 5ddc689f05 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 00:50:56 +01:00
  • 130c1758fb merge Anthony Gourd 2015-12-04 00:45:00 +01:00
  • 5c422f354a Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 00:44:07 +01:00
  • a5703a8cab Hot fix articles add (my bad) Anthony Gourd 2015-12-04 00:44:01 +01:00
  • d0cfd96290 Fix ligne vide kcohenta 2015-12-04 00:43:51 +01:00
  • 1c6f9c17ca merge Anthony Gourd 2015-12-04 00:42:16 +01:00
  • 8296593ec1 Hot fix add info Anthony Gourd 2015-12-04 00:40:19 +01:00
  • ce759fd052 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 00:39:04 +01:00
  • c73bfd49fc Ajout ligne vide sous formulaires éditables kcohenta 2015-12-04 00:38:59 +01:00
  • 1a4f332741 test crisis Korlan Colas 2015-12-04 00:38:07 +01:00
  • 3840e9574c Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 00:36:48 +01:00
  • 9af882cc4e Users > view.ctp KansassCityShuffle 2015-12-04 00:32:26 +01:00
  • 173a496f3e Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-04 00:30:18 +01:00
  • a28de0dc38 user pour Lisa HorlogeSkynet 2015-12-04 00:30:02 +01:00
  • 57532a5797 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 00:28:24 +01:00
  • 23ef22a94f Adding default template for info on crisis Corentin Mors 2015-12-04 00:28:03 +01:00
  • dc3780b2aa Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 00:26:39 +01:00
  • 4469d48bf3 Modif edition texte kcohenta 2015-12-04 00:26:35 +01:00
  • fc827a2e3f Changement des menus + traductions HorlogeSkynet 2015-12-04 00:20:47 +01:00
  • 34438ece43 Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 00:15:46 +01:00
  • bdffaccc7f Error string top page + alert success and fail + quickfix homepage Anthony Gourd 2015-12-04 00:15:38 +01:00
  • f7fcbd49fb pull dibi 2015-12-04 00:15:37 +01:00
  • 098851c999 Formulaire sur home dibi 2015-12-04 00:07:11 +01:00
  • 127f4e4e9e Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-04 00:03:44 +01:00
  • 27347b0373 Login/logout management Anthony Gourd 2015-12-04 00:03:29 +01:00
  • f58b633bea Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 00:03:02 +01:00
  • 519cc4ee41 Ajout des editions de texte kcohenta 2015-12-04 00:02:57 +01:00
  • 86795c1bb7 Fin authentification + URL des menus des pages HorlogeSkynet 2015-12-03 23:54:31 +01:00
  • d40b6bf263 Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-03 23:37:18 +01:00
  • 8c4d0aa579 Fix info-crisis link Anthony Gourd 2015-12-03 23:37:13 +01:00
  • e7473fd337 Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-03 23:36:43 +01:00
  • 540514d883 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-03 23:35:39 +01:00
  • 05a1e3a5d3 Crisis Template + FoundationIconsAdd Corentin Mors 2015-12-03 23:34:07 +01:00
  • a036ba5273 Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-03 23:32:45 +01:00
  • bd7791e148 Merge branch 'master' of github.com:agourd/dev-fsociety Korlan Colas 2015-12-03 23:32:43 +01:00
  • 7f227e4bd4 .. KansassCityShuffle 2015-12-03 23:31:51 +01:00
  • 2aab9cb97f git configz KansassCityShuffle 2015-12-03 23:27:51 +01:00
  • 0d9a6bb634 Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-03 23:26:23 +01:00
  • d46e3dcfbc merge HorlogeSkynet 2015-12-03 23:26:19 +01:00
  • 2564d8f912 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-03 23:15:02 +01:00
  • 82ca18b6e2 Petites modifs Crisis kcohenta 2015-12-03 23:14:57 +01:00
  • d22f1ebe48 isAthorized... the following HorlogeSkynet 2015-12-03 23:12:46 +01:00
  • 3d8fbc717f Fix login Anthony Gourd 2015-12-03 23:09:33 +01:00
  • 2d8cf2a47e Merge branch 'master' of github.com:agourd/dev-fsociety Korlan Colas 2015-12-03 23:00:19 +01:00
  • 23c1478353 Merge fix kcohenta 2015-12-03 22:58:05 +01:00
  • e6df760a2e Traduction add.ctp kcohenta 2015-12-03 22:57:21 +01:00
  • a491d2824c try to fix font bug... KansassCityShuffle 2015-12-03 22:45:28 +01:00
  • 824d7df7d5 merge Korlan Colas 2015-12-03 22:42:17 +01:00
  • a20344b905 test crisis view Korlan Colas 2015-12-03 22:41:42 +01:00
  • 8881c999e3 Users > login KansassCityShuffle 2015-12-03 22:19:15 +01:00
  • 3d671b5402 Merge branch 'master' of github.com:agourd/dev-fsociety KansassCityShuffle 2015-12-03 22:08:34 +01:00
  • 2b3c131964 start Users login KansassCityShuffle 2015-12-03 22:08:25 +01:00
  • 3b925133c3 Home again + tricks css Anthony Gourd 2015-12-03 22:06:46 +01:00
  • 3cc2a49951 Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-03 21:55:22 +01:00
  • d25a984eec Working on home controller Anthony Gourd 2015-12-03 21:55:18 +01:00
  • 8b43de4ac6 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-03 21:44:31 +01:00
  • 22f6eb6c33 Merge fix kcohenta 2015-12-03 21:44:19 +01:00
  • 14b7f7acfa fix merge Korlan Colas 2015-12-03 21:43:12 +01:00
  • a12119138c Traduction des fichiers edit kcohenta 2015-12-03 21:41:18 +01:00
  • f47f5a33d0 Merge branch 'master' of github.com:agourd/dev-fsociety Korlan Colas 2015-12-03 21:40:21 +01:00
  • de90cb481c fix merge Korlan Colas 2015-12-03 21:39:48 +01:00
  • dd11f1bd42 Merge branch 'master' of github.com:agourd/dev-fsociety KansassCityShuffle 2015-12-03 21:39:31 +01:00
  • 3806397f1a Merge branch 'master' of github.com:agourd/dev-fsociety KansassCityShuffle 2015-12-03 21:38:31 +01:00
  • 063888b7f8 Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-03 21:37:56 +01:00
  • 0dd4ffd04e j'ai les droits d'acces dibi 2015-12-03 21:37:49 +01:00
  • de2cfff42e Regle permissive Korlan Colas 2015-12-03 21:37:48 +01:00
  • f2d74f8851 Fixed homes acces Anthony Gourd 2015-12-03 21:37:16 +01:00
  • 5a85c27b0e idem KansassCityShuffle 2015-12-03 21:35:12 +01:00
  • 67411264e5 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-03 21:32:14 +01:00
  • ea264a00ff Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-03 21:31:14 +01:00
  • 439dad8ff0 pour sauver les autres dibi 2015-12-03 21:30:57 +01:00
  • 628a040806 Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-03 21:30:41 +01:00
  • 9e4b652e17 route + flash + begin HomesController Anthony Gourd 2015-12-03 21:30:36 +01:00
  • ab88befd40 merge Korlan Colas 2015-12-03 21:26:50 +01:00
  • 72d4ca8ff6 ca al'air de marcher Korlan Colas 2015-12-03 21:25:58 +01:00
  • b5287c3c75 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-03 21:22:11 +01:00
  • 7448e6d77e top bar OK + footer KansassCityShuffle 2015-12-03 21:21:42 +01:00
  • 76407f2c84 Ajout template crisis.css 3 Corentin Mors 2015-12-03 21:21:14 +01:00
  • 01e0ca7b65 UserControllerMerge Korlan Colas 2015-12-03 21:06:05 +01:00
  • f5b36c30a4 Fix 'login' HorlogeSkynet 2015-12-03 21:05:28 +01:00
  • 278e6ece14 Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-03 20:56:05 +01:00
  • c39b6373da Test authentification HorlogeSkynet 2015-12-03 20:55:59 +01:00
  • ef2c3ef650 changement home->homes dibi 2015-12-03 20:50:26 +01:00
  • 5b1e33d55b Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-03 20:44:04 +01:00
  • 4c604dcacd Ajout template crisis.css 2 Corentin Mors 2015-12-03 20:43:35 +01:00
  • b0ab8a2f10 Ajout template crisis.css Corentin Mors 2015-12-03 20:42:54 +01:00
  • 30946a88dc Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-03 20:42:05 +01:00
  • c626a2b6ac Added home controller Anthony Gourd 2015-12-03 20:42:01 +01:00
  • 387e79151f starting top bar KansassCityShuffle 2015-12-03 20:41:38 +01:00
  • fe7f00e653 Add AuthComponent + Hash Password + Truncate Password HorlogeSkynet 2015-12-03 20:09:22 +01:00
  • c85ff22006 Raccourci de debug + fix Crises -> Crisis Korlan Colas 2015-12-03 20:03:47 +01:00
  • 24d634bb78 Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-03 19:47:16 +01:00