Commits · 9f88bfa734d1c2cf98c97a8c6fc8554b8a8fc1ff · yotta / pictogram · GitLab

25 Jan, 2017 1 commit
- issue #836, #838 y #839 closed · 9f88bfa7
```
 working on pictogramactivity refactorization
```
  Fernando Martínez Santiago committed Jan 25, 2017
  9f88bfa7 Browse Directory
24 Jan, 2017 1 commit
- fixed icon in dropdown list of sessions (see #818) · 114daf19
  Arturo Montejo Ráez committed Jan 24, 2017
  
  114daf19 Browse Directory
23 Jan, 2017 9 commits
- working on PictogramActivity refactorization · 6ab36ce0
```
(class PictoMenu created regarding radial menu)
```
  Fernando Martínez Santiago committed Jan 23, 2017
  6ab36ce0 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · ac2bd08a
  Fernando Martínez Santiago committed Jan 23, 2017
  
  ac2bd08a Browse Files
- refactorizando paquete gui (hay que revisar pictogramActivity) · 17a905a7
```
implementada funcionalidad "entrega de tira" II
```
  Fernando Martínez Santiago committed Jan 23, 2017
  17a905a7
- deploy script added · db3c38c6
  Arturo Montejo Ráez committed Jan 23, 2017
  
  db3c38c6
- Merge branch 'develop' · 3921bee5
  Arturo Montejo Ráez committed Jan 23, 2017
  
  3921bee5
- preparing PRE update · 2a4d25b3
  Arturo Montejo Ráez committed Jan 23, 2017
  
  2a4d25b3
- added sort values to Student.tries · f24d4ceb
  Arturo Montejo Ráez committed Jan 23, 2017
  
  f24d4ceb Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 1e1e63f3
  Arturo Montejo Ráez committed Jan 23, 2017
  
  1e1e63f3 Browse Files
- working on sessions UI · 6c8dadf0
  Arturo Montejo Ráez committed Jan 23, 2017
  
  6c8dadf0 Browse Directory
21 Jan, 2017 1 commit
- refactorizando paquete gui (hay que revisar pictogramActivity) · 395dd167
```
implementada funcionalidad "entrega de tira"
```
  Fernando Martínez Santiago committed Jan 21, 2017
  395dd167
20 Jan, 2017 1 commit
- issues #740 y #741 cerrados · 7814333b
  Fernando Martínez Santiago committed Jan 20, 2017
  
  7814333b
19 Jan, 2017 4 commits
- issue #816 closed · 6a9cfc82
  Fernando Martínez Santiago committed Jan 19, 2017
  
  6a9cfc82
- Submenu para editar pictos añadido, funcionando el cambiar la etiqueta(leyenda) · 42b3ba10
  German Callejas committed Jan 19, 2017
  
  42b3ba10 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 94e87157
  Arturo Montejo Ráez committed Jan 19, 2017
  
  94e87157 Browse Files
- issue #815 closed: responses for update and add in picto homogenized · 78aa7f7e
  Arturo Montejo Ráez committed Jan 19, 2017
  
  78aa7f7e
18 Jan, 2017 2 commits
- issues #811, #814 closed · 6c649e07
  Fernando Martínez Santiago committed Jan 18, 2017
  
  6c649e07 Browse File
- Añadido submenu de opciones para editar la leyenda o la imagen (Falta funcionalidad) · 51e16563
```
Arreglado tema de obtener la expresion del picto en el PCB del JSON
```
  German Callejas committed Jan 18, 2017
  51e16563
17 Jan, 2017 9 commits
- Merge branch 'issue702' into develop · 33d65db5
  Arturo Montejo Ráez committed Jan 18, 2017
  
  33d65db5
- issue #701 close - category pictos can be modified · ca3f0369
  Arturo Montejo Ráez committed Jan 18, 2017
  
  ca3f0369
- picto config dialog refactorized · a2a259e1
  Arturo Montejo Ráez committed Jan 17, 2017
  
  a2a259e1 Browse Directory
- picto config dialog refactorized · 77d2f622
  Arturo Montejo Ráez committed Jan 17, 2017
  
  77d2f622
- Error getting pictos from symbolstix fixed · fc8fb44f
  Arturo Montejo Ráez committed Jan 17, 2017
  
  fc8fb44f
- Menu para habilitar, deshabilitar, poner en invisible terminado. (Falta… · 46f369eb
```
Menu para habilitar, deshabilitar, poner en invisible terminado. (Falta funcionalidad para editar imagen o leyenda)
```
  german committed Jan 17, 2017
  46f369eb
- Reintroducinedo catexp y pictocat pues son necesarios para conocer la jerarquía… · ec8594b7
```
Reintroducinedo catexp y pictocat pues son necesarios para conocer la jerarquía de categorías de symbolstix
```
  Arturo Montejo Ráez committed Jan 17, 2017
  ec8594b7
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 86cfb41f
  Fernando Martínez Santiago committed Jan 17, 2017
  
  86cfb41f Browse Files
- minor commit changes. Working on issue #811 · 793d3111
  Fernando Martínez Santiago committed Jan 17, 2017
  
  793d3111 Browse Directory
16 Jan, 2017 2 commits
- Funcionalidad añadida al menu de picto(solo local, hace falta salir y entrar… · e7cf465f
```
Funcionalidad añadida al menu de picto(solo local, hace falta salir y entrar para poder ver los cambios en el picto)
```
  german committed Jan 16, 2017
  e7cf465f Browse Directory
- Interfaz del menú de picto modificada (aun falta funcionalidad) · 70f85c8e
  german committed Jan 16, 2017
  
  70f85c8e
15 Jan, 2017 5 commits
- issues #795,#797, #798, #801, #803, #806 closed · fe7a35d9
  Fernando Martínez Santiago committed Jan 15, 2017
  
  fe7a35d9
- issue #799, #804 · 54299bdf
  Fernando Martínez Santiago committed Jan 15, 2017
  
  54299bdf
- added sort by 'ws_begin ASC' in lasttries · 3d548583
  Arturo Montejo Ráez committed Jan 15, 2017
  
  3d548583 Browse Files
- Merge branch 'issue711' into develop · 1df7ae61
  Arturo Montejo Ráez committed Jan 15, 2017
  
  1df7ae61 Browse Files
- issue #711 closed, also update_legend has been moved from controller to model as… · b1d26eef
```
issue #711 closed, also update_legend has been moved from controller to model as refactorization process
```
  Arturo Montejo Ráez committed Jan 15, 2017
  b1d26eef
13 Jan, 2017 5 commits
- Widget del menú de opciones para editar los pictos como supervisor añadido. · 8fb0cea2
```
Clase de PictogramActivity modificada para que aparezca el widget tras pulsación larga.

Eventos tras pulsaciones largas quitados(Está el codigo comentado)
Falta funcionalidad del menú y redimension según tamaño.
```
  german committed Jan 13, 2017
  8fb0cea2 Browse Directory
- issue #789 · ee1f0e09
  Sebastián Collado Montañez committed Jan 13, 2017
  
  ee1f0e09 Browse Files
- issue #716 sobre ansible, ahora tambien establece el keymap de la maquina en ES · 503de99b
  Sebastián Collado Montañez committed Jan 13, 2017
  
  503de99b
- issue #248 fixed · 2a334a11
  Arturo Montejo Ráez committed Jan 13, 2017
  
  2a334a11
- merge conflict fixed · f4473d5c
  Arturo Montejo Ráez committed Jan 13, 2017
  
  f4473d5c Browse Files