Commits · 5d178ad90cf45bbae5c3b33e06ec25e91d8af52f · C3SL / transparencia

Jun 02, 2017
- changed var name from 'aux' to more intuitive names · 5d178ad9
  Luiza Wille authored 7 years ago
  
  Signed-off-by: Luiza Wille <lmwc14@inf.ufpr.br>
  5d178ad9
May 22, 2017
- Merge branch 'issue/68' into 'master' · 939919bf
  Cristian Weiland authored 7 years ago
  
  Issue #68: Fix bug in variable checking See merge request !28
  939919bf
- Issue #68: Fix bug in variable checking · c2b9209e
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  c2b9209e
- Merge branch 'issue/67' into 'master' · 04d42b25
  Cristian Weiland authored 7 years ago
  
  Issue #67: Fix config file example for workers See merge request !27
  04d42b25
- Issue #67: Fix config file example for workers · e1491910
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  e1491910
May 12, 2017
- Merge branch 'issue/61' into 'master' · 5b306bf4
  Cristian Weiland authored 7 years ago
  
  Issue #61: Remove verification of empty strings to non-optional strings See merge request !26
  5b306bf4
- Issue #61: Remove verification of empty strings to non-optional strings · 58b2438a
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  58b2438a
- Merge branch 'issue/59' into 'master' · 21c3217e
  Cristian Weiland authored 7 years ago
  
  Issue #59: Remove tabs and replace them with 4 whitespaces See merge request !25
  21c3217e
- Issue #59: Remove tabs and replace them with 4 whitespaces · 3fed1cd8
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  3fed1cd8
- Merge branch 'issue/66' into 'master' · 7b2e6a9f
  Cristian Weiland authored 7 years ago
  
  Issue #66: Remove useless files See merge request !24
  7b2e6a9f
- Issue #66: Remove useless files · cabbcb8e
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  cabbcb8e
May 05, 2017
- Merge branch 'issue/53' into 'master' · c090ad82
  Cristian Weiland authored 7 years ago
  
  Issue #53: Fix bug that got the wrong column number in resume_register.sh See merge request !23
  c090ad82
- Issue #53: Fix bug that got the wrong column number in resume_register.sh · c7ee092c
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  c7ee092c
May 04, 2017
- Merge branch 'issue/54' into 'master' · 6e3e0468
  Cristian Weiland authored 7 years ago
  
  Issue #54: Python CSV reader ignores quotechar See merge request !22
  6e3e0468
- Issue #54: Python CSV reader ignores quotechar · 01192aa2
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  01192aa2
May 03, 2017
- Merge branch 'issue/52' into 'master' · 32b2bb46
  Cristian Weiland authored 7 years ago
  
  Issue #52: Add config.sh to .gitignore and create files config.sh.example See merge request !21
  32b2bb46
- Issue #52: Add config.sh to .gitignore and create files config.sh.example · ebb23594
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  ebb23594
- Merge branch 'issue/50' into 'master' · b15c9966
  Cristian Weiland authored 7 years ago
  
  Adiciona dados de Natureza Jurídica e de atividade da empresa nos dados de gastos See merge request !20
  b15c9966
- Merge branch 'issue/50' of gitlab.c3sl.ufpr.br:c3sl/transparencia into issue/50 · fe5f36b4
  Cristian Weiland authored 7 years ago
  
  Conflicts: scripts/expenses/insert_expenses.sh
  fe5f36b4
- Issue #50: Improve python script to merge files and create config files to get... · b030f9bb
  Cristian Weiland authored 7 years ago
  
  Issue #50: Improve python script to merge files and create config files to get data from CNAE and Natureza Jurídica in expenses Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  b030f9bb
- Merge branch 'issue/51' into 'master' · 483c71ba
  Cristian Weiland authored 7 years ago
  
  Issue #51: Add backup from kibana visualizations and dashboards See merge request !19
  483c71ba
- Issue #51: Add backup from kibana visualizations and dashboards · d80f303e
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  d80f303e
- Issue #50: Improve python script to merge files and create config files to get... · 7dd54de8
  Cristian Weiland authored 7 years ago
  
  Issue #50: Improve python script to merge files and create config files to get data from CNAE and Natureza Jurídica in expenses Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  7dd54de8
May 02, 2017
- Issue #50: Add company activity in expenses data · 5815ebed
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  5815ebed
Apr 25, 2017
- Merge branch 'issue/48' into 'master' · dcd1f4b2
  Cristian Weiland authored 7 years ago
  
  Issue #48: Reorganize repository, delete unused files and modify readme See merge request !18
  dcd1f4b2
- Issue #48: Reorganize repository, delete unused files and modify readme · b8d4d2e4
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  b8d4d2e4
Apr 24, 2017
- Merge branch 'issue/33' into 'master' · 09a6afc8
  Cristian Weiland authored 7 years ago
  
  Arruma filtro de dados See merge request !17
  09a6afc8
- Issue #33: Remove null characters before applying filter. · 25fa1490
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  25fa1490
Apr 20, 2017
- Merge branch 'Issue/33' into 'master' · 41032881
  Cristian Weiland authored 7 years ago
  
  Issue/33 See merge request !16
  41032881
- Issue #33: Previous solution got the wrong ID. This gets the right one. · 8f134f85
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  8f134f85
- Issue #33: Use column name to filter data instead of column id · 1156e612
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  1156e612
Apr 19, 2017
- Fix typo in index name in workers create config script · a85cd1d2
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  a85cd1d2
- Merge branch 'issue/33' into 'master' · 641c8552
  Cristian Weiland authored 7 years ago
  
  Issue/33 See merge request !14
  641c8552
- Merge branch 'master' into 'issue/33' · 4cd9bf3a
  Cristian Weiland authored 7 years ago
  
  # Conflicts: # scripts/travel_allowances/insert_travel_allowances.sh # scripts/workers/insert_register_payment.sh
  4cd9bf3a
- Merge branch 'issue/33' of gitlab.c3sl.ufpr.br:c3sl/transparencia into issue/33 · 5d9998c1
  Cristian Weiland authored 7 years ago
  
  Conflicts: scripts/travel_allowances/resume_travel_allowance.sh
  5d9998c1
- Issue #33: Workers: ready to add entire ministry. · d88d277a
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  d88d277a
- Issue #33: Travel Allowance: ready to add entire ministry. · 1a480b08
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  1a480b08
- Issue #33: Travel Allowance: ready to add entire ministry. · b8f31849
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  b8f31849
- Issue #33: Expenses: ready to add entire ministry. · 27823f5d
  Cristian Weiland authored 7 years ago
  
  Signed-off-by: Cristian Weiland <cw14@inf.ufpr.br>
  27823f5d
Apr 13, 2017
- Merge branch 'issue/45' into 'master' · f0f87310
  Cristian Weiland authored 7 years ago
  
  Issue #45: Fix insert scripts for travel allowances and workers See merge request !13
  f0f87310