Commits · 59a02fe5344dcb27083e915d6ec7e4a9a3177b88 · yotta / pictogram · GitLab

12 Dec, 2016 9 commits
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into develop · 59a02fe5
  Arturo Montejo Ráez committed Dec 12, 2016
  
  59a02fe5
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · f942adcb
  Arturo Montejo Ráez committed Dec 12, 2016
  
  f942adcb
- fixed problem with missing students in office admin list · e78e0533
  Arturo Montejo Ráez committed Dec 12, 2016
  
  e78e0533
- Legend text size changed · 2907f452
  german committed Dec 12, 2016
  
  2907f452 Browse Files
- Picto updated · 23e527f1
  german committed Dec 12, 2016
  
  23e527f1 Browse Files
- Picto updated · a603373e
  german committed Dec 12, 2016
  
  a603373e Browse Files
- gitignore updated · 0d8ed678
  Arturo Montejo Ráez committed Dec 12, 2016
  
  0d8ed678 Browse Files
- gitignore updated · 2e308327
  Arturo Montejo Ráez committed Dec 12, 2016
  
  2e308327 Browse Files
- conflict resolved · 706c14d6
  Arturo Montejo Ráez committed Dec 12, 2016
  
  706c14d6 Browse Files
11 Dec, 2016 1 commit
- issue #681 closed · 20222578
  Fernando Martínez Santiago committed Dec 11, 2016
  
  20222578
10 Dec, 2016 7 commits
- Issue #675 to recover/change passwords done · 687a18b9
  Arturo Montejo Ráez committed Dec 10, 2016
  
  687a18b9 Browse Files
- working on issue · 849161fa
  Arturo Montejo Ráez committed Dec 10, 2016
  
  849161fa
- issues #678, #674 closed · 7cdc8b6f
  Fernando Martínez Santiago committed Dec 10, 2016
  
  7cdc8b6f
- issue #676 fixed · 4ba9dd64
  Arturo Montejo Ráez committed Dec 10, 2016
  
  4ba9dd64
- Merge branch 'develop' · 9a113ef3
  Arturo Montejo Ráez committed Dec 10, 2016
  
  9a113ef3 Browse Files
- setup icon fixed in students list · 2cf0049d
  Arturo Montejo Ráez committed Dec 10, 2016
  
  2cf0049d Browse Files
- issues #672 #673 and #669 fixed · 0aa1bff0
  Arturo Montejo Ráez committed Dec 10, 2016
  
  0aa1bff0
09 Dec, 2016 7 commits
- signin form reset after successfull registration · 3b6886f9
  Arturo Montejo Ráez committed Dec 10, 2016
  
  3b6886f9 Browse Files
- Merge branch 'master' into develop · 2b821b15
  Arturo Montejo Ráez committed Dec 09, 2016
  
  2b821b15
- redirection to /app path · 8d89f8dd
  Arturo Montejo Ráez committed Dec 09, 2016
  
  8d89f8dd Browse Files
- Problem with repeat bitmap repaired · e12e6357
  german committed Dec 09, 2016
  
  e12e6357 Browse Files
- Code changed to quit the legend_size attributes and "only_legend" code added · 9a2b4543
  german committed Dec 09, 2016
  
  9a2b4543 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 9a26e5af
  Arturo Montejo Ráez committed Dec 09, 2016
  
  9a26e5af Browse Files
- fixed error in issue #656 · b626c1dc
  Arturo Montejo Ráez committed Dec 09, 2016
  
  b626c1dc
08 Dec, 2016 5 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 739c69d1
  Fernando Martínez Santiago committed Dec 08, 2016
  
  739c69d1 Browse Files
- issue #653 (PCB drag&drop pictos), #655(pcb input feedback) and #662 closed… · 4afc617a
```
issue  #653 (PCB drag&drop pictos), #655(pcb input feedback) and  #662 closed (voice depending on gender and language)
```
  Fernando Martínez Santiago committed Dec 08, 2016
  4afc617a Browse Files
- issue #654 implemented, waiting for validation · 089dbfaf
  Arturo Montejo Ráez committed Dec 08, 2016
  
  089dbfaf
- Merge branch 'develop' · 8a03979f
  Arturo Montejo Ráez committed Dec 08, 2016
  
  8a03979f Browse Files
- issue #656 solved · aa9d9dae
  Arturo Montejo Ráez committed Dec 08, 2016
  
  aa9d9dae
07 Dec, 2016 3 commits
- local PCB picto cache updated · 8e152bff
  Fernando Martínez Santiago committed Dec 07, 2016
  
  8e152bff
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 9384c71b
  Fernando Martínez Santiago committed Dec 07, 2016
  
  9384c71b Browse Files
- working on issues ##651 (mirror mode from PCB to PCB) · b909987f
  Fernando Martínez Santiago committed Dec 07, 2016
  
  b909987f Browse Files
05 Dec, 2016 8 commits
- solving conflict in merge · e1bd1eff
  Arturo Montejo Ráez committed Dec 05, 2016
  
  e1bd1eff Browse Files
- problem with Vagrant DB charset · 69feb3e7
  Arturo Montejo Ráez committed Dec 05, 2016
  
  69feb3e7 Browse Files
- new core categories shown properly · 8921f54c
  Arturo Montejo Ráez committed Dec 05, 2016
  
  8921f54c
- fixed problem with personalized legend in student's pictos, (issue #650) · 8deb8e35
  Arturo Montejo Ráez committed Dec 05, 2016
  
  8deb8e35 Browse Files
- issues #646, #645, #644, #630 closed · b436ebc6
  Fernando Martínez Santiago committed Dec 05, 2016
  
  b436ebc6
- issue #648 closed · ac4502de
  Fernando Martínez Santiago committed Dec 05, 2016
  
  ac4502de
- issue #643 · 33bff6a3
  Fernando Martínez Santiago committed Dec 05, 2016
  
  33bff6a3 Browse Files
- Update INSTALL.md · f3b5070f
  Sebastián Collado Montañez committed Dec 05, 2016
  
  f3b5070f