Commits · 0e31791192d08ae19dfa7c5012d291fc862a7685 · vidjil / vidjil

03 Apr, 2019 3 commits

Merge branch 'feature-a/dev' into 'dev' · 0e317911
Mathieu Giraud authored Apr 04, 2019
```
tests: this test can fail on some platforms

See merge request !458
```
0e317911
tests: this test can fail on some platforms · 10cf1300
Mathieu Giraud authored Apr 04, 2019
```
See #3414 and 68b6ebcb.
```
10cf1300

Mathieu Giraud authored Apr 03, 2019

Merge branch 'feature-c/2041-l-alignement-multiple-plante-quand-la-premiere-sequence-est-retiree' into 'dev'

Resolve "L'alignement multiple plante quand la première séquence est retirée"

Closes #2041

See merge request !454

1fcf5a1c

02 Apr, 2019 23 commits
- Merge branch 'feature-a/3839-config-labels' into 'dev' · 3be38c03
  Mikaël Salson authored Apr 02, 2019
```
--config, --labels-json

Closes #3839 and #3837

See merge request !456
```
  3be38c03
- tests: !NO_LAUNCHER · ca86677b
  Mathieu Giraud authored Apr 02, 2019
  
  ca86677b
- tests: update · b0afd492
  Mathieu Giraud authored Apr 02, 2019
```
Closes #3837, #3839.
```
  b0afd492
- vidjil.cpp: --labels-json · c17ed263
  Mathieu Giraud authored Apr 02, 2019
```
See #3839.
```
  c17ed263
- core/labels.{h,cpp}: load_into_map_from_json() · 2ff7f8d9
  Mathieu Giraud authored Apr 02, 2019
```
See #3839
```
  2ff7f8d9
- tests: add tests, dumping and reading labels with --label · 50fc5e97
  Mathieu Giraud authored Apr 02, 2019
```
Opens #3839.
```
  50fc5e97
- vidjil.cpp: --config · fd0f80df
  Mathieu Giraud authored Apr 02, 2019
```
See #3837.
```
  fd0f80df
- CLI11_json.cpp: reads config from "config" · db8d680f
  Mathieu Giraud authored Apr 02, 2019
```
see #3837.
```
  db8d680f
- vidjil.cpp: dump config into .vidjil · e0133fae
  Mathieu Giraud authored Apr 02, 2019
```
There is now some hack to get a json, it could be improved.
See #3837.
```
  e0133fae
- vidjil.cpp, lib/CLI11_json.hpp: include CLI11_json · 1fd605f6
  Mathieu Giraud authored Mar 21, 2019
  
  1fd605f6
- CLI11_json.cpp: include paths · 8bea162f
  Mathieu Giraud authored Mar 21, 2019
  
  8bea162f
- CLI11_json.cpp: no main() for us · 4bfc9912
  Mathieu Giraud authored Mar 21, 2019
  
  4bfc9912
- CLI11_json.cpp: ConfigJSON, from CLI11 examples · d2fd397d
  Mathieu Giraud authored Mar 21, 2019
```
https://github.com/CLIUtils/CLI11/commit/2ae5598d9570a
```
  d2fd397d
- tests: add tests, dumping and reading 'config' sections in .vidjil · a2901340
  Mathieu Giraud authored Apr 02, 2019
```
Opens #3837.
```
  a2901340
- segmenter; jshint quality · 5e14efda
  Thonier Florian authored Apr 02, 2019
```
link to #2041
```
  5e14efda
- semgenter.js; at init, semgenter can haven't divParent listSeq present · fd278598
  Thonier Florian authored Apr 02, 2019
```
In this case, ignore this function call (update_first_clone)
link to #2041
```
  fd278598
- segmenter & test: now first_clone cannot be setted as NaN value · 6f22700a
  Thonier Florian authored Apr 02, 2019
```
link to #2041
```
  6f22700a
- semgenter.js; minor typo · c9959e4b
  Thonier Florian authored Apr 02, 2019
```
link to #2041
```
  c9959e4b
- semgenter; default value of first_clone is -1 · 8865b8aa
  Thonier Florian authored Apr 02, 2019
```
link to #2041
```
  8865b8aa
- segmenter.js; update the first_clone when updating the semgenter · 5331ba69
  Thonier Florian authored Apr 02, 2019
```
link to #2041
```
  5331ba69
- model.js; remove previous modifications · 58da0bbc
  Thonier Florian authored Apr 02, 2019
```
link to #2041
```
  58da0bbc
- Merge branch 'feature-c/3820-lien-vers-le-gitlab-dans-le-menu-help' into 'dev' · a2455f80
  Mathieu Giraud authored Apr 02, 2019
```
Resolve "Lien vers le gitlab dans le menu help"

Closes #3820

See merge request !443
```
  a2455f80
- index.html: typos · d763f855
  Mikaël Salson authored Apr 02, 2019
  
  d763f855
01 Apr, 2019 7 commits
- Merge branch 'feature-at/update-should' into 'dev' · 9df9609b
  Mikaël Salson authored Apr 01, 2019
```
Feature at/update-should

See merge request !455
```
  9df9609b
- index; move header message div to the left (du to recent change of style) · b04937e0
  Thonier Florian authored Apr 01, 2019
  
  b04937e0
- index.html; add a link to our current bugtracker (gitlab inria) · c94345ce
  Thonier Florian authored Apr 01, 2019
```
link to #3820
```
  c94345ce
- tests: update · a7fd2d22
  Mathieu Giraud authored Apr 01, 2019
```
Following should#43, we cannot anymore use 'B' here.
```
  a7fd2d22
- tests: two old 'f' tests that are actually passing · fd9d1a4c
  Mathieu Giraud authored Mar 30, 2019
  
  fd9d1a4c
- tests: 00-no-compilation-warning.should-get, 'a' test · 6fb61208
  Mathieu Giraud authored Mar 30, 2019
  
  6fb61208
- tools/should.py: update from upstream, 2.0.0 · 7bd5506d
  Mathieu Giraud authored Mar 30, 2019
  
  7bd5506d
29 Mar, 2019 7 commits
- segmenter_test; add a test to see the reaction of model if unselect the first clone · 50f7e085
  flothoni authored Mar 29, 2019
```
link to #2041
```
  50f7e085
- segment; use fct set_first_clone to update the value · 4f04e488
  flothoni authored Mar 29, 2019
```
link to #2041
```
  4f04e488
- model.js; move call to set_first_clone inside a if condition · e729b2eb
  flothoni authored Mar 29, 2019
```
link to #2041
```
  e729b2eb
- model.js; add an update of semgent first_clone at model.unselect call · b99abe03
  flothoni authored Mar 29, 2019
```
link to #2041
```
  b99abe03
- segmenter_test; add some test on first_clone setting · efd7c546
  flothoni authored Mar 29, 2019
```
link to #2041
```
  efd7c546
- model; use new fct segment.set_first_clone · 9beb7d45
  flothoni authored Mar 29, 2019
```
link to #2041
```
  9beb7d45
- segmenter; missing colon · c7912221
  flothoni authored Mar 29, 2019
```
link to #2041
```
  c7912221