Commits · 22ac201a857a62f8dcacf1f3be67e5bc1c8b63c4 · yotta / pictogram · GitLab

03 Jan, 2017 2 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 22ac201a
  Arturo Montejo Ráez committed Jan 03, 2017
  
  22ac201a Browse Files
- fixed error in subscribeToRoom · a39ee17c
  Arturo Montejo Ráez committed Jan 03, 2017
  
  a39ee17c Browse Files
02 Jan, 2017 4 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · a37ae423
  Fernando Martínez Santiago committed Jan 02, 2017
  
  a37ae423 Browse Files
- issues #740 y #741 cerrados · 8d699788
  Fernando Martínez Santiago committed Jan 02, 2017
  
  8d699788 Browse Files
- issues #740 y #741 cerrados · 3f139abf
  Fernando Martínez Santiago committed Jan 02, 2017
  
  3f139abf
- issues #740 y #741 cerrados · 70383978
  Fernando Martínez Santiago committed Jan 02, 2017
  
  70383978
31 Dec, 2016 3 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · cb101f29
  Arturo Montejo Ráez committed Dec 31, 2016
  
  cb101f29 Browse Files
- policy for stu/pictos fixed · 84923495
  Arturo Montejo Ráez committed Dec 31, 2016
  
  84923495
- primera versión de soporte de sesiones desde el pcb completamente funcional · d034abc7
```
soporte a licencias
soporte nuevos feedback
```
  Fernando Martínez Santiago committed Dec 31, 2016
  d034abc7
30 Dec, 2016 5 commits
- issue #715 closed · 98fe2429
  Arturo Montejo Ráez committed Dec 30, 2016
  
  98fe2429
- issue #727 fixed · bd0e5f66
  Arturo Montejo Ráez committed Dec 30, 2016
  
  bd0e5f66
- Deleting supervisors in admin view working · 3132444e
  Arturo Montejo Ráez committed Dec 30, 2016
  
  3132444e
- issue #728 closed · 6baafbf1
  Arturo Montejo Ráez committed Dec 30, 2016
  
  6baafbf1 Browse Files
- issue #724 closed · 0a4a021e
  Arturo Montejo Ráez committed Dec 30, 2016
  
  0a4a021e Browse Files
28 Dec, 2016 5 commits
- issue #724 fixed · df6f0dd0
  Arturo Montejo Ráez committed Dec 28, 2016
  
  df6f0dd0 Browse Files
- issue #723 fixed · 0bf177f4
  Arturo Montejo Ráez committed Dec 28, 2016
  
  0bf177f4 Browse Files
- image change in supervisor profile fixed · 8a83f625
  Arturo Montejo Ráez committed Dec 28, 2016
  
  8a83f625
- image change in profiles fixed · d0d80d0f
  Arturo Montejo Ráez committed Dec 28, 2016
  
  d0d80d0f Browse Files
- issue #725 fixed · 0bcffb20
  Arturo Montejo Ráez committed Dec 28, 2016
  
  0bcffb20 Browse Files
27 Dec, 2016 1 commit
- Repetitive generation of licenses · beb487da
  Arturo Montejo Ráez committed Dec 28, 2016
  
  beb487da
26 Dec, 2016 1 commit
- Login page footer #720 · 30ddc4c8
  Sebastián Collado Montañez committed Dec 26, 2016
  
  30ddc4c8
24 Dec, 2016 1 commit
- Codificacion Vagrant utf8 issue #716 · 24f7abfd
  Sebastián Collado Montañez committed Dec 24, 2016
  
  24f7abfd
23 Dec, 2016 6 commits
- fixing layout problems in student setup · 9d2550ea
  Arturo Montejo Ráez committed Dec 23, 2016
  
  9d2550ea Browse Files
- issues #712, #709, #706, #698, #692 #690 closed · 0491f518
  Fernando Martínez Santiago committed Dec 23, 2016
  
  0491f518
- Merge branches 'develop' and 'fernando_branch' of… · a0ab207a
```
Merge branches 'develop' and 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop
```
  Fernando Martínez Santiago committed Dec 23, 2016
  a0ab207a Browse Files
- working on PCB issues · 3ef05550
  Fernando Martínez Santiago committed Dec 23, 2016
  
  3ef05550 Browse Files
- Merge branch 'issue611' into develop · 8a840026
  Arturo Montejo Ráez committed Dec 23, 2016
  
  8a840026 Browse Files
- problem with default image for newly created student solved. issue #611 completed · 7b224042
  Arturo Montejo Ráez committed Dec 23, 2016
  
  7b224042
22 Dec, 2016 5 commits
- license on create student added · 4d1303b9
  Arturo Montejo Ráez committed Dec 22, 2016
  
  4d1303b9
- working on PCB issues · 9371a190
  Fernando Martínez Santiago committed Dec 22, 2016
  
  9371a190 Browse Files
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop · 73e441be
  Fernando Martínez Santiago committed Dec 22, 2016
  
  73e441be Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 7c78dce0
```
# Conflicts:
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
```
  Fernando Martínez Santiago committed Dec 22, 2016
  7c78dce0 Browse Files
- working on PCB issues · 912c4f69
  Fernando Martínez Santiago committed Dec 22, 2016
  
  912c4f69 Browse Files
21 Dec, 2016 1 commit
- working on PCB issues · bc57f0d4
  Fernando Martínez Santiago committed Dec 21, 2016
  
  bc57f0d4 Browse Files
20 Dec, 2016 6 commits
- working on PCB issues2 · 212b8d32
  Fernando Martínez Santiago committed Dec 21, 2016
  
  212b8d32 Browse Files
- working on PCB sessions 2 · 89bd9d4b
  Fernando Martínez Santiago committed Dec 20, 2016
  
  89bd9d4b Browse Files
- Añadida nueva clase como adapter para las listas de alumnos y supervisores del login. · b7139260
```
Añadido layout para los items de esas listas.
Funciones para crear las listas. (No funciona del todo bien)
```
  german committed Dec 20, 2016
  b7139260 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 88715fd8
  Fernando Martínez Santiago committed Dec 20, 2016
  
  88715fd8 Browse Files
- working on PCB sessions (3) · 6f6bf257
  Fernando Martínez Santiago committed Dec 20, 2016
  
  6f6bf257
- conflicts solved · 77d0cacf
  Arturo Montejo Ráez committed Dec 20, 2016
  
  77d0cacf Browse Files