Commits · 9d2550eab43ee9de57ef203acdb580860943c6e1 · yotta / pictogram · GitLab

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 Browse File
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
21 Dec, 2016 1 commit
- working on PCB issues · bc57f0d4
  Fernando Martínez Santiago committed Dec 21, 2016
  
  bc57f0d4 Browse Files
20 Dec, 2016 7 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
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 88715fd8
  Fernando Martínez Santiago committed Dec 20, 2016
  
  88715fd8
- working on PCB sessions (3) · 6f6bf257
  Fernando Martínez Santiago committed Dec 20, 2016
  
  6f6bf257 Browse Directory
- conflicts solved · 77d0cacf
  Arturo Montejo Ráez committed Dec 20, 2016
  
  77d0cacf Browse Files
- fixed problem with supervisor search in student setup · 2f994ab3
  Arturo Montejo Ráez committed Dec 20, 2016
  
  2f994ab3 Browse Files
19 Dec, 2016 3 commits
- Design Repaired (Appear list when keyboard is hide faults) · e9fb5c5e
  german committed Dec 19, 2016
  
  e9fb5c5e Browse Files
- working on PCB sessions 2 · bf9a9ff0
  Fernando Martínez Santiago committed Dec 19, 2016
  
  bf9a9ff0 Browse Files
- license handling in set working · 010a5c46
  Arturo Montejo Ráez committed Dec 19, 2016
  
  010a5c46
18 Dec, 2016 3 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 5413736a
  Fernando Martínez Santiago committed Dec 18, 2016
  
  5413736a Browse Files
- working on PCB sessions (butttons) · 6b6c2ff8
  Fernando Martínez Santiago committed Dec 18, 2016
  
  6b6c2ff8
- working on PCB sessions · 1e0bf9e3
  Fernando Martínez Santiago committed Dec 18, 2016
  
  1e0bf9e3 Browse File
17 Dec, 2016 2 commits
- license field added with mask · 6c3b3172
  Arturo Montejo Ráez committed Dec 17, 2016
  
  6c3b3172
- student setup view rearranged · ae2c93b7
  Arturo Montejo Ráez committed Dec 17, 2016
  
  ae2c93b7 Browse Directory
16 Dec, 2016 9 commits
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop · da6bcac0
  Fernando Martínez Santiago committed Dec 16, 2016
  
  da6bcac0 Browse Files
- working on PCB session · a007406e
  Fernando Martínez Santiago committed Dec 16, 2016
  
  a007406e Browse File
- Invisible lists if keyboard appear. Show again the list if keyboard dissapear fault · 51c69a8d
  german committed Dec 16, 2016
  
  51c69a8d
- Added list of legal users (stu & sup) only on the view. · 7f3dbfae
  german committed Dec 16, 2016
  
  7f3dbfae Browse Files
- Added list of legal users (stu & sup) only on the view. (reverted from commit… · 05515591
```
Added list of legal users (stu & sup) only on the view. (reverted from commit 86cbcefb270cedcec610bba18e7ac01b2eea1f6f)
```
  german committed Dec 16, 2016
  05515591
- Added list of legal users (stu & sup) only on the view. · ce5ba35f
  german committed Dec 16, 2016
  
  ce5ba35f Browse Files
- issue #666 closed (lectoescritura) · 6bab22da
  root committed Dec 16, 2016
  
  6bab22da
- Added list of legal users (stu & sup) only on the view. · c516233a
  german committed Dec 16, 2016
  
  c516233a Browse Files
- increasing activation of license working · be65fb8e
  Arturo Montejo Ráez committed Dec 16, 2016
  
  be65fb8e
15 Dec, 2016 4 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 13739838
  Fernando Martínez Santiago committed Dec 15, 2016
  
  13739838 Browse Files
- working on instructions by using PCB · ebfd293d
  Fernando Martínez Santiago committed Dec 15, 2016
  
  ebfd293d
- Traducciones para opciones de leyenda en pictoconfig · 743c7416
  Sebastián Collado committed Dec 15, 2016
  
  743c7416 Browse Files
- working on issue #692 · a18377fb
  Fernando Martínez Santiago committed Dec 15, 2016
  
  a18377fb