Commits · 11111734e8286502d02279d29618ac5e31127f7f · ARI / AEON API · GitLab

11 Oct, 2017 3 commits
- Merge branch 'development' of gitlab.atosresearch.eu:ari/aeon-api into development · 11111734
  José Gato Luis authored Oct 11, 2017
  
  11111734
- updated doc · f2996fac
  José Gato Luis authored Oct 11, 2017
  
  f2996fac
- moved doc to wiki for better linking · b33f574d
  José Gato Luis authored Oct 11, 2017
  
  b33f574d
10 Oct, 2017 11 commits
- Merge branch '43-Optional-Keycloak-configuration-in-app.js' into development · 5f400a97
  Alejandro Garcia Marchena authored Oct 10, 2017
```
Default value of keycloak enabled set to true
```
  5f400a97
- keycloak enabled default value set to true · 13ce1ed2
  Alejandro Garcia Marchena authored Oct 10, 2017
  
  13ce1ed2
- Merge branch 'development' of gitlab.atosresearch.eu:ari/aeon-api into development · eab06fef
  José Gato Luis authored Oct 10, 2017
  
  eab06fef
- allowd multiple origins · f1f02c58
  José Gato Luis authored Oct 10, 2017
  
  f1f02c58
- Merge branch '43-Optional-Keycloak-configuration-in-app.js' into development · d0d17450
  Alejandro Garcia Marchena authored Oct 10, 2017
```
documentation of keycloak configuration in readme.md
```
  d0d17450
- documentation of how to configure keycloak in readme.md · 15e70fc0
  Alejandro Garcia Marchena authored Oct 10, 2017
  
  15e70fc0
- Merge branch 'development' of https://gitlab.atosresearch.eu/ari/aeon-api into development · ae98b401
  Alejandro Garcia Marchena authored Oct 10, 2017
```
g Pleasg enteg g commig messagg tg explain why this merge is necessary,
:
```
  ae98b401
- optional inclusion of keycloak login endpoint · 7f58cccd
  Alejandro Garcia Marchena authored Oct 10, 2017
  
  7f58cccd
- configuration to disable keycloak conf in app.js and hide route in routes/user.js · afc200d1
  Alejandro Garcia Marchena authored Oct 10, 2017
  
  afc200d1
- updated compose · 64da31ce
  José Gato Luis authored Oct 10, 2017
  
  64da31ce
- better not push images from local · 2a96b9e8
  José Gato Luis authored Oct 10, 2017
  
  2a96b9e8
09 Oct, 2017 1 commit
- keycloak configuration integrated with v0.3.0 config files · bab32d48
  Alejandro Garcia Marchena authored Oct 09, 2017
  
  bab32d48
04 Oct, 2017 4 commits
- Screen logs removed · 3228cb7b
  Alejandro Garcia Marchena authored Oct 04, 2017
  
  3228cb7b
- fixed url to send by email · c5ee977d
  José Gato Luis authored Oct 04, 2017
  
  c5ee977d
- ejs module included · 35d57889
  José Gato Luis authored Oct 04, 2017
```
it seems need it by email-templates
```
  35d57889
- new deployment files containing smtp · 46d15bd5
  José Gato Luis authored Oct 04, 2017
  
  46d15bd5
03 Oct, 2017 21 commits
- fixed a regresion caused in some merge · 3639abbf
  José Gato Luis authored Oct 03, 2017
  
  3639abbf
- Merge branch 'development' of gitlab.atosresearch.eu:ari/aeon-api into development · 5f12144c
  José Gato Luis authored Oct 03, 2017
  
  5f12144c
- Merge branch '21-error-forgotten-password-funcionality' into development · 822fb627
  José Gato Luis authored Oct 03, 2017
  
  822fb627
- updated smtp related config · d78aab1a
  José Gato Luis authored Oct 03, 2017
  
  d78aab1a
- cleaning logs · 970d55c2
  José Gato Luis authored Oct 03, 2017
  
  970d55c2
- keycloak parameter for routes/user.js · 9a887cac
  Alejandro Garcia Marchena authored Oct 03, 2017
  
  9a887cac
- Merge with 35-update-idm-with-401-when-expired-token · 700488c9
  Alejandro Garcia Marchena authored Oct 03, 2017
  
  700488c9
- updated doc about SMTP server · 116bf3da
  José Gato Luis authored Oct 03, 2017
  
  116bf3da
- configurable smtp server url · 57fb4c4b
  José Gato Luis authored Oct 03, 2017
  
  57fb4c4b
- problems with relative links · a5c230bd
  José Gato Luis authored Oct 03, 2017
  
  a5c230bd
- problems with relative links · 751aaff7
  José Gato Luis authored Oct 03, 2017
  
  751aaff7
- fixing doc · 62312e1f
  José Gato Luis authored Oct 03, 2017
  
  62312e1f
- fixing doc · 6e6ed102
  José Gato Luis authored Oct 03, 2017
  
  6e6ed102
- fixing doc · ce68cf16
  José Gato Luis authored Oct 03, 2017
  
  ce68cf16
- modified wrong code ofr user.js · 7db482ca
  Alejandro Garcia Marchena authored Oct 03, 2017
  
  7db482ca
- Merge branch '21-error-forgotten-password-funcionality' into development · ee0b70bc
  José Gato Luis authored Oct 03, 2017
  
  ee0b70bc
- not forcing SMTP connection to start · b7acc288
  José Gato Luis authored Oct 03, 2017
```
well, maybe it is not a perfect solution but it is better for development
```
  b7acc288
- reset and remember password updated · 8b87130f
  José Gato Luis authored Oct 03, 2017
  
  8b87130f
- open public directory to use resources from email · 8a55f9c4
  José Gato Luis authored Oct 03, 2017
```
basically logos
```
  8a55f9c4
- updated · 614a0c21
  José Gato Luis authored Oct 03, 2017
  
  614a0c21
- updated sending emails function · 48b8a8e1
  José Gato Luis authored Oct 03, 2017
```
by the moment for remember password
```
  48b8a8e1