Commits · 0740749bd786fa12a8c82897c232c4970d457249 · Nabil Sadki / allo-app

11 Sep, 2019 2 commits

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

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
22 Aug, 2019 2 commits
- Merge branch 'v1.1.1.0' into v1.1.5.0 · 315214c7
  Nabil Sadki authored Aug 22, 2019
  
  315214c7 Browse Files
- Modifier mon compte · d4ef22a4
  Nabil Sadki authored Aug 22, 2019
  
  d4ef22a4 Browse Files
21 Aug, 2019 1 commit
- Hauts-faits · 29797368
  Nabil Sadki authored Aug 21, 2019
  
  29797368 Browse Files
20 Aug, 2019 1 commit
- Authentification · dcc16b9a
  Nabil Sadki authored Aug 20, 2019
  
  dcc16b9a Browse Files
19 Aug, 2019 1 commit
- Mon profil · 29001148
  Nabil Sadki authored Aug 19, 2019
  
  29001148 Browse Files
17 Aug, 2019 3 commits
- Changelog · 09fbe792
  Nabil Sadki authored Aug 17, 2019
  
  09fbe792 Browse Files
- Add login form · d1bd7f2d
  Nabil Sadki authored Aug 17, 2019
  
  d1bd7f2d Browse Files
- Show main slide · 590ff549
  Nabil Sadki authored Aug 17, 2019
  
  590ff549 Browse Files
15 Aug, 2019 5 commits

Update package.json id · 00c5c79c
Nabil Sadki authored Aug 15, 2019

00c5c79c Browse Files
Details offre · 40ef944f
Nabil Sadki authored Aug 15, 2019

40ef944f Browse Files
Details offre · a957c912
Nabil Sadki authored Aug 15, 2019

a957c912 Browse Files
Details offre · 2729467b
Nabil Sadki authored Aug 15, 2019

2729467b Browse Files

Merge branch 'v1.0.8.1' · cd027b99

# Conflicts:
#	.gitignore
#	config.xml
#	package.json
#	src/app/app-routing.module.ts
#	src/app/app.component.ts
#	src/app/pages/dashboard/dashboard.page.html
#	src/app/pages/dashboard/dashboard.page.ts
#	src/app/pages/mainslider/mainslider.page.html
#	src/app/pages/mainslider/mainslider.page.scss
#	src/app/pages/mainslider/mainslider.page.ts
#	src/app/pages/menu/menu.module.ts
#	src/app/pages/menu/menu.page.html
#	src/app/pages/menu/menu.page.ts
#	src/app/pages/params/params.page.html
#	src/app/pages/partenaires-list/partenaires-list.page.ts
#	src/app/pages/start/start.page.ts
#	src/app/services/location-service.ts
#	src/app/services/trip-service.ts

authored Aug 15, 2019

cd027b99 Browse Files

14 Aug, 2019 1 commit
- Some changes · 6a2c8e49
  Nabil Sadki authored Aug 14, 2019
  
  6a2c8e49 Browse Files
13 Aug, 2019 2 commits
- Some changes · 18196ae2
  Nabil Sadki authored Aug 13, 2019
  
  18196ae2 Browse Files
- Update ignores · 4579d295
  Nabil Sadki authored Aug 13, 2019
  
  4579d295 Browse Files
12 Aug, 2019 1 commit
- Add CHANGELOG.md and set some default params · 8ab1db53
  Nabil Sadki authored Aug 12, 2019
  
  8ab1db53 Browse Files
06 Aug, 2019 4 commits
- Pre-alpha · 02cedb83
  Nabil Sadki authored Aug 05, 2019
  
  02cedb83 Browse Files
- Initial commit · 3e1c2c5e
  Nabil Sadki authored Jun 23, 2019
  
  3e1c2c5e Browse Files
- License · 46c57e3c
  Nabil Sadki authored Aug 06, 2019
  
  46c57e3c Browse Files
- v1.0.8.0 · 0a04a02d
  Nabil Sadki authored Aug 06, 2019
  
  0a04a02d Browse Files
05 Aug, 2019 1 commit
- Pre-alpha · 4a541ab9
  Nabil Sadki authored Aug 05, 2019
  
  4a541ab9 Browse Files