Commits · 19086f8eeab4d632edd0f0c8f001110a0cbd2f9e · yotta / pictogram · GitLab

30 Aug, 2016 4 commits
- Merge remote-tracking branch 'origin/develop' into fernando_branch · 19086f8e
```
# Conflicts:
#	.gitignore
#	android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
#	android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/net/NetServiceTablet.java
#	sails/src/assets/app/i18n/en-gb.json
```
  Fernando Martínez Santiago committed Aug 30, 2016
  19086f8e Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 3c8f47fb
  Fernando Martínez Santiago committed Aug 30, 2016
  
  3c8f47fb
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · c01274f1
  Fernando Martínez Santiago committed Aug 30, 2016
  
  c01274f1
- Solved issues #546 and #548 · 0bbb3905
  Arturo Montejo Ráez committed Aug 30, 2016
  
  0bbb3905 Browse File
28 Aug, 2016 8 commits
- .gitignore modified · a344738a
  Arturo Montejo Ráez committed Aug 28, 2016
  
  a344738a Browse File
- working on issue #527 · 56628339
  Arturo Montejo Ráez committed Aug 28, 2016
  
  56628339 Browse Directory
- working on issue #527 · 155a26ab
  Arturo Montejo Ráez committed Aug 28, 2016
  
  155a26ab Browse Directory
- Merge remote-tracking branch 'origin/develop' into fernando_branch · aea59bf9
  Fernando Martínez Santiago committed Aug 28, 2016
  
  aea59bf9 Browse Files
- merging commits · 341288b6
  Fernando Martínez Santiago committed Aug 28, 2016
  
  341288b6 Browse File
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · e591ab9e
  root committed Aug 28, 2016
  
  e591ab9e Browse Files
- issues #539,#540,#544,#545 fixed · fd3006da
  Fernando Martínez Santiago committed Aug 28, 2016
  
  fd3006da Browse File
- PCB bug fixex (issue #542) · 56f0de79
  Fernando Martínez Santiago committed Aug 28, 2016
  
  56f0de79 Browse Directory
24 Aug, 2016 4 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 1ad9f904
  root committed Aug 24, 2016
  
  1ad9f904 Browse Files
- minor changes · f296a016
  Fernando Martínez Santiago committed Aug 24, 2016
  
  f296a016 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 5c9d3a95
  root committed Aug 24, 2016
  
  5c9d3a95 Browse Files
- bugs #534 and #539 fixed · 4beff312
  Fernando Martínez Santiago committed Aug 24, 2016
  
  4beff312 Browse File
23 Aug, 2016 2 commits
- working on pcb websocket issue (sometimes it doesn't work) · 399d3671
  Fernando Martínez Santiago committed Aug 23, 2016
  
  399d3671 Browse Files
- working on bug #530. Fixed? · 750f7bc3
  Fernando Martínez Santiago committed Aug 23, 2016
  
  750f7bc3 Browse Directory
22 Aug, 2016 3 commits
- bug #533 fixed · a3f2271e
  Fernando Martínez Santiago committed Aug 22, 2016
  
  a3f2271e Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 60a730fa
  root committed Aug 22, 2016
  
  60a730fa Browse Files
- bug #531 fixed. It's required to reinstall the database triggers to take effect of this patch · a9ee3961
  Fernando Martínez Santiago committed Aug 22, 2016
  
  a9ee3961 Browse File
18 Aug, 2016 1 commit
- Android Watch support, project app module refactorized to tablet+commonlibrary+watch modules · 9b6a995d
  Fernando Martínez Santiago committed Aug 18, 2016
  
  9b6a995d Browse File
02 Aug, 2016 1 commit
- bug uploading img from offline to online fixed · 07119460
  Fernando Martínez Santiago committed Aug 02, 2016
  
  07119460 Browse Files
01 Aug, 2016 3 commits
- loading message for pictos in categories. Broken images not shown now (#494) · fe69eda6
  Arturo Montejo Ráez committed Aug 01, 2016
  
  fe69eda6 Browse File
- issue #501 fixed · de5310af
  Arturo Montejo Ráez committed Aug 01, 2016
  
  de5310af
- Problems adding custom pictos in PDB solved · b9d580e1
  Arturo Montejo Ráez committed Aug 01, 2016
  
  b9d580e1 Browse Directory
29 Jul, 2016 2 commits
- fixed issue #506: tags handling fully operational · 43deb2f6
  Arturo Montejo Ráez committed Jul 29, 2016
  
  43deb2f6 Browse Directory
- bug #506 fixed · bcecdaa7
  Arturo Montejo Ráez committed Jul 29, 2016
  
  bcecdaa7 Browse Files
28 Jul, 2016 4 commits
- Merge remote-tracking branch 'origin/develop' into fernando_branch · 482fc756
  Fernando Martínez Santiago committed Jul 28, 2016
  
  482fc756 Browse Files
- bug #509, #510, #512, #507, #498 fixed. Working on #503 · a571ab34
  Fernando Martínez Santiago committed Jul 28, 2016
  
  a571ab34 Browse Directory
- issue #511 resolved · a0cc67ce
  Arturo Montejo Ráez committed Jul 28, 2016
  
  a0cc67ce Browse Directory
- notificación de nuevo picto desde el PDB al PCB solucionado · 01353467
  Arturo Montejo Ráez committed Jul 28, 2016
  
  01353467 Browse Files
27 Jul, 2016 4 commits
- working on picto controller · 69441fe7
  Arturo Montejo Ráez committed Jul 27, 2016
  
  69441fe7 Browse File
- depurating picto expression update · 686992d7
  Arturo Montejo Ráez committed Jul 27, 2016
  
  686992d7 Browse File
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 34168770
  Fernando Martínez Santiago committed Jul 27, 2016
  
  34168770 Browse Files
- bug #497, #498 fixed. Working on #503 · 4a7bd0f1
  Fernando Martínez Santiago committed Jul 27, 2016
  
  4a7bd0f1 Browse Directory
26 Jul, 2016 4 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 315f17aa
  Arturo Montejo Ráez committed Jul 26, 2016
  
  315f17aa Browse Files
- issue476 · 406ba850
  Arturo Montejo Ráez committed Jul 26, 2016
  
  406ba850 Browse File
- Issue #492 fixed · 258604d1
  Arturo Montejo Ráez committed Jul 26, 2016
  
  258604d1 Browse Directory
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · d485d773
  Arturo Montejo Ráez committed Jul 26, 2016
  
  d485d773 Browse Files