Commits · 2977b6634b74b34539b7d76a1cf919bbc4aafb28 · Agendador / Agendador · GitLab

18 Nov, 2016 1 commit
- Order occupation when searching for professional · 2977b663
  Pedro Henrique authored Nov 18, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  2977b663
17 Nov, 2016 11 commits
- Merge branch 'issue#133' into 'master' · dd32fc54
  Bruno Freitas Tissei authored Nov 17, 2016
```
Issue#133: Change to show all service places from a city hall when current user is adm_prefeitura

See merge request !241
```
  dd32fc54
- Issue#133: Change to show all service places from a city hall when current user is adm_prefeitura · 8dabb797
  Matheus Horstmann authored Nov 17, 2016
  
  8dabb797
- Merge branch 'master' of gitlab.c3sl.ufpr.br:agendador/agendador · 136787d5
  Pedro Henrique authored Nov 17, 2016
  
  136787d5
- fix schedue reports · c0e3d96f
  Pedro Henrique authored Nov 17, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  c0e3d96f
- Merge branch 'hotfix_issue_126' into 'master' · b9cdd7df
  Bruno Freitas Tissei authored Nov 17, 2016
```
Fix 'voltar' button on dependant's show view
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>

See merge request !240
```
  b9cdd7df
- Fix 'voltar' button on dependant's show view · c4ee35e2
  Bruno Freitas Tissei authored Nov 17, 2016
```
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>
```
  c4ee35e2
- fix edit permissions for adm c3sl · 99876a1d
  Pedro Henrique authored Nov 17, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  99876a1d
- fix merge conflicts · 2d85873e
  Pedro Henrique authored Nov 17, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  2d85873e
- fix same_city edit permission for professionals · 35448a99
  Pedro Henrique authored Nov 17, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  35448a99
- Merge branch 'hotfix_issue_129' into 'master' · 770d0c1b
  Bruno Freitas Tissei authored Nov 17, 2016
```
Fix service type order
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>

See merge request !239
```
  770d0c1b
- Fix service type order · 1c8638ce
  Bruno Freitas Tissei authored Nov 17, 2016
```
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>
```
  1c8638ce
16 Nov, 2016 21 commits
- Update professionals_controller.rb · c98d67e6
  Pedro Henrique authored Nov 16, 2016
  
  c98d67e6
- Merge branch 'Issue#132' into 'master' · ff004102
  Pedro Henrique authored Nov 16, 2016
```
Fix service place
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>

See merge request !237
```
  ff004102
- Fix reports for adm prefeitura · 900072fb
  Pedro Henrique authored Nov 16, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  900072fb
- Merge branch 'master' of gitlab.c3sl.ufpr.br:agendador/agendador into Issue#132 · 9cd07077
  Pedro Henrique authored Nov 16, 2016
  
  9cd07077
- Fix service place · 99490df2
  Pedro Henrique authored Nov 16, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  99490df2
- Merge branch 'hotfix_issue_129' into 'master' · b8de28af
  Bruno Freitas Tissei authored Nov 16, 2016
```
Show only service types related to the current service place in the shifts home page combo box
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>

See merge request !236
```
  b8de28af
- Show only service types related to the current service place in the shifts home page combo box · 99c143c2
  Bruno Freitas Tissei authored Nov 16, 2016
```
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>
```
  99c143c2
- Merge branch 'hotfix_issue_115' into 'master' · be29d8f1
  Bruno Freitas Tissei authored Nov 16, 2016
```
Fix professional creating, now cep must be valid
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>

See merge request !235
```
  be29d8f1
- Merge branch 'Issue#132' into 'master' · d12ff6fb
  Pedro Henrique authored Nov 16, 2016
```
Fix combo box of service type in sschedule report
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>

See merge request !234
```
  d12ff6fb
- Fix combo box of service type in sschedule report · 89b472b9
  Pedro Henrique authored Nov 16, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  89b472b9
- Fix current place variable for professionals · dc057617
  Mateus Ravedutti authored Nov 16, 2016
  
  dc057617
- Fix professionals edit form · 6774f032
  Mateus Ravedutti authored Nov 16, 2016
  
  6774f032
- Fix conflict issue 2 · 29352486
  Mateus Ravedutti authored Nov 16, 2016
  
  29352486
- Merge branch 'master' of gitlab.c3sl.ufpr.br:agendador/agendador · 4ece85de
  Mateus Ravedutti authored Nov 16, 2016
  
  4ece85de
- Fix conflict issue · bfe31f08
  Mateus Ravedutti authored Nov 16, 2016
  
  bfe31f08
- Merge branch 'Issue#132' into 'master' · 8af75b72
  Pedro Henrique authored Nov 16, 2016
```
Issue#132

See merge request !233
```
  8af75b72
- Change reports to generate reports of inactive service place as well · e2deaa00
  Pedro Henrique authored Nov 16, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  e2deaa00
- Change reports to generate reports of inactive service place as well · 053b0663
  Pedro Henrique authored Nov 16, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  053b0663
- Fix service place when generating services report · a4d5d1cc
  Pedro Henrique authored Nov 16, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  a4d5d1cc
- Merge Issue 112 into master · e83dc4ca
  Mateus Ravedutti authored Nov 16, 2016
  
  e83dc4ca
- Sort forms select boxes · 4b0db517
  Mateus Ravedutti authored Nov 16, 2016
  
  4b0db517
13 Nov, 2016 1 commit
- Fix professional creating, now cep must be valid · dc56535a
  Bruno Freitas Tissei authored Nov 13, 2016
```
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>
```
  dc56535a
11 Nov, 2016 6 commits
- Update professionals index search form · 3b50d8e8
  mateus ravedutti authored Nov 11, 2016
  
  3b50d8e8
- Merge branch 'master' of gitlab.c3sl.ufpr.br:agendador/agendador · e065a099
  Bruno Freitas Tissei authored Nov 11, 2016
  
  e065a099
- hotfix: fixed default setup for production environment · 32c2f7ea
  Bruno Freitas Tissei authored Nov 11, 2016
```
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>
```
  32c2f7ea
- change description to name in combo box in professional index · 5b22890e
  Pedro Henrique authored Nov 11, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  5b22890e
- Merge branch 'Issue#127' into 'master' · 0cd25659
  Pedro Henrique authored Nov 11, 2016
```
implments good development practice
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>

See merge request !231
```
  0cd25659
- implments good development practice · 2d5f86bf
  Pedro Henrique authored Nov 11, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  2d5f86bf