Commits · 1b79b877c2c9b1a9c00e9778432a784654b20495 · yotta / pictogram · GitLab

30 Nov, 2016 8 commits
- Merge branch 'develop' · 1b79b877
  Arturo Montejo Ráez committed Nov 30, 2016
  
  1b79b877
- minor bug fixed when adding pictos · a7c4d676
  Arturo Montejo Ráez committed Nov 30, 2016
  
  a7c4d676 Browse Directory
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 51d0f4ee
  Arturo Montejo Ráez committed Nov 30, 2016
  
  51d0f4ee Browse Files
- Modal window for expressions now closes on save · a1797736
  Arturo Montejo Ráez committed Nov 30, 2016
  
  a1797736 Browse Directory
- Merge branch 'issue627' into develop · c8310968
  Arturo Montejo Ráez committed Nov 30, 2016
  
  c8310968 Browse Files
- Issue #627 done · 25bfb99e
  Arturo Montejo Ráez committed Nov 30, 2016
  
  25bfb99e Browse Files
- working on issue #630 · 6909ecb0
  Fernando Martínez Santiago committed Nov 30, 2016
  
  6909ecb0 Browse Files
- working on #630 · 04d6fe92
  Fernando Martínez Santiago committed Nov 30, 2016
  
  04d6fe92
29 Nov, 2016 4 commits
- issue #630 closed · 4b5f28e0
  Fernando Martínez Santiago committed Nov 29, 2016
  
  4b5f28e0 Browse Directory
- working on issue #630, AngularJS side · 01e39acb
  Fernando Martínez Santiago committed Nov 29, 2016
  
  01e39acb Browse Directory
- working on issue #630 (PCB side) · 9d36dc9a
  Fernando Martínez Santiago committed Nov 29, 2016
  
  9d36dc9a Browse File
- working on issue #627 · ffcf82eb
  Arturo Montejo Ráez committed Nov 29, 2016
  
  ffcf82eb Browse Directory
28 Nov, 2016 2 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 307681cd
  Fernando Martinez committed Nov 28, 2016
  
  307681cd Browse Files
- issue #627: add button added to each empty icon in category grid · db9164d7
  Arturo Montejo Ráez committed Nov 28, 2016
  
  db9164d7 Browse Directory
27 Nov, 2016 1 commit
- Merge remote-tracking branch 'origin/develop' into develop · fb5ce783
  Fernando Martínez Santiago committed Nov 27, 2016
  
  fb5ce783 Browse Files
24 Nov, 2016 6 commits
- working on issue #627 · 59eab19a
  Arturo Montejo Ráez committed Nov 24, 2016
  
  59eab19a Browse File
- fixed test-centrodestrezas.sql · 80e9c9a3
  Arturo Montejo Ráez committed Nov 24, 2016
  
  80e9c9a3 Browse Directory
- fixed init.sql · 7cd6e79e
  Arturo Montejo Ráez committed Nov 24, 2016
  
  7cd6e79e
- updated init.sql · 69efd0f1
  Arturo Montejo Ráez committed Nov 24, 2016
  
  69efd0f1 Browse File
- updated init.sql · ea1f34b9
  Arturo Montejo Ráez committed Nov 24, 2016
  
  ea1f34b9 Browse Directory
- updated local.js template · 97f2cb06
  Arturo Montejo Ráez committed Nov 24, 2016
  
  97f2cb06
23 Nov, 2016 4 commits
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop · 4b906d96
  Fernando Martinez committed Nov 23, 2016
  
  4b906d96 Browse Files
- updated config for ssl in sails to add intermediate certificates · 5fcf6dce
  Arturo Montejo Ráez committed Nov 23, 2016
  
  5fcf6dce Browse File
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 64a84348
  Arturo Montejo Ráez committed Nov 23, 2016
  
  64a84348 Browse Files
- updated bootstrap.sh to work on dev and pre servers · 70e6f513
  Arturo Montejo Ráez committed Nov 23, 2016
  
  70e6f513 Browse File
22 Nov, 2016 2 commits
- issues #623, #612, #622 closed. "Supervisor" label included in login window · 2a978514
  Fernando Martínez Santiago committed Nov 22, 2016
  
  2a978514 Browse File
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop · 0038d400
  Fernando Martinez committed Nov 22, 2016
  
  0038d400 Browse Files
21 Nov, 2016 7 commits
- issues #623, #612, #622 closed · 23b27d26
  Fernando Martínez Santiago committed Nov 21, 2016
  
  23b27d26
- missing ';' added · 91c6c5a8
  Arturo Montejo Ráez committed Nov 21, 2016
  
  91c6c5a8 Browse Directory
- Updated · 8403506d
  Arturo Montejo Ráez committed Nov 21, 2016
  
  8403506d Browse File
- update ansible mysql deps · dad6db34
  Arturo Montejo Ráez committed Nov 21, 2016
  
  dad6db34 Browse Directory
- update ansible mysql deps · 47d466df
  Arturo Montejo Ráez committed Nov 21, 2016
  
  47d466df Browse Directory
- Merge branch 'develop' · 0e5d90f3
  Arturo Montejo Ráez committed Nov 21, 2016
  
  0e5d90f3
- minor changes · a9098263
  Arturo Montejo Ráez committed Nov 21, 2016
  
  a9098263 Browse Directory
17 Nov, 2016 1 commit
- solved problems with student creation (picto core addition and list refresh) · 4ac513e9
  Arturo Montejo Ráez committed Nov 17, 2016
  
  4ac513e9
16 Nov, 2016 1 commit
- issue #603 implemented: customized corporative image of Pictogram · 2a41c00b
  root committed Nov 16, 2016
  
  2a41c00b Browse File
15 Nov, 2016 4 commits
- Let's encrypt based SSL certificates with auto-renewal · cd3921d9
  root committed Nov 15, 2016
  
  cd3921d9 Browse Directory
- footer changed · ea00f493
  Arturo Montejo Ráez committed Nov 15, 2016
  
  ea00f493 Browse Directory
- powered by logo larger · 02a9a55a
  Arturo Montejo Ráez committed Nov 15, 2016
  
  02a9a55a
- fixed CAJA coporative image shown · 9fad0001
  Arturo Montejo Ráez committed Nov 15, 2016
  
  9fad0001 Browse Directory