Commits · cfc26249ac24559589add4e975699633c044e874 · yotta / pictogram · GitLab

08 Sep, 2016 3 commits
- update how to get symbolstx and upload images · cfc26249
  Arturo Montejo Ráez committed Sep 08, 2016
  
  cfc26249 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 5486da0b
  root committed Sep 08, 2016
  
  5486da0b
- issue #568 fixed · 87074dd7
  Fernando Martínez Santiago committed Sep 08, 2016
  
  87074dd7 Browse Files
07 Sep, 2016 1 commit
- issue #566 fixed (it was a hard one) · c03f331d
  Fernando Martínez Santiago committed Sep 07, 2016
  
  c03f331d
05 Sep, 2016 5 commits
- issues #560, #561 and password field on login activity implemented · 15e19414
  Fernando Martínez Santiago committed Sep 05, 2016
  
  15e19414 Browse Files
- prueba commit vacía · a77e9b30
  Arturo Montejo Ráez committed Sep 05, 2016
  
  a77e9b30 Browse Files
- Update README · 37d69be4
  Arturo Montejo Ráez committed Sep 05, 2016
  
  37d69be4
- minor changes on session notifications from dashboard · 18fa13f7
  Fernando Martínez Santiago committed Sep 05, 2016
  
  18fa13f7
- minor changes in PCB regarding notification behaviour · aea8543a
  Fernando Martínez Santiago committed Sep 05, 2016
  
  aea8543a Browse Files
03 Sep, 2016 3 commits
- working on json issues on server side · ddce7b6a
  Fernando Martínez Santiago committed Sep 03, 2016
  
  ddce7b6a Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · a78b4b1f
  Fernando Martínez Santiago committed Sep 03, 2016
  
  a78b4b1f Browse Files
- bug #559 fixed · 1d766745
  Fernando Martínez Santiago committed Sep 03, 2016
  
  1d766745
02 Sep, 2016 3 commits
- bugs #556 and #557 fixed from Dashboard side · 3b74f2c5
  Fernando Martínez Santiago committed Sep 02, 2016
  
  3b74f2c5
- bugs #556 and #557 fixed from PCB side · 34865a02
  Fernando Martínez Santiago committed Sep 02, 2016
  
  34865a02 Browse Directory
- updated to enable epel repo before instaling ansible · 4c4e8f6b
  Arturo Montejo Ráez committed Sep 02, 2016
  
  4c4e8f6b Browse Files
01 Sep, 2016 4 commits
- solved several bugs when updating supervisor data · 5c1cc678
  Arturo Montejo Ráez committed Sep 01, 2016
  
  5c1cc678
- README actualizado con notas · 273202b5
  Miguel Ángel García Cumbreras committed Sep 01, 2016
  
  273202b5
- fixed problem with missing ngToast injection · 51e28afd
  Arturo Montejo Ráez committed Sep 01, 2016
  
  51e28afd Browse Files
- solved issue #553 · 26574f24
  Arturo Montejo Ráez committed Sep 01, 2016
  
  26574f24
31 Aug, 2016 3 commits
- solved merge · 2abc270f
  Arturo Montejo Ráez committed Aug 31, 2016
  
  2abc270f
- fixed issue #552 · 1bb997bf
  Arturo Montejo Ráez committed Aug 31, 2016
  
  1bb997bf
- Disabled websocket transport protocol as forced · eb39ab6b
  Arturo Montejo Ráez committed Aug 31, 2016
  
  eb39ab6b
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 Files
- working on issue #527 · 56628339
  Arturo Montejo Ráez committed Aug 28, 2016
  
  56628339
- working on issue #527 · 155a26ab
  Arturo Montejo Ráez committed Aug 28, 2016
  
  155a26ab
- 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
- 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 Directory
- 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
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 Directory
- working on bug #530. Fixed? · 750f7bc3
  Fernando Martínez Santiago committed Aug 23, 2016
  
  750f7bc3 Browse Files