Commits · a1a754188db21376997ec1287f15fae2cbdd84fb · humanities / gargantext

15 Dec, 2015 7 commits
- Merge branch 'unstable' into prod-dev · a1a75418
  delanoe authored Dec 15, 2015
  
  a1a75418
- Merge branch 'samuel' into unstable · 2ab53773
  delanoe authored Dec 15, 2015
  
  2ab53773
- share img git add share.png (2) · b29a2683
  PkSM3 authored Dec 15, 2015
  
  b29a2683
- share img git add share.png · 843c4e03
  PkSM3 authored Dec 15, 2015
  
  843c4e03
- [UPDATE] permissions with lists (TODO for today) · bfbb4dbb
  PkSM3 authored Dec 15, 2015
  
  bfbb4dbb
- [UPDATE] no nltk (my bad) · fc1a2a09
  PkSM3 authored Dec 15, 2015
  
  fc1a2a09
- [UPDATE] project sharing OK · 54123c55
  PkSM3 authored Dec 15, 2015
  
  54123c55
14 Dec, 2015 8 commits
- Merge branch 'unstable' into prod-dev · 1551c526
  delanoe authored Dec 14, 2015
  
  1551c526
- [ADMIN] Création des comptes. · 441ce15f
  delanoe authored Dec 14, 2015
  
  441ce15f
- Merge branch 'unstable' of ssh://delanoe.org:1979/gargantext into samuel · 6a455036
  PkSM3 authored Dec 14, 2015
  
  6a455036
- [UPDATE] commiting for pulling (before doing big-commit) · 2f6e6d80
  PkSM3 authored Dec 14, 2015
  
  2f6e6d80
- Merge branch 'unstable' into prod-dev · b2e9748c
  delanoe authored Dec 14, 2015
  
  b2e9748c
- Merge branch 'samuel' into unstable · 19fe1edb
  delanoe authored Dec 14, 2015
  
  19fe1edb
- [CLEAN] cosmetics code. · a95befe6
  delanoe authored Dec 14, 2015
  
  a95befe6
- [CLEAN] cosmetics code. · 3e4d1e50
  delanoe authored Dec 14, 2015
  
  3e4d1e50
12 Dec, 2015 4 commits
- [BUGFIX] indentation problem resolved (my bad) · 219f09c1
  PkSM3 authored Dec 12, 2015
  
  219f09c1
- [MERGE] no nltk · a1adf9c7
  PkSM3 authored Dec 12, 2015
  
  a1adf9c7
- Merge branch 'unstable' of ssh://delanoe.org:1979/gargantext into samuel · dd65482c
  PkSM3 authored Dec 12, 2015
  
  dd65482c
- [UPDATE] occs par default · 73289d0b
  PkSM3 authored Dec 12, 2015
  
  73289d0b
11 Dec, 2015 6 commits
- [TESTS] Some scripts for tests. · 78633ca6
  delanoe authored Dec 11, 2015
  
  78633ca6
- [TEST] Some SQL queries to test ngrams. · bc71d908
  delanoe authored Dec 11, 2015
  
  bc71d908
- Merge branch 'unstable' into prod-dev · dc80ab90
  delanoe authored Dec 11, 2015
  
  dc80ab90
- Merge branch 'romain' into unstable · 2420d55f
  delanoe authored Dec 11, 2015
  
  2420d55f
- [FIX] temporaire: on saute les documents n'ayant pas le header attendu · 71983304
  Romain Loth authored Dec 11, 2015
  
  71983304
- [FIX/TEXT] Improved title for the simple chart. · e05e79d7
  delanoe authored Dec 11, 2015
  
  e05e79d7
10 Dec, 2015 15 commits
- Merge branch 'unstable' into prod-dev · 94b2505d
  delanoe authored Dec 10, 2015
  
  94b2505d
- [FIX] workflow ngram function needeed. · 52098144
  delanoe authored Dec 10, 2015
  
  52098144
- Merge branch 'unstable' into prod-dev · ae3d88bd
  delanoe authored Dec 10, 2015
  
  ae3d88bd
- [FEAT/FIX] Simple export / import map list. · 0a21ff12
  delanoe authored Dec 10, 2015
  
  0a21ff12
- Merge branch 'romain' into unstable · d87916f9
  delanoe authored Dec 10, 2015
  
  d87916f9
- [WIP] importExport: import ~ ok; export à finir · d5a8e664
  Romain Loth authored Dec 10, 2015
  
  d5a8e664
- Merge branch 'unstable' into prod-dev · b970bd0f
  delanoe authored Dec 10, 2015
  
  b970bd0f
- Merge branch 'samuel' into unstable · 485f2b02
  delanoe authored Dec 10, 2015
```
Conflicts:
	ngram/group.py
Réglé.
```
  485f2b02
- [UPDATE] no nltktagger · b81f45fd
  PkSM3 authored Dec 10, 2015
  
  b81f45fd
- [UPDATE] comments · bb98822f
  PkSM3 authored Dec 10, 2015
  
  bb98822f
- [FEATURE] global explorer · edd83d5c
  PkSM3 authored Dec 10, 2015
  
  edd83d5c
- [UPDATE] no nltk (desole) · 7c368fc8
  PkSM3 authored Dec 10, 2015
  
  7c368fc8
- [UPDATE] clean version for mines.paristech · 3de1405d
  PkSM3 authored Dec 10, 2015
  
  3de1405d
- [FIX] istex: ajout if 'unknown' pour langue par défaut · ee9015d3
  Romain Loth authored Dec 10, 2015
  
  ee9015d3
- [FIX] removing comments and fix in debug. · 277e275b
  delanoe authored Dec 10, 2015
  
  277e275b