Commits · 5474d8ff62288b1792fbf4f92201ea0a2d841f10 · yotta / pictogram · GitLab

19 Jun, 2017 1 commit
- issue #268 fixed · 5474d8ff
  Sebastián Collado Montañez committed Jun 19, 2017
  
  5474d8ff Browse Files
08 Jun, 2017 1 commit
- issue #264 fixed · 26b7eb4d
  Fernando Martínez Santiago committed Jun 08, 2017
  
  26b7eb4d
05 Jun, 2017 8 commits
- Merge remote-tracking branch 'origin/master' into develop · 8eca6916
  Arturo Montejo Ráez committed Jun 06, 2017
  
  8eca6916 Browse Files
- Merge branch 'master' into develop · 16e8b513
  Arturo Montejo Ráez committed Jun 06, 2017
  
  16e8b513 Browse Files
- Merge branch 'master' of http://gitlab.ujaen.es/yotta/pictogram · da28133a
  Arturo Montejo Ráez committed Jun 05, 2017
  
  da28133a Browse Files
- issue #262 fixed · d6e38e53
  Arturo Montejo Ráez committed Jun 05, 2017
  
  d6e38e53 Browse Files
- issue #260 fixed · 1db262f3
  Arturo Montejo Ráez committed Jun 05, 2017
  
  1db262f3 Browse Files
- fixed issue #259 · 52759a3c
  Arturo Montejo Ráez committed Jun 05, 2017
  
  52759a3c Browse Files
- fixed issue #258 · 915cf83f
  Arturo Montejo Ráez committed Jun 05, 2017
  
  915cf83f Browse Files
- fixed issued #261 · 8b8869a6
  Arturo Montejo Ráez committed Jun 05, 2017
  
  8b8869a6 Browse Files
01 Jun, 2017 6 commits
- version 1.2 del PCB · a04afb81
  Fernando Martínez Santiago committed Jun 01, 2017
  
  a04afb81 Browse Files
- changes actualizado · 02e8a89d
  Arturo Montejo Ráez committed Jun 01, 2017
  
  02e8a89d Browse Files
- Merge branch 'master' of http://gitlab.ujaen.es/yotta/pictogram · 74a678dd
  Arturo Montejo Ráez committed Jun 01, 2017
  
  74a678dd Browse Files
- changes actualizado · ade9033d
  Arturo Montejo Ráez committed Jun 01, 2017
  
  ade9033d
- merge conflict solved · fafde781
  Arturo Montejo Ráez committed Jun 01, 2017
  
  fafde781 Browse Files
- Merge branch 'develop' · f54e02e8
  Arturo Montejo Ráez committed Jun 01, 2017
  
  f54e02e8 Browse Files
31 May, 2017 4 commits
- Arreglado issue #232 en la parte del PCB · 9836ef65
  german committed May 31, 2017
  
  9836ef65
- Issue #232 injecting id_scene and WS · bd3b65b6
  Jose Antonio committed May 31, 2017
  
  bd3b65b6
- Merge remote-tracking branch 'origin/develop' into develop · 17f37b1e
  Jose Antonio committed May 31, 2017
  
  17f37b1e Browse Files
- Issue #232 , added id_scene web socket · 14fddbba
  Jose Antonio committed May 31, 2017
  
  14fddbba Browse Files
30 May, 2017 4 commits
- issue #252 fixed. Working on #256 · 47f65b93
  Fernando Martínez Santiago committed May 30, 2017
  
  47f65b93
- Merge remote-tracking branch 'origin/develop' into develop · f8e584fd
  Jose Antonio committed May 30, 2017
  
  f8e584fd Browse Files
- Issue #253 Closed · 56c7fa85
  Jose Antonio committed May 30, 2017
  
  56c7fa85
- Mensajes privados terminado con un AlertDialog · 1b53fd4c
  german committed May 30, 2017
  
  1b53fd4c
29 May, 2017 8 commits
- Merge remote-tracking branch 'origin/develop' into develop · 296ba636
  Jose Antonio committed May 29, 2017
  
  296ba636 Browse Files
- scene_adapt.sql hotfix · 71d320ec
  Sebastián Collado Montañez committed May 29, 2017
  
  71d320ec
- Merge branch 'segfault-handler' into develop · a2cc490d
  Jose Antonio committed May 29, 2017
  
  a2cc490d Browse Files
- installed segfault-handler · e3a66c6c
  Jose Antonio committed May 29, 2017
  
  e3a66c6c
- merge conflicts fixed · fbfc102f
  Arturo Montejo Ráez committed May 29, 2017
  
  fbfc102f Browse Files
- migration issues fixed · 86ef40cf
  Arturo Montejo Ráez committed May 29, 2017
  
  86ef40cf Browse Files
- scene-adapt.sql ES string · c4b1aca4
  Sebastián Collado Montañez committed May 29, 2017
  
  c4b1aca4 Browse Files
- scene_adapt.sql fixed · b52811c9
  Sebastián Collado Montañez committed May 29, 2017
  
  b52811c9 Browse Files
27 May, 2017 2 commits
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · a1ce8ff1
  Arturo Montejo Ráez committed May 28, 2017
  
  a1ce8ff1 Browse Files
- issues #213 #238 and #240 fixed · a531b792
  Arturo Montejo Ráez committed May 28, 2017
  
  a531b792 Browse Files
25 May, 2017 6 commits
- issue #251 closed · d07c1f4a
  Fernando Martínez Santiago committed May 25, 2017
  
  d07c1f4a Browse Directory
- Merge remote-tracking branch 'origin/develop' into develop · 05bb6abf
  Jose Antonio committed May 25, 2017
  
  05bb6abf Browse Files
- Issue #243 , endsession from angular · 140dd793
  Jose Antonio committed May 25, 2017
  
  140dd793 Browse Files
- Issue #250, closed · 550f8c66
```
Reload triggers-session-constraints.sql on DEV
```
  Jose Antonio committed May 25, 2017
  550f8c66
- Arreglado bug por el cual no aparecian todos los supervisores asociados a un… · 8c4294f9
```
Arreglado bug por el cual no aparecian todos los supervisores asociados a un niño en el tablet (Solucion añadir el id de stu tambien a la busqueda para ver si esta en local)
```
  german committed May 25, 2017
  8c4294f9
- Arreglado bug por el cual no aparecian todos los supervisores asociados a un… · 4b8c29d7
```
Arreglado bug por el cual no aparecian todos los supervisores asociados a un niño en el tablet (Solucion añadir el id de stu tambien a la busqueda para ver si esta en local)
```
  german committed May 25, 2017
  4b8c29d7 Browse Directory