Commits · 28f05b2cd1dae17f27d6a9bfadaf8d0430c3aaef · Agendador / Agendador · GitLab

28 Nov, 2016 1 commit
- fix error when user puts wrong password · 28f05b2c
  Matheus Horstmann authored Nov 28, 2016
```
Signed-off-by: Matheus Horstmann <mch15@inf.ufpr.br>
```
  28f05b2c
25 Nov, 2016 1 commit
- Merge branch 'Issue_112' into 'master' · e51a6a07
  Mateus Ravedutti authored Nov 25, 2016
```
Issue 112

See merge request !247
```
  e51a6a07
23 Nov, 2016 7 commits
- Fix city hall select on page update · e0a3a7c3
  Mateus Ravedutti authored Nov 23, 2016
  
  e0a3a7c3
- Fix professionals report search form · 8ec112b0
  Mateus Ravedutti authored Nov 23, 2016
  
  8ec112b0
- Update reports search forms · 92d962e0
  Mateus Ravedutti authored Nov 23, 2016
  
  92d962e0
- Merge branch 'Issue#141' into 'master' · acb96ef3
  Cynthia Oliveira authored Nov 23, 2016
```
Issue#141: If phone2 is blank then phone turns to be empty not nil
Signed-off-by: Matheus Horstmann <mch15@inf.ufpr.br>

See merge request !246
```
  acb96ef3
- Issue#141: If phone2 is blank then phone turns to be empty not nil · d7ccf608
  Matheus Horstmann authored Nov 23, 2016
```
Signed-off-by: Matheus Horstmann <mch15@inf.ufpr.br>
```
  d7ccf608
- Merge branch 'Issue#139' into 'master' · ed2cdb4a
  Pedro Henrique authored Nov 23, 2016
```
fix block citizen login when city is inactive
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>

See merge request !245
```
  ed2cdb4a
- fix block citizen login when city is inactive · 8ae0b18c
  Pedro Henrique authored Nov 23, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  8ae0b18c
22 Nov, 2016 6 commits
- Merge branch 'Issue#139' into 'master' · 2ddc4e86
  Pedro Henrique authored Nov 22, 2016
```
Issue#139

See merge request !244
```
  2ddc4e86
- Raises timeout time · 9ca1dce0
  Pedro Henrique authored Nov 22, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  9ca1dce0
- Blocks citizen when trying to login in an inactive city · e9624af0
  Pedro Henrique authored Nov 22, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  e9624af0
- Merge branch 'master' of gitlab.c3sl.ufpr.br:agendador/agendador into Issue#138 · 98847996
  Pedro Henrique authored Nov 22, 2016
  
  98847996
- Implements timeout session · bb696da4
  Pedro Henrique authored Nov 22, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  bb696da4
- Put city hall field in search forms · 8eaf92b2
  Mateus Ravedutti authored Nov 22, 2016
  
  8eaf92b2
21 Nov, 2016 1 commit
- Update schedules search form · 3191b86f
  Mateus Ravedutti authored Nov 21, 2016
  
  3191b86f
18 Nov, 2016 6 commits
- Update citizens search form with city hall for adm c3sl · ee5b9a28
  Mateus Ravedutti authored Nov 18, 2016
  
  ee5b9a28
- Merge branch 'Issue#134' into 'master' · 88a553cf
  Bruno Freitas Tissei authored Nov 18, 2016
```
Issue#134

See merge request !243
```
  88a553cf
- Fix error message when scheduling for a citizen from an inactive city hall · 4b41177c
  Bruno Freitas Tissei authored Nov 18, 2016
```
Signed-off-by: Bruno Freitas Tissei <bft15@inf.ufpr.br>
```
  4b41177c
- Merge branch 'Issue#130' into 'master' · c293436c
  Pedro Henrique authored Nov 18, 2016
```
Order occupation when searching for professional
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>

See merge request !242
```
  c293436c
- Order occupation when searching for professional · 2977b663
  Pedro Henrique authored Nov 18, 2016
```
Signed-off-by: Pedro Henrique! <pha14@inf.ufpr.br>
```
  2977b663
- Issue#134: Add some erro message but now its possible schedule even if city is inactive · 3974fc29
  Matheus Horstmann authored Nov 18, 2016
  
  3974fc29
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 7 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