Commit Graph

  • d60e6c085a Merge branch 'develop' master v0.1.0 Samuel FORESTIER 2017-11-06 14:28:40 -0500
  • a489ca9cc9 Petites nouvelles modifications: HorlogeSkynet 2016-12-20 00:36:30 +0100
  • 2e9bd76573 IS THIS THE LAST COMMIT ? HorlogeSkynet 2016-12-07 19:43:46 +0100
  • 3a5a72ea95 On continue les mises au point ! HorlogeSkynet 2016-12-06 23:57:25 +0100
  • cd206c52b4 MERGE et améliorations ! HorlogeSkynet 2016-12-06 01:06:52 +0100
  • 4525b69422 BIG COMMIT, the following HorlogeSkynet 2016-12-06 01:01:05 +0100
  • 8028bd4024 BIG FIXING THINGS COMMT HorlogeSkynet 2016-12-04 01:48:53 +0100
  • 1b3a31e70c Merge branch 'release/V1.0.0' Anthony Gourd 2016-12-02 07:46:28 +0100
  • ba6156bff4 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 07:45:06 +0100
  • 40bdb0067b Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 07:44:38 +0100
  • 1d3eb2fb9a icons and default-icon dibi 2016-12-02 07:44:29 +0100
  • 692967756f merge Korlan Colas 2016-12-01 22:44:24 -0800
  • 69b1f9b7cd edition enachement Korlan Colas 2016-12-01 22:42:49 -0800
  • 2aec2c22ce Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Anthony Gourd 2016-12-02 07:30:41 +0100
  • 9fddc2d5da Fixed some redirection Anthony Gourd 2016-12-02 07:30:34 +0100
  • 71c04208d4 COMPRESSION IMAGE HorlogeSkynet 2016-12-02 07:30:22 +0100
  • b1701e9fbb MERGE HorlogeSkynet 2016-12-02 07:27:38 +0100
  • 5fb06ab546 Fix autorisations pour les Offres et un bouton HorlogeSkynet 2016-12-02 07:26:54 +0100
  • eb5f645e83 Add an offert quick fix Anthony Gourd 2016-12-02 07:24:34 +0100
  • 5a4d33aadc Merge branch 'release/V0.3.0' Anthony Gourd 2016-12-02 07:12:31 +0100
  • 046d6d7af0 Merge ! HorlogeSkynet 2016-12-02 07:11:44 +0100
  • 1d3325a199 Fix autorisations + Fix timeout HorlogeSkynet 2016-12-02 07:10:47 +0100
  • 9b9adcae44 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop kcohentanugi 2016-12-02 07:06:51 +0100
  • 1d1e9ed589 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop kcohentanugi 2016-12-02 07:06:16 +0100
  • ce7329a3f7 Add display view-offer kcohentanugi 2016-12-02 07:06:10 +0100
  • 4f64d9f43d Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 07:06:05 +0100
  • 9d21ad047d Categories / bouton de lecture des posts dibi 2016-12-02 07:06:01 +0100
  • 570a38ae7c Lulz background Korlan Colas 2016-12-01 22:05:25 -0800
  • c07bb37406 Merge branch 'release/V0.2.1' Anthony Gourd 2016-12-02 07:01:41 +0100
  • 520b027ec4 Merge fix Korlan Colas 2016-12-01 21:59:41 -0800
  • 32236393f8 Minimalist rank of item on camp page view Korlan Colas 2016-12-01 21:58:51 -0800
  • fcc33d6f2f Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop kcohentanugi 2016-12-02 06:33:07 +0100
  • c9efa6171a Modif display add-cat kcohentanugi 2016-12-02 06:33:02 +0100
  • b2d6e6ba79 Merge branch 'release/V0.2.0' Anthony Gourd 2016-12-02 06:25:28 +0100
  • b1a1eea07f Changed voc Anthony Gourd 2016-12-02 06:25:03 +0100
  • 865943258c Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into release/V0.2.0 Anthony Gourd 2016-12-02 06:20:46 +0100
  • eba4b80604 Redirect after camp edition Anthony Gourd 2016-12-02 06:20:40 +0100
  • 07b2f68e09 Merge branch 'feature/add_item' into develop Korlan Colas 2016-12-01 21:19:25 -0800
  • adb2c8f4f3 Organization can add item Korlan Colas 2016-12-01 21:18:58 -0800
  • 87de580559 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 06:03:07 +0100
  • 6096e25efc Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 05:48:26 +0100
  • 381c4a34a7 refonte itemview dibi 2016-12-02 05:48:22 +0100
  • ce008cdfba Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 05:47:26 +0100
  • ee9ab9d0c2 FIX FOR FORMS HorlogeSkynet 2016-12-02 05:47:22 +0100
  • 4b0eb337e9 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 05:43:53 +0100
  • d934c6fc50 modif item view dibi 2016-12-02 05:43:49 +0100
  • eb18b1f888 Merge Korlan Colas 2016-12-01 20:43:12 -0800
  • ae1c767709 registration donor Korlan Colas 2016-12-01 20:41:47 -0800
  • 87b7489429 Merge branch 'release/V0.1.1' Anthony Gourd 2016-12-02 05:28:16 +0100
  • b065ef2984 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 05:27:50 +0100
  • eb28bbd9bd Fix pour l'ajout d'un donneur... HorlogeSkynet 2016-12-02 05:27:46 +0100
  • 3bcdd27efe hotfix control cat Korlan Colas 2016-12-01 20:25:14 -0800
  • 9fd5929b8d Fix closing div item.cpt kcohentanugi 2016-12-02 05:18:31 +0100
  • 7daaa5f6df Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 05:16:13 +0100
  • f4e4b843ab Adds timeout to flash alerts ! HorlogeSkynet 2016-12-02 05:16:09 +0100
  • 5f35836907 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-02 05:03:50 +0100
  • 682238d15c Front : fix big button KansassCityShuffle 2016-12-02 05:03:46 +0100
  • eb82679e6b Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop Yann Caumartin 2016-12-02 04:45:00 +0100
  • c9358dedb0 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Korlan Colas 2016-12-01 19:43:21 -0800
  • da82ed10db Hotfix Korlan Colas 2016-12-01 19:43:17 -0800
  • 8e362c4216 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop Yann Caumartin 2016-12-02 04:43:14 +0100
  • 27d41a73d8 Fonction add de Needs Yann Caumartin 2016-12-02 04:43:05 +0100
  • b66d33cd5b finishing branch dibi 2016-12-02 04:40:58 +0100
  • ff61b44f35 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 04:31:48 +0100
  • 766a6b35f4 Nouvelle regex (BY GAET THE BIG BOSS) + Fix view + Bouton pour créer une organisation (pour la démonstration git diff) HorlogeSkynet 2016-12-02 04:31:44 +0100
  • f384099e75 Merge branch 'release/V0.1.0' Anthony Gourd 2016-12-02 04:29:50 +0100
  • e9e5b04ac0 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-02 04:27:22 +0100
  • 91d366273d Front : fix users view KansassCityShuffle 2016-12-02 04:27:18 +0100
  • b5a4aafcf0 Merge branch 'feature/fix_html_links' into develop Korlan Colas 2016-12-01 19:15:16 -0800
  • 0c94a0e93d refactor Korlan Colas 2016-12-01 19:14:45 -0800
  • 188b3ea295 Merge branch 'feature/checkSubscribeOrganisation' into develop HorlogeSkynet 2016-12-02 04:13:45 +0100
  • aaca397209 Fiiiiiiiiix ! Ça marche, la vue des organisations est correcte HorlogeSkynet 2016-12-02 04:13:30 +0100
  • 787915c257 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 04:02:58 +0100
  • 6931b3862e Add an organization needs to precise a camp_id + minor fixes on views HorlogeSkynet 2016-12-02 04:02:47 +0100
  • e3fc29dd27 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-02 03:51:51 +0100
  • b058c87332 Front : fix users view, actions link in related offers list KansassCityShuffle 2016-12-02 03:51:16 +0100
  • 2d1a2d9482 Fix too close icons + up background Corentin Mors 2016-12-02 03:45:14 +0100
  • 610d73c860 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-02 03:39:35 +0100
  • ce85d7f99a Front : add users view KansassCityShuffle 2016-12-02 03:39:31 +0100
  • 4ba1f00b12 Added process function to by_category kcohentanugi 2016-12-02 03:38:51 +0100
  • 7143c2f3af Added background login Corentin Mors 2016-12-02 03:31:33 +0100
  • d75e9fd610 Merge branch 'feature/control_categories' into develop Korlan Colas 2016-12-01 18:29:42 -0800
  • 7bb8cf94eb Control category on item/cat creation Korlan Colas 2016-12-01 18:28:45 -0800
  • e1d83912c1 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 02:59:28 +0100
  • 51ff5166f4 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Anthony Gourd 2016-12-02 02:59:05 +0100
  • 6513941c4b Fixed the user redirection Anthony Gourd 2016-12-02 02:59:00 +0100
  • 0df0ef0d3c Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 02:54:16 +0100
  • 684358d482 Fix for some buttons and texts HorlogeSkynet 2016-12-02 02:54:11 +0100
  • 1e45e23de1 Profile / Logout topbar links Corentin Mors 2016-12-02 02:51:09 +0100
  • 0b9861c18e Fix merge itemsByCategory kcohentanugi 2016-12-02 02:36:57 +0100
  • 040b23ad8c Final Items/by_category kcohentanugi 2016-12-02 02:35:11 +0100
  • a544035f18 Merge branch 'item_intel' into develop Korlan Colas 2016-12-01 17:28:34 -0800
  • 06cc785b2d Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 02:26:57 +0100
  • 5db89e7c53 New Warning alert box + New styles and colors + Now users can logout only one time + Misc on footer HorlogeSkynet 2016-12-02 02:26:52 +0100
  • 6c56da9982 process function for item controller Korlan Colas 2016-12-01 17:25:11 -0800
  • 6c518e0df9 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Anthony Gourd 2016-12-02 02:22:22 +0100
  • ba24c2abdf Added refugee_count display and delete icons Anthony Gourd 2016-12-02 02:21:28 +0100
  • 1614317310 creation branche dibi 2016-12-02 02:11:40 +0100
  • e3d5508e46 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 02:08:16 +0100
  • 1a25a6af03 ajout dir webroot/img/icons dibi 2016-12-02 02:08:12 +0100