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

Commit Graph

  • aad69476d3 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into feature/CampViewTemplate Anthony Gourd 2016-12-02 02:06:00 +01:00
  • aa9cce29e3 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 01:49:57 +01:00
  • cf8ac6e142 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Anthony Gourd 2016-12-02 01:39:59 +01:00
  • 823b39142d User redirect after login Anthony Gourd 2016-12-02 01:39:55 +01:00
  • e2358b186b merge KansassCityShuffle 2016-12-02 01:38:27 +01:00
  • cb0af152ea Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 01:32:11 +01:00
  • 7b5022e65d Logo now routes to homepage ! + Regex for phone number BITCH HorlogeSkynet 2016-12-02 01:32:07 +01:00
  • 60d194de29 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-02 01:28:51 +01:00
  • 539c32d319 merge KansassCityShuffle 2016-12-02 01:27:57 +01:00
  • 2ab46caa5c Merge branch 'feature/user_camp_add_cat' into develop Korlan Colas 2016-12-01 16:27:11 -08:00
  • d829e59d7e Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 01:26:43 +01:00
  • 80a4b97042 Categories - liens propres dibi 2016-12-02 01:26:39 +01:00
  • b531638af4 automatique camp retrive when adding a catégory Korlan Colas 2016-12-01 16:26:21 -08:00
  • 76058cd813 Front : add footer KansassCityShuffle 2016-12-02 01:25:09 +01:00
  • 6a9e29fc1a fix merge items/by_category kcohentanugi 2016-12-02 01:24:57 +01:00
  • 48437a2f2b Ajout Items/by_category, en attente du correctif item->category kcohentanugi 2016-12-02 01:24:19 +01:00
  • 0d04c015d6 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 01:23:10 +01:00
  • 26586e2859 Edits work HorlogeSkynet 2016-12-02 01:23:06 +01:00
  • 4cdca66ae6 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 01:20:37 +01:00
  • 6a80f5008b re-added messages css dibi 2016-12-02 01:20:34 +01:00
  • 84236d105f Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Korlan Colas 2016-12-01 16:09:56 -08:00
  • f8c663c7b1 La base.. Korlan Colas 2016-12-01 16:09:52 -08:00
  • f9cc6180dd Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 01:05:33 +01:00
  • f463d43e54 link to subcategories from categories dibi 2016-12-02 01:05:29 +01:00
  • 33a683b869 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-02 00:58:50 +01:00
  • 6b1799d309 Merge branch 'feature/draw_categories' into develop Korlan Colas 2016-12-01 15:58:49 -08:00
  • 3d265a0f27 doing links dibi 2016-12-02 00:58:44 +01:00
  • 8a6ab7bc67 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Korlan Colas 2016-12-01 15:58:37 -08:00
  • f6b3dae337 draw categories Korlan Colas 2016-12-01 15:58:18 -08:00
  • 633b12a4a5 Added category fetching for the Items/index Anthony Gourd 2016-12-02 00:52:51 +01:00
  • e21c221bdd Try to set the loggedUser again Anthony Gourd 2016-12-02 00:37:43 +01:00
  • 0466b61bfe Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Anthony Gourd 2016-12-02 00:32:39 +01:00
  • c81914fe55 Hotfix for loggedUser issue Anthony Gourd 2016-12-02 00:32:30 +01:00
  • ef26e26623 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 00:32:06 +01:00
  • b7a5bbddd0 Restrictions de droits utilisateurs HorlogeSkynet 2016-12-02 00:32:01 +01:00
  • 04e25c9331 Transmit category to Items/byCategory Anthony Gourd 2016-12-02 00:31:26 +01:00
  • 7f9145e2b4 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 00:23:05 +01:00
  • aa3b18319f Added loggedUser variable accessible in CTP files Anthony Gourd 2016-12-02 00:08:55 +01:00
  • 2e12437e23 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-02 00:05:07 +01:00
  • e4de3250aa Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Anthony Gourd 2016-12-02 00:03:47 +01:00
  • 6341206139 Fixed merge conflict on UserController Anthony Gourd 2016-12-02 00:03:44 +01:00
  • eac17f2a66 Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Korlan Colas 2016-12-01 14:59:58 -08:00
  • dcc5b78481 eot ttf Korlan Colas 2016-12-01 14:59:51 -08:00
  • 5bf70910ec Base SQL propre Xysto 2016-12-01 23:57:29 +01:00
  • 846f2d2736 Route modification + subscribe forms fixed Anthony Gourd 2016-12-01 23:53:39 +01:00
  • 1eff19bb54 Commit obligé (.eot .ttf) Xysto 2016-12-01 23:47:14 +01:00
  • 2680101d49 FIX CLRF HorlogeSkynet 2016-12-01 23:41:33 +01:00
  • ec6aa42812 Stange modification on foundation-icons ... Anthony Gourd 2016-12-01 23:38:45 +01:00
  • e2f2faeaad Login + Add + Edit HorlogeSkynet 2016-12-01 23:35:17 +01:00
  • 0054128bde Posts list by-category dibi 2016-12-01 23:27:46 +01:00
  • ee1efb1b41 Fix merge css and js Corentin Mors 2016-12-01 23:20:53 +01:00
  • f2cd26bd1a Logo linkà Corentin Mors 2016-12-01 23:16:12 +01:00
  • 4055e32480 Logo Menu + Font Icon Add Corentin Mors 2016-12-01 23:08:26 +01:00
  • 97fea5022f Merge branch 'develop' of github.com:dev-fsociety/DFS-2016 into develop Korlan Colas 2016-12-01 13:42:46 -08:00
  • 734f8d6f0c With patch content Korlan Colas 2016-12-01 13:42:35 -08:00
  • 719695d025 Merge branch 'feature/authentification' into feature/login HorlogeSkynet 2016-12-01 22:32:05 +01:00
  • 7a8f610bbc Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-01 22:31:55 +01:00
  • 71963a756d Index des categories css dibi 2016-12-01 22:31:43 +01:00
  • 8002d58c28 Index des categories css dibi 2016-12-01 22:31:29 +01:00
  • a397bc1009 LOGIN HorlogeSkynet 2016-12-01 22:31:15 +01:00
  • 791f9ce4b4 Merge branch 'feature/refugee_count_camp' into develop Korlan Colas 2016-12-01 13:29:20 -08:00
  • 2dab8b51c9 fix foreign key camp in user (run patch-1.sql) + refugee count on camp view Korlan Colas 2016-12-01 13:28:49 -08:00
  • 83d4093a89 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-01 22:27:19 +01:00
  • 19825e9ef0 Front: add edition forms KansassCityShuffle 2016-12-01 22:27:16 +01:00
  • 3b77c583cd Hotfixed items list. Renamed in byCategory because list seems to be a key word on some setup Anthony Gourd 2016-12-01 22:21:35 +01:00
  • ba48e35f13 Merge branch 'feature/posts' into develop Anthony Gourd 2016-12-01 22:16:51 +01:00
  • d9eb91e065 Posts by categories OK Anthony Gourd 2016-12-01 22:16:14 +01:00
  • 3f1b610a74 Rework sticky menu Corentin Mors 2016-12-01 22:15:40 +01:00
  • 17934497a0 Fin (?) ajout / édition utilisateur HorlogeSkynet 2016-12-01 22:15:11 +01:00
  • f6fb1cd291 Front : add login and subscription forms KansassCityShuffle 2016-12-01 22:05:11 +01:00
  • 1a8393f041 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-01 22:04:10 +01:00
  • 7f2b64d7f0 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop dibi 2016-12-01 22:03:24 +01:00
  • f9253ee5d4 Index des categories dibi 2016-12-01 22:03:20 +01:00
  • ae91a61bc0 Merge branch 'feature/list_item' into develop Korlan Colas 2016-12-01 12:52:08 -08:00
  • 5964e8b9b0 Tri par hot des items dans index liste items par catégories Korlan Colas 2016-12-01 12:51:26 -08:00
  • a5eefa1183 Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop KansassCityShuffle 2016-12-01 21:50:02 +01:00
  • 11b6c263b6 need database KansassCityShuffle 2016-12-01 21:49:55 +01:00
  • 49cc2ca5ea Nouveau squelette HorlogeSkynet 2016-12-01 21:47:42 +01:00
  • c826b66f62 Del link add Corentin Mors 2016-12-01 21:45:55 +01:00
  • 5bc94a87b0 Intial Release for Camps View Corentin Mors 2016-12-01 21:27:47 +01:00
  • eae0698e52 Added the security component, prevent form tempering Anthony Gourd 2016-12-01 20:56:15 +01:00
  • 9687271403 Merge branch 'categories-add' into develop Korlan Colas 2016-12-01 11:24:43 -08:00
  • 6703b3b3ba formulaire categorie - attention champ hidden (camp) Korlan Colas 2016-12-01 11:23:55 -08:00
  • 40f6d390b1 Added list method Anthony Gourd 2016-12-01 20:21:12 +01:00
  • 3043984496 Add custom CSS file Corentin Mors 2016-12-01 20:16:48 +01:00
  • 87bdba0e2e Include CSS/JS in header Corentin Mors 2016-12-01 20:00:26 +01:00
  • 363120cb8d Minuscules pour le squelette HorlogeSkynet 2016-12-01 19:34:47 +01:00
  • 920756dbf2 Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop HorlogeSkynet 2016-12-01 19:29:41 +01:00
  • 952b5717a3 Avec les fichiers c'est mieux HorlogeSkynet 2016-12-01 19:29:34 +01:00
  • a0ac8d5e81 Foundation Added Corentin Mors 2016-12-01 19:23:53 +01:00
  • b1eb4820a5 Cake Bake + SQL Skeleton HorlogeSkynet 2016-12-01 19:24:00 +01:00
  • dcec7a24c6 Trying Up & Down Corentin Mors 2016-11-26 15:15:57 +01:00
  • 0ff16097e0 First commit Anthony Gourd 2016-11-22 16:21:22 +01:00