Commit Graph

Select branches

Hide Pull Requests

master

v0.1.0

Mono Color

• f8145db8ba Implement upvote on crisis + Logo root link Corentin Mors 2015-12-04 06:13:07 +01:00
• 78581701bb Link sur les petite crises Korlan Colas 2015-12-04 06:12:00 +01:00
• 988d5c510b Merge branch 'master' of github.com:agourd/dev-fsociety Korlan Colas 2015-12-04 06:01:06 +01:00
• 1bbc9cba8a Increment decrement Korlan Colas 2015-12-04 06:01:00 +01:00
• 922922fdf7 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 05:55:09 +01:00
• e0f6cc6631 Visuel Crisis index kcohenta 2015-12-04 05:55:06 +01:00
• fd3cadce5e Traduction du main menu Corentin Mors 2015-12-04 05:47:44 +01:00
• 64503744f5 Traduction du main menu Corentin Mors 2015-12-04 05:45:48 +01:00
• c942151a15 merge Anthony Gourd 2015-12-04 05:45:33 +01:00
• df3190a920 Some small fixes Anthony Gourd 2015-12-04 05:44:47 +01:00
• 2a5eaaec05 Rename Project Corentin Mors 2015-12-04 05:43:10 +01:00
• 90191b6ca0 Merge branch 'master' of github.com:agourd/dev-fsociety Korlan Colas 2015-12-04 05:29:08 +01:00
• 7e92327e46 fusion de crises Korlan Colas 2015-12-04 05:28:47 +01:00
• dee6d7e717 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 05:28:46 +01:00
• b39b476b91 Adding logo and icons Corentin Mors 2015-12-04 05:28:32 +01:00
• 6092a08384 4 dibi 2015-12-04 05:26:24 +01:00
• 6f6e8b3ed7 Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-04 05:24:44 +01:00
• ac9d8f4f7f test article homepage HorlogeSkynet 2015-12-04 05:24:41 +01:00
• b4188fefdb 3 dibi 2015-12-04 05:12:01 +01:00
• 500a0e1170 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 05:08:45 +01:00
• f1a4bf65ac Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 05:08:21 +01:00
• 49c25c3305 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 05:08:13 +01:00
• c0be38d2ca Boutons articles view kcohenta 2015-12-04 05:08:10 +01:00
• a2069f0b0a Auto log username in chat Corentin Mors 2015-12-04 05:08:06 +01:00
• 8485b59c51 Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-04 05:00:55 +01:00
• 375dbdee6d Crisis edit and view Anthony Gourd 2015-12-04 05:00:50 +01:00
• 6030dffa34 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 04:58:10 +01:00
• 63254cdfcb Ajout boutons index articles kcohenta 2015-12-04 04:58:07 +01:00
• 7aa8f0cf47 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 04:55:34 +01:00
• 946063fe3f Fix informations css Corentin Mors 2015-12-04 04:55:21 +01:00
• 4787f6cb87 Merge branch 'master' of github.com:agourd/dev-fsociety Korlan Colas 2015-12-04 04:47:38 +01:00
• a77b39f80d colored geolocme :) Korlan Colas 2015-12-04 04:47:26 +01:00
• 6312f251d7 Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-04 04:42:55 +01:00
• 96fe05497f Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-04 04:35:48 +01:00
• bfaeed0e38 merge Anthony Gourd 2015-12-04 04:35:43 +01:00
• 513ca47470 bugfix dibi 2015-12-04 04:28:29 +01:00
• 3ad80fee2b Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 04:22:46 +01:00
• aadb2a8d9b Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 04:22:48 +01:00
• 348c53367e Fix width pagination index article kcohenta 2015-12-04 04:22:44 +01:00
• 73e98d9d2b Merge branch 'master' of github.com:agourd/dev-fsociety HorlogeSkynet 2015-12-04 04:20:26 +01:00
• 8fbb641420 merge HorlogeSkynet 2015-12-04 04:19:12 +01:00
• a04200465d Validate a crisis Anthony Gourd 2015-12-04 04:18:17 +01:00
• 200f060077 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 04:17:31 +01:00
• 1e7baf96e3 Fix for tweet widget Corentin Mors 2015-12-04 04:17:20 +01:00
• 16a32d0a8b Fix merge kcohenta 2015-12-04 04:15:17 +01:00
• 6db46cdeb6 Modif articles->index.ctp kcohenta 2015-12-04 04:14:21 +01:00
• 508178c81b merge HorlogeSkynet 2015-12-04 04:13:39 +01:00
• 602e2a75f0 Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 04:13:06 +01:00
• 92c22ddf20 Add js for geoloc Korlan Colas 2015-12-04 04:12:58 +01:00
• e8795c2fdb fix somalie Korlan Colas 2015-12-04 04:12:08 +01:00
• 43d6808116 Submit crisis Korlan Colas 2015-12-04 03:57:30 +01:00
• beceaccf8d Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 03:54:03 +01:00
• a435d1caf9 plus que none dibi 2015-12-04 03:53:50 +01:00
• 59f7ec2421 Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 03:53:07 +01:00
• a4cd66bf0c Twitter feed working Corentin Mors 2015-12-04 03:52:53 +01:00
• 009613a264 Merge branch 'master' of github.com:agourd/dev-fsociety KansassCityShuffle 2015-12-04 03:50:17 +01:00
• 416b51730e Merge branch 'master' of github.com:agourd/dev-fsociety KansassCityShuffle 2015-12-04 03:50:07 +01:00
• f9d0a0f6df some fixes HorlogeSkynet 2015-12-04 03:45:00 +01:00
• c427a6d87e many fixes HorlogeSkynet 2015-12-04 03:43:37 +01:00
• 5a74827c46 crisis state view on panel KansassCityShuffle 2015-12-04 03:42:57 +01:00
• 954fc2e7ad Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 03:41:02 +01:00
• f2f1ce27a1 merge fix dibi 2015-12-04 03:40:50 +01:00
• 41b52fdcb6 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 03:34:23 +01:00
• e27abb7ec4 LOREM IPSUM kcohenta 2015-12-04 03:34:19 +01:00
• 70a5077a0b homepage more responsive dibi 2015-12-04 03:33:01 +01:00
• 8cc74a1425 change logout redirect HorlogeSkynet 2015-12-04 03:24:28 +01:00
• 136e4d04db Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-04 03:21:50 +01:00
• 66cbacaed9 Info order in crisis view Anthony Gourd 2015-12-04 03:21:47 +01:00
• d27cf4b17f Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 03:14:18 +01:00
• ee5ca9a506 Button Add Info to Crisis Corentin Mors 2015-12-04 03:13:57 +01:00
• d2038f49ae Merge branch 'master' of github.com:agourd/dev-fsociety Anthony Gourd 2015-12-04 03:12:11 +01:00
• 2f45b5c2cc Some improvement (title) and futher development of controllers Anthony Gourd 2015-12-04 03:12:05 +01:00
• 946c543a1a Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 02:54:20 +01:00
• 9bee985f3f Implementing Chat WebRTC Corentin Mors 2015-12-04 02:53:55 +01:00
• f9809efa24 link to add info t oa crisis HorlogeSkynet 2015-12-04 02:53:08 +01:00
• 5d7ac30c85 fix merge DE LISA kcohenta 2015-12-04 02:22:09 +01:00
• 48b1c05ea9 Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 02:20:05 +01:00
• 687ef8c8ac modif index kcohenta 2015-12-04 02:20:00 +01:00
• 86703099bb merge Korlan Colas 2015-12-04 02:19:50 +01:00
• 2148a83848 finnaly Korlan Colas 2015-12-04 02:18:43 +01:00
• f3ea5e6eae Merge branch 'master' of github.com:agourd/dev-fsociety KansassCityShuffle 2015-12-04 02:17:12 +01:00
• 8eae54cbef Users > view + Topbar separator KansassCityShuffle 2015-12-04 02:15:05 +01:00
• 4a07a6c581 Merge branch 'master' of github.com:agourd/dev-fsociety dibi 2015-12-04 02:07:14 +01:00
• 77d724ca3e mise en forme de homepage version urgent dibi 2015-12-04 02:07:08 +01:00
• f11ece238e Merge branch 'master' of github.com:agourd/dev-fsociety kcohenta 2015-12-04 02:04:36 +01:00
• 8229cabfc8 Traduction index + ajout margin kcohenta 2015-12-04 02:04:33 +01:00
• 330e22e9fc Info controller add method Anthony Gourd 2015-12-04 02:03:36 +01:00
• 6ef80f26bd merge Anthony Gourd 2015-12-04 01:56:43 +01:00
• 81161b588b home controller Anthony Gourd 2015-12-04 01:55:39 +01:00
• 2b60501182 layout + '/' HorlogeSkynet 2015-12-04 01:52:06 +01:00
• 2ce2cb7573 traduction HorlogeSkynet 2015-12-04 01:49:21 +01:00
• 147e367fee traduction HorlogeSkynet 2015-12-04 01:46:19 +01:00
• 3f32c8d85e Merge branch 'master' of github.com:agourd/dev-fsociety Corentin Mors 2015-12-04 01:41:07 +01:00
• 64d1bb9ffd Information connect to db Corentin Mors 2015-12-04 01:40:53 +01:00
• 1bc7caa75e edit info Coco' HorlogeSkynet 2015-12-04 01:40:16 +01:00
• 993ea5722e Merge fix tinymce Corentin Mors 2015-12-04 01:23:30 +01:00
• ca76061c48 Crisis information update Corentin Mors 2015-12-04 01:21:06 +01:00
• 2c7a56fd62 Merge branch 'master' of github.com:agourd/dev-fsociety linkzl 2015-12-04 01:16:49 +01:00
• ecd3bc632c Retrait edition text kcohenta 2015-12-04 01:15:59 +01:00
• 29bc2ade67 first modif linkzl 2015-12-04 01:15:55 +01:00