Commits · d0b79eec6be56a04de922e47ebe98f19e1d2912f · La Quadrature du Net / piphone / piphone-front

21 Nov, 2016 1 commit
- Generate a token for piphone-sip api · d0b79eec
  nico authored Aug 08, 2016
```
Add a requirement on firebase/php-jwt for that purpose
```
  d0b79eec
08 Aug, 2016 8 commits
- Merge branch '5-continuous-integration' into 'master' · b9ade59b
  okhin authored Aug 08, 2016
```
Resolve "Continuous Integration"

Closes #5

See merge request !5
```
  b9ade59b
- Update .gitlab-ci.yml Using only a master · 296e8012
  okhin authored Aug 08, 2016
  
  296e8012
- Merge branch 'master' into '5-continuous-integration' · d0ca4b0d
  okhin authored Aug 08, 2016
```
Master



See merge request !4
```
  d0ca4b0d
- Adding some continuous integration · 39312778
  okhin authored Aug 08, 2016
  
  39312778
- Merge branch 'master' of git.laquadrature.net:piphone/piphone-front · 4cc1edc9
  okhin authored Aug 08, 2016
  
  4cc1edc9
- Let's play with a CI script · b793ad60
  okhin authored Aug 08, 2016
  
  b793ad60
- Merge branch 'master' into 'master' · 12fbeaa1
  okhin authored Aug 08, 2016
```
Manage fatfree with composer



See merge request !3
```
  12fbeaa1
- Manage fatfree with composer · 61add25b
  Nicolas Cornu authored Aug 08, 2016
  
  61add25b
07 Aug, 2016 6 commits
- The model should return phone, not tel · b89d6b9c
  okhin authored Aug 07, 2016
  
  b89d6b9c
- Merge branch '2-undefined-variable-ch' into 'master' · 4a6d2d8b
  okhin authored Aug 07, 2016
```
Update Api.php

Closes #2 fixing the variables name (curl instead of ch)

See merge request !2
```
  4a6d2d8b
- Update Api.php · b20072c4
  okhin authored Aug 07, 2016
  
  b20072c4
- Merge branch '1-the-api-php-isn-t-working' into 'master' · 5416d643
  okhin authored Aug 07, 2016
```
We want to follow the 302 and the likes, also enforcing json content-type.

Closes #1

See merge request !1
```
  5416d643
- We want to follow the 302 and the likes, also enforcing json content-type. · 98811ef7
  okhin authored Aug 07, 2016
  
  98811ef7
- Adding a debugging .htaccess · dac45805
  okhin authored Aug 07, 2016
  
  dac45805
10 Feb, 2016 1 commit
- Add license · 1207f219
  okhin authored Feb 10, 2016
  
  1207f219
04 Feb, 2015 1 commit
- Playing with contact list and random contact + 'sales pitch' is replaced with 'argumentation' · bdfcf56f
  Mindiell authored Feb 04, 2015
  
  bdfcf56f
09 Dec, 2014 3 commits
- First global design · ed84b17a
  Mindiell authored Dec 09, 2014
  
  ed84b17a
- Suppression du dossier 'design' · ad373b18
  Mindiell authored Dec 09, 2014
  
  ad373b18
- Mise en place d'un premier design sur la fiche contact · 2b7d6c22
  Mindiell authored Dec 09, 2014
  
  2b7d6c22
24 Nov, 2014 3 commits
- Default cache timeout · 2469a141
  Mindiell authored Nov 24, 2014
  
  2469a141
- Fake REST API modified · 5303c269
  Mindiell authored Nov 24, 2014
  
  5303c269
- Suppression de l'attaque directe des retours de fonction, non utilisable en php < 5.4 · 22833af1
  Mindiell authored Nov 24, 2014
  
  22833af1
23 Nov, 2014 12 commits
- Merge branch 'qcc4_sunday' into qcc4 · c6ab97d0
  Okhin authored Nov 23, 2014
```
Conflicts:
	templates/thankyou.html
```
  c6ab97d0
- Cleaning of fake REST API · 5a1135aa
  Mindiell authored Nov 23, 2014
  
  5a1135aa
- API modifications in order to contact Django REST API · c4a724f9
  Mindiell authored Nov 23, 2014
  
  c4a724f9
- Api uses cache, RestApi is based on json files · 253c4236
  Mindiell authored Nov 23, 2014
  
  253c4236
- Added page salespitch, restructuration of header · 8c40758d
  Mindiell authored Nov 23, 2014
  
  8c40758d
- Restructuration of routes · 6ababb63
  Mindiell authored Nov 23, 2014
  
  6ababb63
- Merge branch 'nepski_qcc4' into 'qcc4' · 747827ab
  okhin authored Nov 23, 2014
```
Nepski qcc4

Feedback form: view, controller, tests, POST and GET route.
Feedback SIP: empty controller function, POST route.

See merge request !4
```
  747827ab
- Best to use a link rather than a button, we're not in a form. · eed9d053
  okhin authored Nov 23, 2014
  
  eed9d053
- merge du dimanche de Ag3m · 41e41368
  Mindiell authored Nov 23, 2014
  
  41e41368
- merge du dimanche de Will · c014d841
  Mindiell authored Nov 23, 2014
  
  c014d841
- Merge branch 'nepski_qcc4' into qcc4_sunday · fe725319
  Mindiell authored Nov 23, 2014
  
  fe725319
- Cache test deletion · e3ac5a29
  Mindiell authored Nov 23, 2014
  
  e3ac5a29
22 Nov, 2014 5 commits
- ajout de la partie "Sale form" / texte en dur à remplacer via un appel au module campagne · f0b1bad7
  Will authored Nov 22, 2014
  
  f0b1bad7
- templates/thankyou.html: suppression du bouton back to home & remplacement par un lien fonctionnel · 83be3339
  Will authored Nov 22, 2014
  
  83be3339
- app/routes.ini: fake modif · df5e3958
  Will authored Nov 22, 2014
  
  df5e3958
- ajout des l'ensemble des fichiers *~ dans gitignore · bae4a0e5
  Will authored Nov 22, 2014
  
  bae4a0e5
- templates/contact.html: suppression des liens en dur & génération dynamique en... · a01e0678
  Will authored Nov 22, 2014
```
templates/contact.html: suppression des liens en dur & génération dynamique en fonction des valuers de la table
```
  a01e0678