Commits · 80347944fd31b0d2e6315c7fa4cd4905fa4767ce · yotta / pictogram

18 Jul, 2016 2 commits
- address and phone number not required for registration · 80347944
  Arturo Montejo Ráez committed Jul 18, 2016
  
  80347944 Browse File
- Fixing error with NULL id_cat in picto table · 2d613873
  Arturo Montejo Ráez committed Jul 18, 2016
  
  2d613873
17 Jul, 2016 1 commit
- updated ansible scripts to reflect MySQL 5.7 dependencies · 62654ffb
  Arturo Montejo Ráez committed Jul 17, 2016
  
  62654ffb Browse Files
14 Jul, 2016 2 commits
- updated files in sails-mysql to support milliseconds in timestamps · b1c42a56
  Arturo Montejo Ráez committed Jul 14, 2016
  
  b1c42a56 Browse Files
- Working on milliseconds issue · 9a587e6e
  Arturo Montejo Ráez committed Jul 14, 2016
  
  9a587e6e
06 Jul, 2016 3 commits
- fixed error in timestamp format in Android's action class · fb8e3736
  Arturo Montejo Ráez committed Jul 07, 2016
  
  fb8e3736
- scroll when clicking on category working · a03a5fb6
  Arturo Montejo Ráez committed Jul 07, 2016
  
  a03a5fb6 Browse Files
- fixed CURRENT_TIMESTAMP to support miliseconds in database schema · 133bf447
  Arturo Montejo Ráez committed Jul 06, 2016
  
  133bf447 Browse Files
05 Jul, 2016 1 commit
- Solving problems with sessions and timestamps · 946c1d47
  Arturo Montejo Ráez committed Jul 05, 2016
  
  946c1d47 Browse Files
04 Jul, 2016 1 commit
- issue #463 fixed · 77b7ae86
  Arturo Montejo Ráez committed Jul 04, 2016
  
  77b7ae86 Browse Files
30 Jun, 2016 1 commit
- issues #471 , #73 , #474 closed · 9123e619
  Fernando Martínez Santiago committed Jun 30, 2016
  
  9123e619
29 Jun, 2016 2 commits
- working on login improvement from pcb · 44de29f5
  Fernando Martínez Santiago committed Jun 29, 2016
  
  44de29f5 Browse Files
- working on issue #470 · abccd55a
  Fernando Martínez Santiago committed Jun 29, 2016
  
  abccd55a Browse Files
28 Jun, 2016 3 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 42488c29
  Fernando Martínez Santiago committed Jun 28, 2016
  
  42488c29 Browse Files
- issue #464 closed · dccdb48a
  Fernando Martínez Santiago committed Jun 28, 2016
  
  dccdb48a Browse Files
- issues #459 ,#460 , #461 closed · 87a2bdd0
  Fernando Martínez Santiago committed Jun 28, 2016
  
  87a2bdd0 Browse Files
27 Jun, 2016 3 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 5a6acdc0
  Arturo Montejo Ráez committed Jun 28, 2016
  
  5a6acdc0 Browse Files
- Bug #446 fixed · b09c68a3
  Arturo Montejo Ráez committed Jun 28, 2016
  
  b09c68a3 Browse Files
- working on #461 issue (login bug because of vocabulary time-out) · fab68c4d
  Fernando Martínez Santiago committed Jun 27, 2016
  
  fab68c4d Browse Files
24 Jun, 2016 1 commit
- assets included, issues #460 ,#459 ,#458 ,#453 ,#452 ,#451 in progress, #457 ,#456 ,#455 ,#450 ,#445 closed · 409b1325
  Fernando Martínez Santiago committed Jun 24, 2016
  
  409b1325
22 Jun, 2016 1 commit
- issues #445, #435, #433, #427, #400 closed. · 5764eef9
```
Issues #448, #447,#446 in progress
```
  Fernando Martínez Santiago committed Jun 22, 2016
  5764eef9
21 Jun, 2016 1 commit
- working on PCB core vocabulary preloaded · aad01231
  Fernando Martínez Santiago committed Jun 21, 2016
  
  aad01231
20 Jun, 2016 1 commit
- working on PCB bugs: upload imgs from PCB(I) · fb7fb727
  Fernando Martínez Santiago committed Jun 20, 2016
  
  fb7fb727 Browse Files
14 Jun, 2016 2 commits
- action event in StudentController refactorized (new event added in events.js) · e58cd715
  Arturo Montejo Ráez committed Jun 14, 2016
  
  e58cd715 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · ba9342c1
  Arturo Montejo Ráez committed Jun 14, 2016
  
  ba9342c1 Browse Files
13 Jun, 2016 2 commits
- pictos no mostrados en sesión, corregido · 7124675d
  Arturo Montejo Ráez committed Jun 14, 2016
  
  7124675d Browse Files
- Update README.md · 5ff12edc
  Arturo Montejo Ráez committed Jun 13, 2016
  
  5ff12edc Browse Files
09 Jun, 2016 4 commits
- issue #438 fixed · b791bd7d
  Arturo Montejo Ráez committed Jun 10, 2016
  
  b791bd7d Browse Files
- database files cleaned and fixed, logs paths corrected · 6ac4f1af
  Arturo Montejo Ráez committed Jun 09, 2016
  
  6ac4f1af
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into tests · 6bb23868
  Arturo Montejo Ráez committed Jun 09, 2016
  
  6bb23868 Browse Files
- refactored database, models and controllers · fbb72d48
  Arturo Montejo Ráez committed Jun 09, 2016
  
  fbb72d48
08 Jun, 2016 1 commit
- Comments added to database tables and appropriate REFERENCE statements in foreign key fields · d36e04ff
  Arturo Montejo Ráez committed Jun 08, 2016
  
  d36e04ff
07 Jun, 2016 4 commits
- working on login bug · 2b1dfc05
  Fernando Martínez Santiago committed Jun 07, 2016
  
  2b1dfc05 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram · 17a24f5a
  Fernando Martínez Santiago committed Jun 07, 2016
  
  17a24f5a Browse Files
- working on GF integration (iv) · bc33a78c
  Fernando Martínez Santiago committed Jun 07, 2016
  
  bc33a78c Browse Files
- working on GF integration (iii) · ee7b23b5
  Fernando Martínez Santiago committed Jun 07, 2016
  
  ee7b23b5 Browse Files
04 Jun, 2016 1 commit
- Update README · 709ba63f
  Arturo Montejo Ráez committed Jun 04, 2016
  
  709ba63f Browse Files
03 Jun, 2016 1 commit
- Corregido el problema de carga de pictos en el dashboard · 5f9e03f7
  Pablo Molina committed Jun 03, 2016
  
  5f9e03f7 Browse Files
02 Jun, 2016 2 commits

Actualizados scripts de ansible para AWS · 3be72fc6
Pablo Molina committed Jun 02, 2016

3be72fc6

Merge branch 'issue/428' into develop · 07918801

Conflicts:
	sails/src/assets/app/i18n/en-gb.json
	sails/src/assets/app/i18n/es-es.json
	sails/src/assets/scripts/modules/student/controllers/addpicto.js
	sails/src/assets/scripts/modules/student/views/addpicto.html
	sails/src/assets/styles/main.less

committed Jun 02, 2016

07918801 Browse Files