Commit Graph

48 Commits

Author SHA1 Message Date
William Noris
adc9e4af55
Merge branch 'dev' into characters 2021-10-19 19:29:55 +02:00
William Noris
aa221ed170
Merge pull request #12 from rasoirnoir/films
ajout de laccordeon
2021-10-19 19:28:14 +02:00
William Noris
1c9f4c76dd
Merge pull request #11 from rasoirnoir/planets
Planets
2021-10-19 19:27:38 +02:00
Blandine Bajard
4bd53c7636 ajout de laccordeon 2021-10-19 17:47:47 +02:00
HarmandI
2aedbe985f fin journée 2021-10-19 17:35:33 +02:00
William Noris
3d963a43da fin de journée 2021-10-19 17:35:05 +02:00
HarmandI
ce00336862 Affichage avec url 2021-10-19 17:17:14 +02:00
William Noris
5ab2c33e27 Externalisation des boutons de pagination 2021-10-19 16:47:46 +02:00
William Noris
b32e65c82b Pagination fonctionnelle dans planets 2021-10-19 16:04:18 +02:00
William Noris
8d4456bae6
Merge pull request #10 from rasoirnoir/planets
Planets
2021-10-19 15:27:13 +02:00
William Noris
59e7f0efb2
Merge pull request #9 from rasoirnoir/films
Films
2021-10-19 15:26:42 +02:00
William Noris
769cfcd949
Merge pull request #8 from rasoirnoir/characters
Characters
2021-10-19 15:26:10 +02:00
Blandine Bajard
c01a40a823 changements js et html pour ajouts boutons 2021-10-19 15:23:13 +02:00
William Noris
8b0c617c99 Boutons pagination en cours 2021-10-19 15:23:08 +02:00
HarmandI
deacbaacc0 Affiche les personnage 2021-10-19 15:11:35 +02:00
HarmandI
4ff40f5e9a avancée Json 2021-10-19 13:09:31 +02:00
Blandine Bajard
8d7069003c changements CSS pour titre et menu/dans films affichage des titres des films/dans html ajout des class et section pour lien css et js 2021-10-19 13:04:58 +02:00
William Noris
3c9d972b48 Ajout de getPage dans util.js et récupération de la page cournate dans planets.js 2021-10-19 12:37:14 +02:00
William Noris
06d9575d85 récupération des infos et affichage moche 2021-10-19 12:18:53 +02:00
William Noris
be28fdfb21 Chargement des données de l'api 2021-10-19 11:52:12 +02:00
HarmandI
d413ef7ae8 Merge branch 'dev' into characters 2021-10-19 10:38:52 +02:00
Blandine Bajard
179550874e Merge branch 'dev' into films 2021-10-19 10:36:22 +02:00
HarmandI
484c098937 appel API 2021-10-19 10:36:21 +02:00
Blandine Bajard
cc3912c273 ajout de l'image de mando en arriere plan 2021-10-19 10:35:36 +02:00
William Noris
51246d94c2
Merge pull request #7 from rasoirnoir/planets
api_call update
2021-10-19 10:33:24 +02:00
William Noris
91dd72c524 api_call update 2021-10-19 10:31:51 +02:00
Blandine Bajard
49e32dd669 m 2021-10-19 10:02:29 +02:00
Blandine Bajard
009a73b866 lock machin 2021-10-19 09:50:17 +02:00
William Noris
b929d131b8
Merge pull request #6 from rasoirnoir/planets
planet start
2021-10-19 09:49:03 +02:00
William Noris
f5b9fb28de planet start 2021-10-19 09:47:51 +02:00
Blandine Bajard
379420364e maj imgs 2021-10-19 09:24:01 +02:00
Blandine Bajard
fa2503eb1b background css 2021-10-19 09:22:36 +02:00
rasoirnoir
8bb642383d
reorg de simages, ajout d'un catch dans api_call() 2021-10-18 21:27:45 +02:00
rasoirnoir
05a642a78b
maj .gitignore 2021-10-18 20:09:06 +02:00
rasoirnoir
a531309915
Merge branch 'films' into dev 2021-10-18 20:08:20 +02:00
rasoirnoir
951d701a8e
Merge branch 'dev' into films 2021-10-18 20:08:06 +02:00
William Noris
62df0c814b
Merge pull request #1 from rasoirnoir/planets
javascript import fix
2021-10-18 17:36:43 +02:00
Blandine Bajard
0cbb591879 changements blandine 2021-10-18 17:33:22 +02:00
William Noris
0cfd054680 javascript import fix 2021-10-18 17:32:20 +02:00
Blandine Bajard
5f3ebce7d0 essais background 2021-10-18 17:17:28 +02:00
Blandine Bajard
80d5ea125f ajout des img background 2021-10-18 16:58:56 +02:00
Blandine Bajard
3ee3ce4340
Create images 2021-10-18 16:54:22 +02:00
Blandine Bajard
77efcd7242
Add files via upload 2021-10-18 16:54:02 +02:00
Blandine Bajard
e0a5c6bbad
Delete images 2021-10-18 16:52:51 +02:00
Blandine Bajard
5b2c9b0aff
Create images 2021-10-18 16:52:13 +02:00
William Noris
6a9f0e0968 navigation, police, util.js 2021-10-18 15:58:21 +02:00
William Noris
966604bb1f Archi de base 2021-10-18 15:24:38 +02:00
William Noris
5252705940 first commit 2021-10-18 14:41:54 +02:00