Commits · 41f62311a425cbd9306dd025644050fd99fc14c4 · Richard Fernando Heise Ferreira / cleaning-portalmec · GitLab

Snippets Groups Projects

Mar 22, 2017
- Merge branch 'learning-object-serializer-publisher' into 'master' · 41f62311
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  now belongs_to :publisher See merge request !402
  41f62311
- now belongs_to :publisher · f41c54cb
  bfs15 authored 7 years ago
  
  f41c54cb
- Merge branch '203/Email_sended_unduly' into 'master' · f5fd1b23
  Israel Barreto Sant'Anna authored 7 years ago
  
  203: Fixed nil class. See merge request !401
  f5fd1b23
- 203: Fixed nil class. · accbaedc
  Eduardo Machado authored 7 years ago
  
  accbaedc
- Merge branch '203/Email_sended_unduly' into 'master' · e390edfa
  Israel Barreto Sant'Anna authored 7 years ago
  
  203/email sended unduly See merge request !400
  e390edfa
- 203: Changed to is_admin method. · 198784b8
  Eduardo Machado authored 7 years ago
  
  198784b8
- Merge branch '198/status_add_lo_twice' into 'master' · a3563f83
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  198/status add lo twice See merge request !393
  a3563f83
- Merge branch 'fix-import' into 'master' · f00327a4
  Israel Barreto Sant'Anna authored 7 years ago
  
  Fix import See merge request !399
  f00327a4
- Fixed learning object importer empty verification · cab3fdca
  Israel Barreto Sant'Anna authored 7 years ago
  
  Signed-off-by: Israel Sant'Anna <ibsa14@inf.ufpr.br>
  cab3fdca
Mar 21, 2017
- Fixed learning object import by collection · cfbc82bb
  Israel Barreto Sant'Anna authored 7 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  cfbc82bb
- #203: Now just the owner and admin can see the user's email. · 256730c4
  Eduardo Machado authored 7 years ago
  
  256730c4
- Merge branch 'master' into fix-import · 424df10c
  Israel Barreto Sant'Anna authored 7 years ago
  
  424df10c
- Fix learning objects import and portalmec setup · 311bedcb
  Israel Barreto Sant'Anna authored 7 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  311bedcb
Mar 20, 2017
- Merge branch '206-fix-authentication-problem-user-logins-stop-without-user-command' into 'master' · 276e6b43
  Giovanne Marcelo authored 7 years ago
  
  fixed file uploads directory to be unique See merge request !396
  276e6b43
- Israel mentiu para mim, necessario return · d1a7af37
  bfs15 authored 7 years ago
  
  d1a7af37
- Merge branch 'master' into 206-fix-authentication-problem-user-logins-stop-without-user-command · c74317ea
  bfs15 authored 7 years ago
  
  c74317ea
- fixed file uploads directory to be unique · 1b7d2cb8
  bfs15 authored 7 years ago
  
  1b7d2cb8
- Merge branch '206-fix-authentication-problem-user-logins-stop-without-user-command' into 'master' · 45c8319c
  Giovanne Marcelo authored 7 years ago
  
  uploading file by chunks now use diferent parameters See merge request !394
  45c8319c
- Merge branch '200/delete_tags_array' into 'master' · 25f35c2a
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  #200: Deletation of tags's array implemented on collection update and learning_object update. See merge request !390
  25f35c2a
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into 200/delete_tags_array · 58118125
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  58118125
- Merge branch 'search-all' into 'master' · e28e8524
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  maybe now filter works when search by * See merge request !395
  e28e8524
- maybe now filter works when search by * · 28251606
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  28251606
Mar 17, 2017
- added permission for ng-file-upload parameters · c9cdd3ec
  bfs15 authored 8 years ago
  
  c9cdd3ec
- uploading file by chunks now use diferent parameters · b1b09b04
  bfs15 authored 8 years ago
  
  b1b09b04
- 198: code fixed · 85d3086b
  Eduardo Machado authored 8 years ago
  
  85d3086b
- Fixed object type seed · 9fc7b30c
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  9fc7b30c
- Merge branch '220/create_e-book_type' into 'master' · a28ded49
  Israel Barreto Sant'Anna authored 8 years ago
  
  #220: E-book type created See merge request !392
  a28ded49
- Merge branch '221/Create_others_subject' into 'master' · 735aaffd
  Israel Barreto Sant'Anna authored 8 years ago
  
  #221: Subject 'Outros' added to seed. See merge request !391
  735aaffd
- #220: E-book type created · 89524cc5
  Eduardo Machado authored 8 years ago
  
  89524cc5
- Merge branch 'rspec' into 'master' · f805b46b
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  Rspec See merge request !389
  f805b46b
Mar 16, 2017
- #221: Subject 'Outros' added to seed. · 7f481317
  Eduardo Machado authored 8 years ago
  
  7f481317
- #200: Deletation of tags's array implemented on collection update and learning_object update. · a6b33ba6
  Eduardo Machado authored 8 years ago
  
  a6b33ba6
Mar 13, 2017
- paginate collection index · ed215d0d
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  ed215d0d
- Merge branch 'rspec' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 060039da
  Israel Barreto Sant'Anna authored 8 years ago
  
  060039da
- Merge branch 'master' into rspec · b3f8adf7
  Israel Barreto Sant'Anna authored 8 years ago
  
  b3f8adf7
- Merge branch 'rspec' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 949d46b8
  bfs15 authored 8 years ago
  
  949d46b8
- Merge branch 'download-error-status' into 'master' · 66982d53
  Israel Barreto Sant'Anna authored 8 years ago
  
  Added error status to download if it cant find the link See merge request !388
  66982d53
- create role teacher to authenticate · c4f2eaef
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  c4f2eaef
- Added error status to download if it cant find the link · ee21f9f1
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  ee21f9f1
Mar 10, 2017
- changed TODO message · f4617a78
  bfs15 authored 8 years ago
  
  f4617a78