Commits · a0ad77ff5559ca1de5bff3f06c52594a9e490cbf · Nabil Sadki / allo-app

26 Sep, 2019 1 commit
- config.xml · a0ad77ff
  Nabil Sadki authored Sep 26, 2019
  
  a0ad77ff Browse Files
25 Sep, 2019 2 commits

Merge branch 'v1.1.4.0' into v1.1.5.0 · e9b87aad

# Conflicts:
#	config.xml
#	package.json
#	src/app/app-routing.module.ts
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/app.scss
#	src/app/pages/menu/menu.page.html
#	src/app/pages/menu/menu.page.ts
#	src/app/pages/offres/offres-carte/offres-carte.page.ts

authored Sep 26, 2019

e9b87aad Browse Files

Wishlist · 3c3e8f68
Nabil Sadki authored Sep 26, 2019

3c3e8f68 Browse Files

24 Sep, 2019 6 commits
- Whishlist · 591dfee9
  Nabil Sadki authored Sep 24, 2019
  
  591dfee9 Browse Files
- Merge branch 'v1.1.3.0' into v1.1.4.0 · d2bb0397
  Nabil Sadki authored Sep 24, 2019
  
  d2bb0397 Browse Files
- Merge branch 'v1.1.2.0' into v1.1.4.0 · d046fe6d
  Nabil Sadki authored Sep 24, 2019
  
  d046fe6d Browse Files
- Merge branch 'v1.1.1.0' into v1.1.4.0 · f8938999
  Nabil Sadki authored Sep 24, 2019
  
  f8938999 Browse Files
- Merge branch 'v1.1.1.0' into v1.1.2.0 · 33c31a98
  Nabil Sadki authored Sep 24, 2019
  
  33c31a98 Browse Files
- FIX: routing · 28d05d0f
  Nabil Sadki authored Sep 24, 2019
  
  28d05d0f Browse Files
22 Sep, 2019 1 commit
- Création de compte · a4b8ef91
  Nabil Sadki authored Sep 22, 2019
  
  a4b8ef91 Browse Files
21 Sep, 2019 3 commits
- Merge branch 'v1.1.1.0' into v1.1.2.0 · ddc1123b
  Nabil Sadki authored Sep 21, 2019
  
  ddc1123b Browse Files
- Login help · d5c1aa47
  Nabil Sadki authored Sep 21, 2019
  
  d5c1aa47 Browse Files
- AuthGuards && login help · fad20579
  Nabil Sadki authored Sep 21, 2019
  
  fad20579 Browse Files
20 Sep, 2019 2 commits
- Anonymous mode · 9259f709
  Nabil Sadki authored Sep 20, 2019
  
  9259f709 Browse Files
- Optimise params && anonymous mode · 871ebe8c
  Nabil Sadki authored Sep 20, 2019
  
  871ebe8c Browse Files
17 Sep, 2019 1 commit
- Auth · ab4d459e
  Nabil Sadki authored Sep 17, 2019
  
  ab4d459e Browse Files
11 Sep, 2019 6 commits
- Merge branch 'v1.1.0.0' into v1.1.1.0 · 062026c5
```
# Conflicts:
#	src/app/pages/dashboard/dashboard.page.html
#	src/app/pages/dashboard/dashboard.page.scss
```
  Nabil Sadki authored Sep 12, 2019
  062026c5 Browse Files
- Merge branch 'v1.1.0.0' into v1.1.4.0 · 3c3620b9
  Nabil Sadki authored Sep 12, 2019
  
  3c3620b9 Browse Files
- Merge branch 'v1.1.0.0' into v1.1.3.0 · e1082b59
  Nabil Sadki authored Sep 12, 2019
  
  e1082b59 Browse Files
- Merge branch 'v1.1.0.0' into v1.1.2.0 · fccfd0f7
  Nabil Sadki authored Sep 12, 2019
  
  fccfd0f7 Browse Files
- Merge branch 'v1.1.0.0' into v1.1.5.0 · 0740749b
```
# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/pages/compte/profil/profil.page.html
#	src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.html
#	src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.ts
#	src/app/pages/menu/menu.module.ts
#	src/app/pages/offres/dashboard/dashboard.page.scss
```
  Nabil Sadki authored Sep 12, 2019
  0740749b Browse Files
- Reorganise folders · 12c49ee4
  Nabil Sadki authored Sep 11, 2019
  
  12c49ee4 Browse Files
10 Sep, 2019 1 commit
- Gains · 266cbf7b
  Nabil Sadki authored Sep 10, 2019
  
  266cbf7b Browse Files
07 Sep, 2019 6 commits
- Merge branch 'v1.1.0.0' into v1.1.5.0 · a0345846
  Nabil Sadki authored Sep 07, 2019
  
  a0345846 Browse Files
- Optimise offers list loading · 0f9502d8
  Nabil Sadki authored Sep 07, 2019
  
  0f9502d8 Browse Files
- Offres : filters · c52c3892
  Nabil Sadki authored Sep 07, 2019
  
  c52c3892 Browse Files
- Merge branch 'v1.1.0.0' into v1.1.5.0 · 47eb079c
  Nabil Sadki authored Sep 07, 2019
  
  47eb079c Browse Files
- Fix presentation slider skip transition · 1c366bdd
  Nabil Sadki authored Sep 07, 2019
  
  1c366bdd Browse Files
- QR scanner · 212d63d0
  Nabil Sadki authored Sep 07, 2019
  
  212d63d0 Browse Files
05 Sep, 2019 2 commits
- Merge branch 'v1.1.0.0' into v1.1.5.0 · de1f1d4f
```
# Conflicts:
#	src/app/pages/dashboard/dashboard.page.html
#	src/app/pages/dashboard/dashboard.page.scss
#	src/app/services/trip-service.ts
```
  Nabil Sadki authored Sep 05, 2019
  de1f1d4f Browse Files
- Mérites · f20f6d75
  Nabil Sadki authored Sep 05, 2019
  
  f20f6d75 Browse Files
03 Sep, 2019 1 commit
- Offres séparés · 77ffffc2
  Nabil Sadki authored Sep 03, 2019
  
  77ffffc2 Browse Files
01 Sep, 2019 1 commit
- Categories tags · 93fdbc94
  Nabil Sadki authored Sep 01, 2019
  
  93fdbc94 Browse Files
31 Aug, 2019 1 commit
- Quests · 7ddd4ffc
  Nabil Sadki authored Aug 31, 2019
  
  7ddd4ffc Browse Files
29 Aug, 2019 3 commits
- Merge branch 'v1.1.0.0' into v1.1.5.0 · 19a2af99
  Nabil Sadki authored Aug 29, 2019
  
  19a2af99 Browse Files
- Launch time · e561b39e
  Nabil Sadki authored Aug 29, 2019
  
  e561b39e Browse Files
- Classement · b306fa0f
  Nabil Sadki authored Aug 29, 2019
  
  b306fa0f Browse Files
28 Aug, 2019 1 commit
- Classement · 459c4440
  Nabil Sadki authored Aug 28, 2019
  
  459c4440 Browse Files
23 Aug, 2019 1 commit
- Editer mon profil · 39dd1cdd
  Nabil Sadki authored Aug 23, 2019
  
  39dd1cdd Browse Files
22 Aug, 2019 1 commit
- Merge branch 'v1.1.1.0' into v1.1.5.0 · 315214c7
  Nabil Sadki authored Aug 22, 2019
  
  315214c7 Browse Files