KansassCityShuffle
|
8eae54cbef
|
Users > view + Topbar separator
|
2015-12-04 02:15:05 +01:00 |
|
KansassCityShuffle
|
9af882cc4e
|
Users > view.ctp
|
2015-12-04 00:32:26 +01:00 |
|
HorlogeSkynet
|
173a496f3e
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-04 00:30:18 +01:00 |
|
HorlogeSkynet
|
a28de0dc38
|
user pour Lisa
|
2015-12-04 00:30:02 +01:00 |
|
kcohenta
|
dc3780b2aa
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-04 00:26:39 +01:00 |
|
kcohenta
|
4469d48bf3
|
Modif edition texte
|
2015-12-04 00:26:35 +01:00 |
|
HorlogeSkynet
|
fc827a2e3f
|
Changement des menus + traductions
|
2015-12-04 00:20:47 +01:00 |
|
Anthony Gourd
|
bdffaccc7f
|
Error string top page + alert success and fail + quickfix homepage
|
2015-12-04 00:15:38 +01:00 |
|
Anthony Gourd
|
127f4e4e9e
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-04 00:03:44 +01:00 |
|
Anthony Gourd
|
27347b0373
|
Login/logout management
|
2015-12-04 00:03:29 +01:00 |
|
kcohenta
|
f58b633bea
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-04 00:03:02 +01:00 |
|
kcohenta
|
519cc4ee41
|
Ajout des editions de texte
|
2015-12-04 00:02:57 +01:00 |
|
HorlogeSkynet
|
86795c1bb7
|
Fin authentification + URL des menus des pages
|
2015-12-03 23:54:31 +01:00 |
|
Anthony Gourd
|
d40b6bf263
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 23:37:18 +01:00 |
|
Anthony Gourd
|
8c4d0aa579
|
Fix info-crisis link
|
2015-12-03 23:37:13 +01:00 |
|
HorlogeSkynet
|
e7473fd337
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 23:36:43 +01:00 |
|
Corentin Mors
|
540514d883
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 23:35:39 +01:00 |
|
Corentin Mors
|
05a1e3a5d3
|
Crisis Template + FoundationIconsAdd
|
2015-12-03 23:34:07 +01:00 |
|
HorlogeSkynet
|
a036ba5273
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 23:32:45 +01:00 |
|
KansassCityShuffle
|
7f227e4bd4
|
..
|
2015-12-03 23:31:51 +01:00 |
|
KansassCityShuffle
|
2aab9cb97f
|
git configz
|
2015-12-03 23:27:51 +01:00 |
|
HorlogeSkynet
|
0d9a6bb634
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 23:26:23 +01:00 |
|
HorlogeSkynet
|
d46e3dcfbc
|
merge
|
2015-12-03 23:26:19 +01:00 |
|
kcohenta
|
2564d8f912
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 23:15:02 +01:00 |
|
kcohenta
|
82ca18b6e2
|
Petites modifs Crisis
|
2015-12-03 23:14:57 +01:00 |
|
HorlogeSkynet
|
d22f1ebe48
|
isAthorized... the following
|
2015-12-03 23:12:46 +01:00 |
|
Anthony Gourd
|
3d8fbc717f
|
Fix login
|
2015-12-03 23:09:33 +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 |
|
Corentin Mors
|
67411264e5
|
Merge branch 'master' of github.com:agourd/dev-fsociety
|
2015-12-03 21:32:14 +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 |
|