Commits · ddd4bb09c308263d1f97c3b6882aa44054550877 · vidjil / vidjil · GitLab

Attention une mise à jour du service Gitlab va être effectuée le mardi 07 février entre 13h30 et 14h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes (habituellement de l'ordre de trois minutes).

19 Sep, 2014 6 commits
- server : rename data_file table > results_file · ddd4bb09
  Marc Duez authored Sep 19, 2014
  
  ddd4bb09
- patient/result_info.html: remove '\r' for proper <textarea> display · 07ded149
  Mathieu Giraud authored Sep 19, 2014
  
  07ded149
- backup.sh: filename also includes time · dc0a48ae
  Marc Duez authored Sep 19, 2014
  
  dc0a48ae
- Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil · d5af7194
  Marc Duez authored Sep 19, 2014
  
  d5af7194
- model.js : remove old json analysis parser · 31163b5e
  Marc Duez authored Sep 19, 2014
  
  31163b5e
- watir : update json test file to '2014.09' version · ca184ad5
  Marc Duez authored Sep 19, 2014
  
  ca184ad5
18 Sep, 2014 10 commits
- Merge branch 'rbx.vidjil.org' · 7264fb3f
  Mathieu Giraud authored Sep 18, 2014
  
  7264fb3f
- database-schema.xml: rename 'data_file' to 'results_file' · 0c355760
  Mathieu Giraud authored Sep 16, 2014
```
Suggestion from @nikosdarzentas
```
  0c355760
- Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into rbx.vidjil.org · 29e096fe
  Marc Duez authored Sep 18, 2014
  
  29e096fe
- server : add data file info view and delete view · c51df1c6
  Marc Duez authored Sep 18, 2014
  
  c51df1c6
- server: add data file confirm/delete/info buton · 3eb10199
  Marc Duez authored Sep 18, 2014
  
  3eb10199
- server: print output scheduler · d81c6c1f
  Marc Duez authored Sep 18, 2014
  
  d81c6c1f
- server : result file function confirm/delete (TODO create is own controller) · f32f623c
  Marc Duez authored Sep 18, 2014
  
  f32f623c
- server : store filename for sequence file // use stored filename instead of retrieve() function · d23dc80e
  Marc Duez authored Sep 18, 2014
  
  d23dc80e
- fuse.py : change filter again · 9ab655a8
  Marc Duez authored Sep 18, 2014
  
  9ab655a8
- fuse.py : improve filtering · 3b3d0d53
  Marc Duez authored Sep 18, 2014
  
  3b3d0d53
17 Sep, 2014 14 commits
- server : config/edit => (debug) correct config germline is selected in germline_list · c74a7ce5
  Marc Duez authored Sep 17, 2014
  
  c74a7ce5
- Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into rbx.vidjil.org · d0fcba24
  Marc Duez authored Sep 17, 2014
  
  d0fcba24
- model.js : parseJsonAnalysis => new strategy to keep samples order (even with different data file) · 3e4a06cb
  Marc Duez authored Sep 17, 2014
  
  3e4a06cb
- server : get_data / get_analysis function compatible with output file json version '2014.09' · 5794fbb5
  Marc Duez authored Sep 17, 2014
  
  5794fbb5
- server : task security never schedule a run twice · a533c32c
  Marc Duez authored Sep 17, 2014
  
  a533c32c
- server : check user for admin panel · 75e96632
  Marc Duez authored Sep 17, 2014
  
  75e96632
- Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into rbx.vidjil.org · 0c3fab65
  Marc Duez authored Sep 17, 2014
  
  0c3fab65
- Merge branch 'rework_analysis' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil · 4638ce02
  Marc Duez authored Sep 17, 2014
  
  4638ce02
- Merge branch 'rework_analysis' of... · f35a1c78
  Marc Duez authored Sep 17, 2014
```
Merge branch 'rework_analysis' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into rework_analysis

Conflicts:
	browser/js/model.js
```
  f35a1c78
- model.js : debug old json analysis compatibility · 330059e0
  Marc Duez authored Sep 17, 2014
  
  330059e0
- server : routes.py (define vidjil app as the default app) · 6be0668b
  Marc Duez authored Sep 17, 2014
  
  6be0668b
- server : display download/see result button only if some sequence file have been processed · 1127d461
  Marc Duez authored Sep 17, 2014
  
  1127d461
- server : put schedule_run function in task.py (accesible for more than one controller) · e2ace035
  Marc Duez authored Sep 17, 2014
  
  e2ace035
- server : admin panel · 3d131d83
  Marc Duez authored Sep 17, 2014
  
  3d131d83
16 Sep, 2014 10 commits
- model.js : analysis file parser accept old json version (temporary) · 8f616f6f
  Marc Duez authored Sep 16, 2014
  
  8f616f6f
- Merge 'rework_analysis': take into account new .analysis format (ongoing, #1 ) · 8176ebc2
  Mathieu Giraud authored Sep 16, 2014
  
  8176ebc2
- patient/index.html: no comma in the list of configs · 84f1fcf8
  Mathieu Giraud authored Sep 12, 2014
  
  84f1fcf8
- fuse.py : pre-filtering · 61139b3f
  Marc Duez authored Sep 15, 2014
  
  61139b3f
- fuse.py: debug clntab · a058233c
  Marc Duez authored Sep 15, 2014
  
  a058233c
- fuse.py : mute synthetic clones · 7e762d66
  Marc Duez authored Sep 15, 2014
  
  7e762d66
- model.js : load and save json output format '2014.09' · 581499f9
  Marc Duez authored Sep 15, 2014
  
  581499f9
- format-analysis.org : debug invalid json format · 8ab36a2e
  Marc Duez authored Sep 15, 2014
  
  8ab36a2e
- json : json version '2014.09' · 3a64ffa5
  Marc Duez authored Sep 15, 2014
  
  3a64ffa5
- fuse.py : handle samples field · cdd64ca6
  Marc Duez authored Sep 15, 2014
  
  cdd64ca6