HorlogeSkynet
|
d22f1ebe48
|
isAthorized... the following
|
2015-12-03 23:12:46 +01:00 |
|
kcohenta
|
23c1478353
|
Merge fix
|
2015-12-03 22:58:05 +01:00 |
|
kcohenta
|
e6df760a2e
|
Traduction add.ctp
|
2015-12-03 22:57:21 +01:00 |
|
KansassCityShuffle
|
a491d2824c
|
try to fix font bug...
|
2015-12-03 22:45:28 +01:00 |
|
KansassCityShuffle
|
8881c999e3
|
Users > login
|
2015-12-03 22:19:15 +01:00 |
|
KansassCityShuffle
|
3d671b5402
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 22:08:34 +01:00 |
|
KansassCityShuffle
|
2b3c131964
|
start Users login
|
2015-12-03 22:08:25 +01:00 |
|
Anthony Gourd
|
3b925133c3
|
Home again + tricks css
|
2015-12-03 22:06:46 +01:00 |
|
Anthony Gourd
|
3cc2a49951
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 21:55:22 +01:00 |
|
Anthony Gourd
|
d25a984eec
|
Working on home controller
|
2015-12-03 21:55:18 +01:00 |
|
kcohenta
|
8b43de4ac6
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 21:44:31 +01:00 |
|
kcohenta
|
22f6eb6c33
|
Merge fix
|
2015-12-03 21:44:19 +01:00 |
|
Korlan Colas
|
14b7f7acfa
|
fix merge
|
2015-12-03 21:43:12 +01:00 |
|
kcohenta
|
a12119138c
|
Traduction des fichiers edit
|
2015-12-03 21:41:18 +01:00 |
|
Korlan Colas
|
f47f5a33d0
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 21:40:21 +01:00 |
|
Korlan Colas
|
de90cb481c
|
fix merge
|
2015-12-03 21:39:48 +01:00 |
|
KansassCityShuffle
|
dd11f1bd42
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 21:39:31 +01:00 |
|
KansassCityShuffle
|
3806397f1a
|
Merge branch 'master' of github.com:agourd/dev-fsociety
Conflicts:
src/Template/Layout/default.ctp
|
2015-12-03 21:38:31 +01:00 |
|
Korlan Colas
|
de2cfff42e
|
Regle permissive
|
2015-12-03 21:37:48 +01:00 |
|
Anthony Gourd
|
f2d74f8851
|
Fixed homes acces
|
2015-12-03 21:37:16 +01:00 |
|
KansassCityShuffle
|
5a85c27b0e
|
idem
|
2015-12-03 21:35:12 +01:00 |
|
Anthony Gourd
|
628a040806
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 21:30:41 +01:00 |
|
Anthony Gourd
|
9e4b652e17
|
route + flash + begin HomesController
|
2015-12-03 21:30:36 +01:00 |
|
Korlan Colas
|
ab88befd40
|
merge
|
2015-12-03 21:26:50 +01:00 |
|
Korlan Colas
|
72d4ca8ff6
|
ca al'air de marcher
|
2015-12-03 21:25:58 +01:00 |
|
KansassCityShuffle
|
7448e6d77e
|
top bar OK + footer
|
2015-12-03 21:21:42 +01:00 |
|
Korlan Colas
|
01e0ca7b65
|
UserControllerMerge
|
2015-12-03 21:06:05 +01:00 |
|
HorlogeSkynet
|
f5b36c30a4
|
Fix 'login'
|
2015-12-03 21:05:28 +01:00 |
|
HorlogeSkynet
|
278e6ece14
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 20:56:05 +01:00 |
|
HorlogeSkynet
|
c39b6373da
|
Test authentification
|
2015-12-03 20:55:59 +01:00 |
|
dibi
|
ef2c3ef650
|
changement home->homes
|
2015-12-03 20:50:26 +01:00 |
|
Anthony Gourd
|
5b1e33d55b
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 20:44:04 +01:00 |
|
Corentin Mors
|
4c604dcacd
|
Ajout template crisis.css 2
|
2015-12-03 20:43:35 +01:00 |
|
Corentin Mors
|
b0ab8a2f10
|
Ajout template crisis.css
|
2015-12-03 20:42:54 +01:00 |
|
Anthony Gourd
|
30946a88dc
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 20:42:05 +01:00 |
|
Anthony Gourd
|
c626a2b6ac
|
Added home controller
|
2015-12-03 20:42:01 +01:00 |
|
KansassCityShuffle
|
387e79151f
|
starting top bar
|
2015-12-03 20:41:38 +01:00 |
|
HorlogeSkynet
|
fe7f00e653
|
Add AuthComponent + Hash Password + Truncate Password
|
2015-12-03 20:09:22 +01:00 |
|
Korlan Colas
|
c85ff22006
|
Raccourci de debug + fix Crises -> Crisis
|
2015-12-03 20:03:47 +01:00 |
|
dibi
|
24d634bb78
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 19:47:16 +01:00 |
|
dibi
|
f4b4655819
|
Désolé, j'ai oublié d'ajouter les js de foundation 5, maintenant c'est fait.
|
2015-12-03 19:47:08 +01:00 |
|
Anthony Gourd
|
67e24f5864
|
This is a Cake/Bake commit
|
2015-12-03 19:34:21 +01:00 |
|
dibi
|
db25059ef2
|
Integration de foundation 5.5.3
|
2015-12-03 19:28:21 +01:00 |
|
Korlan Colas
|
68b3049686
|
Ajout section équipe >> ajout description + ajout membre korlan
|
2015-12-03 10:30:52 +01:00 |
|
Corentin Mors
|
d631a4dc21
|
Correction Bienvenue
|
2015-12-02 21:37:01 +01:00 |
|
Anthony Gourd
|
40a79d3ae9
|
Edited readme
|
2015-12-01 19:19:22 +01:00 |
|
Anthony Gourd
|
94746e29c0
|
Added Foundation + modeling default.ctp layout
|
2015-12-01 17:52:12 +01:00 |
|
Anthony Gourd
|
4151c4c0ee
|
Initial commit
|
2015-11-30 19:18:23 +01:00 |
|