Commits · master · Camille MASSET / chocapix-client

13 Nov, 2018 5 commits
- Merge branch 'develop' into 'master' · bcdfc659
  Grégoire GRZECZKOWICZ authored Nov 13, 2018
```
Develop

See merge request !14
```
  bcdfc659
- Merge branch 'develop' into 'master' · 8e5bf259
  Grégoire GRZECZKOWICZ authored Nov 13, 2018
```
Résolution problèmes de classement des utilisateurs et des aliments

See merge request !13
```
  8e5bf259
- Résolution problèmes de classement des utilisateurs et des aliments · eba45ed2
  Grégoire GRZECZKOWICZ authored Nov 13, 2018
  
  eba45ed2
- Erreur de tabulation · 2662cbf9
  Grégoire GRZECZKOWICZ authored Nov 13, 2018
  
  2662cbf9
- Déplacer résolve dans state · e960db0a
  Grégoire GRZECZKOWICZ authored Nov 13, 2018
  
  e960db0a
11 Nov, 2018 6 commits
- RASification package-lock.json · 62b0d307
  Grégoire GRZECZKOWICZ authored Nov 11, 2018
  
  62b0d307
- Merge branch 'prod' into 'master' · 226e6bff
  Hadrien RENAUD authored Nov 11, 2018
```
Sync

See merge request br/chocapix-client!11
```
  226e6bff
- Merge branch 'master' into 'develop' · 0b64f57b
  Hadrien RENAUD authored Nov 11, 2018
```
MAJ depuis prod

See merge request !9
```
  0b64f57b
- Merge branch 'master' into 'prod' · 5476c7bd
  Hadrien RENAUD authored Nov 11, 2018
```
Push master into prod

See merge request !10
```
  5476c7bd
- Merging. · 9105e096
  Hadrien RENAUD authored Nov 11, 2018
  
  9105e096
- Merge branch 'master' into 'develop' · 041a62b4
  Hadrien RENAUD authored Nov 11, 2018
```
Synchronize master and develop

See merge request !7
```
  041a62b4
10 Nov, 2018 4 commits
- Merge branch 'develop' into 'master' · 8db74d3b
  Hadrien RENAUD authored Nov 11, 2018
```
Upgrade pip in CircleCI config

See merge request !5
```
  8db74d3b
- Merge branch 'master' into 'develop' · f415a3ca
  Hadrien RENAUD authored Nov 11, 2018
```
# Conflicts:
#   test/configure-vm.sh
```
  f415a3ca
- Update admin.js · dc62a349
  Grégoire GRZECZKOWICZ authored Nov 10, 2018
  
  dc62a349
- Update build.js · cabf8e79
  Grégoire GRZECZKOWICZ authored Nov 10, 2018
  
  cabf8e79
29 Aug, 2018 2 commits
- Merge branch 'master' into 'master' · 271645bf
  Will JALLET authored Aug 29, 2018
```
Master

See merge request !4
```
  271645bf
- Master · a30e2745
  Grégoire GRZECZKOWICZ authored Aug 29, 2018
  
  a30e2745
19 May, 2018 7 commits
- Pas besoin de debug · edc64a99
  konfiot authored May 19, 2018
  
  edc64a99
- Un avoeu d'echec · 52561607
  konfiot authored May 19, 2018
  
  52561607
- Encore mieux · a89c48a7
  konfiot authored May 19, 2018
  
  a89c48a7
- La ça marche et en plus c'est minifié · 441a0c6e
  konfiot authored May 19, 2018
  
  441a0c6e
- Merge branch 'master' of gitlab.binets.fr:br/chocapix-client · bc008d02
  konfiot authored May 19, 2018
  
  bc008d02
- LA CI MARCHE · 8f1f1573
  konfiot authored May 19, 2018
  
  8f1f1573
- Update Makefile · cd268c37
  Arthur TOUSSAINT authored May 19, 2018
  
  cd268c37
18 May, 2018 2 commits
- Update build.js · 4861de57
  Arthur TOUSSAINT authored May 18, 2018
  
  4861de57
- Update build.js · 9bbd6060
  Arthur TOUSSAINT authored May 18, 2018
  
  9bbd6060
17 May, 2018 1 commit
- Update .gitlab-ci.yml · 0260c9a4
  Arthur TOUSSAINT authored May 17, 2018
  
  0260c9a4
15 May, 2018 1 commit
- Merge branch 'appro-ooshop' into 'master' · e637546f
  Will JALLET authored May 15, 2018
```
Auto appro ooshop

See merge request !2
```
  e637546f
11 May, 2018 10 commits
- Update build.js · 3e7a3a40
  Arthur TOUSSAINT authored May 11, 2018
  
  3e7a3a40
- Update Makefile · 1b5270b2
  Arthur TOUSSAINT authored May 11, 2018
  
  1b5270b2
- Update .gitlab-ci.yml · 827ccfa1
  Arthur TOUSSAINT authored May 11, 2018
  
  827ccfa1
- Update .gitlab-ci.yml · 037a01e1
  Arthur TOUSSAINT authored May 11, 2018
  
  037a01e1
- Update .gitlab-ci.yml · 9b092c95
  Arthur TOUSSAINT authored May 11, 2018
  
  9b092c95
- Update .gitlab-ci.yml · bfdffc0f
  Arthur TOUSSAINT authored May 11, 2018
  
  bfdffc0f
- Update .gitlab-ci.yml · 4d744131
  Arthur TOUSSAINT authored May 11, 2018
  
  4d744131
- Update .gitlab-ci.yml · 186f7e5d
  Arthur TOUSSAINT authored May 11, 2018
  
  186f7e5d
- Update .gitlab-ci.yml · 30ab0703
  Arthur TOUSSAINT authored May 11, 2018
  
  30ab0703
- Update package.json · 1024b75c
  Arthur TOUSSAINT authored May 11, 2018
  
  1024b75c
08 May, 2018 2 commits
- Autoappro Ooshop: Changé PDFJS en pdfjsLib · 5f89e0ed
  NilpotentHX3 authored May 07, 2018
  
  5f89e0ed
- Try to remove strange characters · 42042228
  NilpotentHX3 authored Sep 24, 2017
  
  42042228