Commits · d2bb039704b31aa1d555939f5ca28d0449efc7cc · Nabil Sadki / allo-app

24 Sep, 2019 5 commits
- 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 5 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
- Reorganise folders · 12c49ee4
  Nabil Sadki authored Sep 11, 2019
  
  12c49ee4 Browse Files
07 Sep, 2019 2 commits
- Optimise offers list loading · 0f9502d8
  Nabil Sadki authored Sep 07, 2019
  
  0f9502d8 Browse Files
- Fix presentation slider skip transition · 1c366bdd
  Nabil Sadki authored Sep 07, 2019
  
  1c366bdd 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
29 Aug, 2019 1 commit
- Launch time · e561b39e
  Nabil Sadki authored Aug 29, 2019
  
  e561b39e 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
- Modifier mon compte · d4ef22a4
  Nabil Sadki authored Aug 22, 2019
  
  d4ef22a4 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

# 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 2 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